100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Feature/role management (#460)
vlichtenberg81c091445818
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 178fa3338..6c851a9bf 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -624,6 +624,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider imRoleMappingResource roleMappingResource = realmResource.users().get(user.getId()).roles();ClientRepresentation clientRepresentation = null;+ ClientResource clientResource = null;if (client != null) {clientRepresentation = getClient(realm, client);@@ -631,22 +632,35 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider imif (clientRepresentation == null) {throw new IllegalStateException("Invalid client: " + client);}+ clientResource = realmResource.clients().get(clientRepresentation.getId());}- // Get all role mappings for user on this client and remove any no longer in the roles- List<RoleRepresentation> mappedRoles = clientRepresentation != null ? roleMappingResource.clientLevel(clientRepresentation.getId()).listAll() : roleMappingResource.realmLevel().listAll();- List<RoleRepresentation> availableRoles = clientRepresentation != null ? roleMappingResource.clientLevel(clientRepresentation.getId()).listAvailable() : roleMappingResource.realmLevel().listAvailable();+ // Get all roles+ List<RoleRepresentation> existingRoles = clientRepresentation != null ? roleMappingResource.clientLevel(clientRepresentation.getId()).listAll() : roleMappingResource.realmLevel().listAll();+ List<RoleRepresentation> availableRoles = clientResource != null ? clientResource.roles().list() : realmResource.roles().list();+ List<RoleRepresentation> requestedRoles = availableRoles.stream().filter(role -> Arrays.stream(roles).anyMatch(name -> role.getName().equals(name))).collect(Collectors.toList());++ // Strip out requested roles that are already in a requested composite role+ List<String> removeRequestedRoles = requestedRoles.stream()+ .filter(RoleRepresentation::isComposite)+ .flatMap(role ->+ realmResource.rolesById().getRoleComposites(role.getId()).stream().map(RoleRepresentation::getId)+ ).collect(Collectors.toList());++ requestedRoles = requestedRoles.stream()+ .filter(role -> removeRequestedRoles.stream().noneMatch(id -> id.equals(role.getId())))+ .collect(Collectors.toList());+// Get newly defined roles- List<RoleRepresentation> addRoles = roles == null ? Collections.emptyList() : Arrays.stream(roles)- .filter(cr -> mappedRoles.stream().noneMatch(r -> r.getName().equals(cr)))- .map(cr -> availableRoles.stream().filter(r -> r.getName().equals(cr)).findFirst().orElse(null))- .filter(Objects::nonNull)+ List<RoleRepresentation> addRoles = requestedRoles.isEmpty() ? Collections.emptyList() : requestedRoles.stream()+ .filter(requestedRole -> existingRoles.stream().noneMatch(r -> r.getId().equals(requestedRole.getId()))).collect(Collectors.toList());// Remove obsolete roles- List<RoleRepresentation> removeRoles = roles == null ? mappedRoles : mappedRoles.stream()- .filter(r -> Arrays.stream(roles).noneMatch(cr -> cr.equals(r.getName())))+ List<RoleRepresentation> finalRequestedRoles = requestedRoles;+ List<RoleRepresentation> removeRoles = requestedRoles.isEmpty() ? existingRoles : existingRoles.stream()+ .filter(r -> finalRequestedRoles.stream().noneMatch(requestedRole -> requestedRole.getId().equals(r.getId()))).collect(Collectors.toList());if (!removeRoles.isEmpty()) {diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.jsonindex 375a0a762..8ca468a1d 100644--- a/manager/src/web/shared/locales/en/or.json+++ b/manager/src/web/shared/locales/en/or.json@@ -253,7 +253,9 @@"submit": "Submit","password": "Password","repeatPassword": "Repeat password",+ "details": "Details","permissions":"Permissions",+ "fullAccessLabel":"Admin: full access; manage users and roles","noChildAssets": "No child assets","account": "Account","editAttribute": "Change attribute",@@ -402,5 +404,8 @@"array": "Array","agentId": "Agent ID","agentNotFound": "Agent not found",- "agentTypeMismatch": "Agent type mismatch"+ "agentTypeMismatch": "Agent type mismatch",+ "loadFailedRoles": "Failed to load roles",+ "loadFailedUsers": "Failed to load users",+ "loadFailedServiceUsers": "Failed to load service users"}diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.jsonindex 4d6afb504..5d4559106 100644--- a/manager/src/web/shared/locales/nl/or.json+++ b/manager/src/web/shared/locales/nl/or.json@@ -258,7 +258,9 @@"submit": "Verzenden","password": "Wachtwoord","repeatPassword": "Herhaal wachtwoord",+ "details": "Details","permissions":"Rechten",+ "fullAccessLabel":"Admin: volledige toegang; gebruikers en rollen beheren","units": {"CELSIUS": "°C","FAHRENHEIT": "°F",diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.tsindex 818606b27..b164ced40 100644--- a/ui/app/manager/src/pages/page-map.ts+++ b/ui/app/manager/src/pages/page-map.ts@@ -205,7 +205,7 @@ export class PageMap<S extends MapStateKeyed> extends Page<S> {}});- if (!this.isConnected || realm !== this._realmSelector(this._store.getState())) {+ if (!this.isConnected || realm !== this._realmSelector(this.getState())) {// No longer connected or realm has changedreturn;}@@ -219,7 +219,7 @@ export class PageMap<S extends MapStateKeyed> extends Page<S> {this._store.dispatch(assetEventReceived(event));});- if (!this.isConnected || realm !== this._realmSelector(this._store.getState())) {+ if (!this.isConnected || realm !== this._realmSelector(this.getState())) {manager.events.unsubscribe(assetSubscriptionId);return;}@@ -230,7 +230,7 @@ export class PageMap<S extends MapStateKeyed> extends Page<S> {this._store.dispatch(attributeEventReceived(event));});- if (!this.isConnected || realm !== this._realmSelector(this._store.getState())) {+ if (!this.isConnected || realm !== this._realmSelector(this.getState())) {this.assetSubscriptionId = undefined;manager.events.unsubscribe(assetSubscriptionId);manager.events.unsubscribe(attributeSubscriptionId);@@ -349,7 +349,7 @@ export class PageMap<S extends MapStateKeyed> extends Page<S> {}protected getCurrentAsset() {- this._getCurrentAsset(this._store.getState());+ this._getCurrentAsset(this.getState());}protected onLoadAssetEvent(loadAssetEvent: OrMapAssetCardLoadAssetEvent) {diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.tsindex 4b06a3955..2899027e9 100644--- a/ui/app/manager/src/pages/page-roles.ts+++ b/ui/app/manager/src/pages/page-roles.ts@@ -5,7 +5,7 @@ import {TemplateResult,unsafeCSS,} from "lit";-import {customElement, property} from "lit/decorators.js";+import {customElement, property, state} from "lit/decorators.js";import manager, { OREvent, DefaultColor3 } from "@openremote/core";import "@openremote/or-panel";import "@openremote/or-translate";@@ -216,35 +216,23 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {`,];}- @property()++ @state()protected _compositeRoles: Role[] = [];- @property()+ @state()protected _roles: Role[] = [];- @property()+ @state()protected _rolesMapper = {};- @property()+ @state()public realm?: string;get name(): string {return "role_plural";}- constructor(store: EnhancedStore<S>) {- super(store);- this.getRoles();- }-- protected _onManagerEvent = (event: OREvent) => {- switch (event) {- case OREvent.DISPLAY_REALM_CHANGED:- this.realm = manager.displayRealm;- break;- }- };-public shouldUpdate(_changedProperties: PropertyValues): boolean {if (_changedProperties.has("realm")) {@@ -256,33 +244,25 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {public connectedCallback() {super.connectedCallback();- manager.addListener(this._onManagerEvent);- }-- public disconnectedCallback() {- super.disconnectedCallback();- manager.removeListener(this._onManagerEvent);+ this.realm = this.getState().app.realm;}-- private getRoles() {- manager.rest.api.UserResource.getRoles(manager.displayRealm).then(roleResponse => {- this._compositeRoles = [...roleResponse.data.filter(role => role.composite)];- this._roles = [...roleResponse.data.filter(role => !role.composite)];- this._roles.map(role => {+ protected async getRoles() {+ const roleResponse = await manager.rest.api.UserResource.getRoles(this.realm);+ this._compositeRoles = [...roleResponse.data.filter(role => role.composite)];+ this._roles = [...roleResponse.data.filter(role => !role.composite)];+ this._roles.map(role => {this._rolesMapper[role.id] = role.name- })- })+ });}- private _updateRoles() {+ private async _updateRoles() {if(this._compositeRoles.some(role => role.compositeRoleIds.length === 0)) {return}const roles = [...this._compositeRoles, ...this._roles];- manager.rest.api.UserResource.updateRoles(manager.displayRealm, roles).then(response => {- this.getRoles()- });+ await manager.rest.api.UserResource.updateRoles(this.realm, roles);+ this.getRoles();}private _deleteRole(role) {@@ -334,6 +314,10 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {`;}+ if (!this._roles || this._roles.length === 0) {+ return html``;+ }+const readonly = !manager.hasRole(ClientRole.WRITE_USER);const readRoles = this._roles.filter(role => role.name.includes('read')).sort((a, b) => a.name.localeCompare(b.name))const writeRoles = this._roles.filter(role => role.name.includes('write')).sort((a, b) => a.name.localeCompare(b.name))@@ -432,7 +416,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {</tr>`})}- ${!!this._compositeRoles[this._compositeRoles.length -1].id && !readonly ? html`+ ${this._compositeRoles.length > 0 && !!this._compositeRoles[this._compositeRoles.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="100%"><a class="button" @click="${() => this._compositeRoles = [...this._compositeRoles, {composite:true, name:"", compositeRoleIds:[]}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("role")}</a>@@ -449,5 +433,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {`;}- public stateChanged(state: S) {}+ public stateChanged(state: S) {+ this.realm = state.app.realm;+ }}diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex 2f93dbdbc..3c8955c88 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -1,6 +1,6 @@import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";-import {customElement, property} from "lit/decorators.js";-import manager, {DefaultColor3, OREvent, Util} from "@openremote/core";+import {customElement, property, state} from "lit/decorators.js";+import manager, {DefaultColor3, Util} from "@openremote/core";import "@openremote/or-panel";import "@openremote/or-translate";import {EnhancedStore} from "@reduxjs/toolkit";@@ -10,6 +10,8 @@ import {i18next} from "@openremote/or-translate";import {OrIcon} from "@openremote/or-icon";import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";+import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";+import {GenericAxiosResponse, RestResponse} from "@openremote/rest";const tableStyle = require("@material/data-table/dist/mdc.data-table.css");@@ -95,15 +97,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {td, th {width: 25%}-- .meta-item-container {- flex-direction: row;- overflow: hidden;- max-height: 0;- transition: max-height 0.25s ease-out;- padding-left: 16px;- }-+or-mwc-input {margin-bottom: 20px;margin-right: 16px;@@ -129,7 +123,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {flex-direction: column;margin: 0px;flex: 1 1 0;-+ max-width: 50%;}.mdc-data-table__header-cell {@@ -145,9 +139,16 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {padding: 0;}+ .meta-item-container {+ flex-direction: row;+ overflow: hidden;+ max-height: 0;+ padding-left: 16px;+ }+.attribute-meta-row.expanded .meta-item-container {- max-height: 1000px;- transition: max-height 1s ease-in;+ overflow: visible;+ max-height: unset;}.button {@@ -193,40 +194,21 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}@property()- protected _users: UserModel[] = [];+ public realm?: string;- @property()+ @state()+ protected _users: UserModel[] = [];+ @state()protected _serviceUsers: UserModel[] = [];-- @property()+ @state()+ protected _roles: Role[] = [];+ @state()protected _compositeRoles: Role[] = [];- @property()- public validPassword?: boolean = true;-- @property()- public realm?: string;-- @property()- protected loading: boolean = true;-get name(): string {return "user_plural";}- constructor(store: EnhancedStore<S>) {- super(store);- this.loadUsers();- }-- protected _onManagerEvent = (event: OREvent) => {- switch (event) {- case OREvent.DISPLAY_REALM_CHANGED:- this.realm = manager.displayRealm;- break;- }- };-public shouldUpdate(_changedProperties: PropertyValues): boolean {if (_changedProperties.has("realm")) {@@ -237,34 +219,62 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}public connectedCallback() {+ this.loadUsers();super.connectedCallback();- manager.addListener(this._onManagerEvent);}public disconnectedCallback() {super.disconnectedCallback();- manager.removeListener(this._onManagerEvent);}- private async loadUsers() {+ protected async loadUsers() {+ this._compositeRoles = [];+ this._roles = [];this._users = [];this._serviceUsers = [];- this._compositeRoles = [];- this.loading = true;- const ORClientRoleResponse = await manager.rest.api.UserResource.getRoles(manager.displayRealm);- if (!ORClientRoleResponse.data) {- this.loading = false;+ if (!manager.authenticated || !manager.hasRole(ClientRole.READ_USERS)) {+ console.warn("Not authenticated or insufficient access");+ return;+ }++ const loadedDeferred = new Util.Deferred<TemplateResult>();+ const realm = this.getState().app.realm;+ const responseAndStateOK: <T extends GenericAxiosResponse<any[]>>(response: T, errorMsg: string) => boolean = (response, errorMsg) => {++ // After async op check that the response still matches current state and that the component is still loaded in the UI+ if (this.getState().app.realm !== realm || !this.isConnected) {+ // Realm change or component disconnected - don't continue+ return false;+ }++ if (!response.data) {+ showSnackbar(undefined, errorMsg, i18next.t("dismiss"));+ console.error(errorMsg + ": response = " + response.statusText);+ return false;+ }++ return true;+ };++ const roleResponse = await manager.rest.api.UserResource.getRoles(manager.displayRealm);++ if (!responseAndStateOK(roleResponse, i18next.t("loadFailedRoles"))) {return;}- const compositeRoles = ORClientRoleResponse.data.filter(role => role.composite);+ const compositeRoles = roleResponse.data.filter(role => role.composite);+ const roles = roleResponse.data.filter(role => !role.composite);const usersResponse = await manager.rest.api.UserResource.getAll(manager.displayRealm);++ if (!responseAndStateOK(usersResponse, i18next.t("loadFailedUsers"))) {+ return;+ }+const serviceUsersResponse = await manager.rest.api.UserResource.getAllService(manager.displayRealm);- if (!usersResponse.data || !serviceUsersResponse.data) {- this.loading = false;+ if (!responseAndStateOK(serviceUsersResponse, i18next.t("loadFailedServiceUsers"))) {return;}@@ -274,14 +284,16 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {// Load each users assigned rolesconst roleLoaders = [...users, ...serviceUsers].map(async user => {const userRolesResponse = await (user.serviceAccount ? manager.rest.api.UserResource.getUserClientRoles(manager.displayRealm, user.id, user.username) : manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));- user.roles = userRolesResponse.data.filter(r => r.composite && r.assigned);+ user.roles = userRolesResponse.data.filter(r => r.assigned);});await Promise.all(roleLoaders);++ // Only update state once all promises are fulfilled+ this._compositeRoles = compositeRoles.sort(Util.sortByString(role => role.name));+ this._roles = roles.sort(Util.sortByString(role => role.name));this._users = users.sort(Util.sortByString(u => u.username));this._serviceUsers = serviceUsers.sort(Util.sortByString(u => u.username));- this._compositeRoles = compositeRoles;- this.loading = false;}private async _createUpdateUser(user: UserModel) {@@ -290,7 +302,6 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {// Means a validation failure shouldn't get herereturn;}- this.loading = true;try {const response = await manager.rest.api.UserResource.createUpdate(manager.displayRealm, user);@@ -312,26 +323,19 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {* the names will match so that's ok*/private async _updateRoles(user: UserModel) {- if (this._compositeRoles.length === 0 || !user.roles || user.roles.length === 0) {+ if (this._compositeRoles.length === 0 || !user.roles) {return;}- const compositeRoles = this._compositeRoles.filter(c => user.roles.some(r => r.name === c.name)).map(r => {- return {...r, assigned: true}- });-- if (compositeRoles.length === 0) {- return;- }+ const roles = user.roles.filter(role => role.assigned);if (!user.serviceAccount) {- await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, compositeRoles);+ await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, roles);} else {- await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, compositeRoles);+ await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, roles);}}-private _deleteUser(user) {showOkCancelDialog(i18next.t("delete"), i18next.t("deleteUserConfirm"), i18next.t("delete")).then((ok) => {@@ -358,20 +362,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {`;}- if (this.loading) {+ if (!this._roles || this._roles.length === 0) {return html``;}- const roleOptions: string[] = this._compositeRoles.map(cr => cr.name);+ const compositeRoleOptions: string[] = this._compositeRoles.map(cr => cr.name);const readonly = !manager.hasRole(ClientRole.WRITE_USER);return html`<div id="wrapper"><div id="title"><or-icon icon="account-group"></or-icon>- ${i18next.t(- "user_plural"- )}+ ${i18next.t("user_plural")}</div><div class="panel">@@ -397,7 +399,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {<tbody class="mdc-data-table__content">${this._users.map((user, index) => this._getUserTemplate(() => {this._users.pop(); this._users = [...this._users];- }, user, readonly, roleOptions, "user"+index))}+ }, user, readonly, compositeRoleOptions, "user"+index))}${(this._users.length === 0 || (this._users.length > 0 && !!this._users[this._users.length - 1].id)) && !readonly ? html`<tr class="mdc-data-table__row" @click="${() => {this._users = [...this._users, {enabled: true}];@@ -435,7 +437,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {<tbody class="mdc-data-table__content">${this._serviceUsers.map((user, index) => this._getUserTemplate(() => {this._serviceUsers.pop(); this._serviceUsers = [...this._serviceUsers];- }, user, readonly, roleOptions, "serviceuser" + index))}+ }, user, readonly, compositeRoleOptions, "serviceuser" + index))}${(this._serviceUsers.length === 0 || (this._serviceUsers.length > 0 && !!this._serviceUsers[this._serviceUsers.length - 1].id)) && !readonly ? html`<tr class="mdc-data-table__row" @click="${() => {this._serviceUsers = [...this._serviceUsers, {@@ -456,6 +458,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}public stateChanged(state: S) {+ this.realm = state.app.realm;}protected _toggleUserExpand(ev: MouseEvent) {@@ -506,8 +509,25 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {secretElem.disabled = false;}- protected _getUserTemplate(addCancel: () => void, user: UserModel, readonly: boolean, roleOptions: string[], suffix: string): TemplateResult {+ protected _updateUserSelectedRoles(user: UserModel, suffix: string) {+ const roleCheckboxes = [...((this.shadowRoot!.getElementById("role-list-" + suffix) as HTMLDivElement).children as any)] as OrMwcInput[];+ const implicitRoleNames = this.getImplicitUserRoles(user);+ roleCheckboxes.forEach((checkbox) => {+ const roleName = checkbox.label;+ const r = this._roles.find(role => roleName === role.name);+ checkbox.disabled = !!implicitRoleNames.find(name => r.name === name);+ checkbox.value = !!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name);+ });+ }++ protected getImplicitUserRoles(user: UserModel) {+ return this._compositeRoles.filter((role) => user.roles.some(ur => ur.name === role.name)).flatMap((role) => role.compositeRoleIds).map(id => this._roles.find(r => r.id === id).name);+ }++ protected _getUserTemplate(addCancel: () => void, user: UserModel, readonly: boolean, compositeRoleOptions: string[], suffix: string): TemplateResult {const isSameUser = user.username === manager.username;+ user.roles = user.roles || [];+ const implicitRoleNames = this.getImplicitUserRoles(user);return html`<tr class="mdc-data-table__row" @click="${(ev) => this._toggleUserExpand(ev)}">@@ -519,7 +539,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${user.email}</td><td class="padded-cell mdc-data-table__cell">- ${user.roles ? user.roles.map(r => r.name).join(",") : null}+ ${user.roles ? user.roles.filter(r => r.composite).map(r => r.name).join(",") : null}</td><td class="padded-cell mdc-data-table__cell hide-mobile"><or-translate .value="${user.enabled ? "enabled" : "disabled"}"></or-translate>@@ -530,6 +550,8 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {<div class="meta-item-container"><div class="row"><div class="column">+ <h5>${i18next.t("details")}</h5>+ <!-- user details --><or-mwc-input ?readonly="${!!user.id || readonly}".label="${i18next.t("username")}".type="${InputType.TEXT}" min="1" required@@ -550,20 +572,9 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.type="${InputType.TEXT}" min="1".value="${user.lastName}"@or-mwc-input-changed="${(e: OrInputChangedEvent) => user.lastName = e.detail.value}"></or-mwc-input>- </div>- <div class="column">- <or-mwc-input ?readonly="${readonly}"- ?disabled="${isSameUser}"- .value="${user.roles && user.roles.length > 0 ? user.roles.map(r => r.name) : undefined}"- .type="${InputType.SELECT}" multiple- .options="${roleOptions}"- .label="${i18next.t("role")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {- const roleNames = e.detail.value as string[];- const roles = this._compositeRoles.filter(cr => roleNames.some(rn => cr.name === rn));- user.roles = roles;- }}"></or-mwc-input>+ <!-- password -->+ <h5>${i18next.t("password")}</h5>${user.serviceAccount ? html`<or-mwc-input id="password-${suffix}" readonly.label="${i18next.t("secret")}"@@ -573,7 +584,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.label="${i18next.t("regenerateSecret")}".type="${InputType.BUTTON}"@or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-"+suffix)}"></or-mwc-input>`- : html`+ : html`<or-mwc-input id="password-${suffix}"?readonly="${readonly}".label="${i18next.t("password")}"@@ -585,12 +596,63 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.type="${InputType.PASSWORD}" min="1"@or-mwc-input-changed="${(e: OrInputChangedEvent) => {this._onPasswordChanged(user, suffix)}}"></or-mwc-input>`}+ </div>++ <div class="column">+ <h5>${i18next.t("settings")}</h5>+ <!-- enabled --><or-mwc-input ?readonly="${readonly}"- .label="${i18next.t("enabled")}"- .type="${InputType.SWITCH}" min="1"+ .label="${i18next.t("active")}"+ .type="${InputType.CHECKBOX}".value="${user.enabled}"@or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"style="height: 56px;"></or-mwc-input>++ <!-- is admin -->+ <or-mwc-input ?readonly="${true}"+ .label="${i18next.t("fullAccessLabel")}"+ .type="${InputType.CHECKBOX}"+ .value="${user.enabled}"+ style="height: 56px;"></or-mwc-input>++ <!-- composite roles -->+ <or-mwc-input+ ?readonly="${readonly}"+ ?disabled="${isSameUser}"+ .value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}"+ .type="${InputType.SELECT}" multiple+ .options="${compositeRoleOptions}"+ .label="${i18next.t("role_plural")}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ const roleNames = e.detail.value as string[];+ user.roles = this._compositeRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {return {...r, assigned: true};});+ this._updateUserSelectedRoles(user, suffix);+ }}"></or-mwc-input>++ <!-- roles -->+ <div style="display:flex;flex-wrap:wrap;" id="role-list-${suffix}">+ ${this._roles.map(r => {+ return html`+ <or-mwc-input+ ?readonly="${readonly}"+ ?disabled="${implicitRoleNames.find(name => r.name === name)}"+ .value="${!!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"+ .type="${InputType.CHECKBOX}"+ .label="${r.name}"+ style="width:25%;margin:0"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {+ if (!!e.detail.value) {+ user.roles.push({...r, assigned: true});+ } else {+ user.roles = user.roles.filter(e => e.name !== r.name);+ }+ }}"></or-mwc-input>+ `+ })}+ </div>++ <!-- restricted access -->+ <!-- placeholder --></div></div>diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex 20ee24955..8df3efaee 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -151,10 +151,14 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {OrMwcSnackbar.DialogHostElement = this;}+ public getState(): S {+ return this._store.getState();+ }+connectedCallback() {super.connectedCallback();- this._storeUnsubscribe = this._store.subscribe(() => this.stateChanged(this._store.getState()));- this.stateChanged(this._store.getState());+ this._storeUnsubscribe = this._store.subscribe(() => this.stateChanged(this.getState()));+ this.stateChanged(this.getState());}disconnectedCallback() {diff --git a/ui/component/or-app/src/types.ts b/ui/component/or-app/src/types.tsindex 812e2784d..8d5e2cab5 100644--- a/ui/component/or-app/src/types.ts+++ b/ui/component/or-app/src/types.ts@@ -60,5 +60,9 @@ export abstract class Page<S extends AppStateKeyed> extends translate(i18next)(Lsuper.disconnectedCallback();}+ protected getState(): S {+ return this._store.getState();+ }+abstract stateChanged(state: S): void;}diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.tsindex 95d44bae7..f8cce5c6a 100644--- a/ui/component/or-mwc-components/src/or-mwc-input.ts+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts@@ -560,6 +560,10 @@ const style = css`#field {height: 100%;}++ .mdc-select__menu .mdc-list .mdc-list-item.mdc-list-item--selected or-icon {+ --or-icon-fill: var(--or-app-color4);+ }`;@customElement("or-mwc-input")@@ -869,9 +873,17 @@ export class OrMwcInput extends LitElement {} else {inputValue.push(value);}- const icon = (ev.composedPath()[0] as HTMLElement).getElementsByTagName("or-icon")[0] as OrIcon;- if (icon) {- icon.icon = index >= 0 ? undefined : "check";+ const listItemEl = (ev.composedPath()[0] as HTMLElement).closest("li") as HTMLElement,+ iconEl = listItemEl.getElementsByTagName("or-icon")[0] as OrIcon;+ if (listItemEl) {+ if (index >= 0) {+ listItemEl.classList.remove("mdc-list-item--selected");+ } else {+ listItemEl.classList.add("mdc-list-item--selected");+ }+ }+ if (iconEl) {+ iconEl.icon = index >= 0 ? "checkbox-blank-outline" : "checkbox-marked";}this._tempValue = inputValue;}diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.tsindex d5bf861ff..00a52abdc 100644--- a/ui/component/or-mwc-components/src/or-mwc-list.ts+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts@@ -116,9 +116,9 @@ export function getItemTemplate(item: ListItem | null, index: number, selectedValet icon = listItem.icon;let selectedClassName = "mdc-list-item--selected";translate = translate || item.translate;-+if (multiSelect && type === ListType.MULTI_TICK) {- icon = isSelected ? "check" : undefined;+ icon = isSelected ? "checkbox-marked" : "checkbox-blank-outline";}if (type === ListType.MULTI_TICK || icon) {@@ -175,7 +175,7 @@ export function getItemTemplate(item: ListItem | null, index: number, selectedVabreak;case ListType.MULTI_TICK:ariaChecked = isSelected ? "true" : "false";- selectedClassName = "mdc-menu-item--selected";+ selectedClassName = "mdc-list-item--selected";break;}