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
Improve user and role management styling
Robin Dekkersf61591da2f83
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex ca03a10dd..65e342615 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -195,7 +195,11 @@"user_plural": "Users","user_role": "Role","role_plural": "Roles",+ "description": "Description",+ "samePassword":"Password are not the same","username":"Username",+ "firstName":"First name",+ "surname":"Surname","deleteUserConfirm":"Are you sure you want to delete this user?","deleteRoleConfirm":"Are you sure you want to delete this role?","realmRules": "realm rules",@@ -240,6 +244,8 @@"sending": "Sending","submit": "Submit","password": "Password",+ "repeatPassword": "Repeat password",+ "permissions":"Permissions","units": {"CELSIUS": "°C","FAHRENHEIT": "°F",diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex e6d318b33..42513ae1b 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -195,9 +195,13 @@"user_plural": "Gebruikers","user_role": "Rol","role_plural": "Rollen",+ "description": "Omschrijving","username":"Gebruikersnaam","deleteUserConfirm":"Deze gebruiker verwijderen?","deleteRoleConfirm":"Deze rol verwijderen?",+ "samePassword":"Wachtwoorden komen niet overeen",+ "firstName":"Voornaam",+ "surname":"Achternaam","realmRules": "Realm regels","globalRules": "Globale regels","recipients": "Ontvangers",@@ -240,6 +244,8 @@"sending": "Wordt verzonden","submit": "Verzenden","password": "Wachtwoord",+ "repeatPassword": "Herhaal wachtwoord",+ "permissions":"Rechten","units": {"CELSIUS": "°C","FAHRENHEIT": "°F",diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.tsindex 5520e1d86..651658ef4 100644--- a/ui/app/or-app/src/index.ts+++ b/ui/app/or-app/src/index.ts@@ -130,7 +130,7 @@ export function headerItemUsers<S extends AppStateKeyed, A extends AnyAction>(or}export function headerItemRoles<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {return {- icon: "account-group",+ icon: "account-box-multiple",value: "roles",href: "roles",text: "role_plural",diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex 4b57815b8..9b3c505f2 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -209,6 +209,10 @@ class OrHeader extends LitElement {margin: 10px 0;}+ #drawer .menu-item or-icon {+ margin: 0 5px;+ }+#desktop-left .menu-item[selected] {display: inline-block;line-height: var(--internal-or-header-height);@@ -345,6 +349,7 @@ class OrHeader extends LitElement {public _onRealmSelect(realm: string) {manager.displayRealm = realm;+ window.sessionStorage.setItem('realm', realm);this.requestUpdate();}protected _hashCallback = (e: Event) => {@@ -416,6 +421,8 @@ class OrHeader extends LitElement {return html``;}+ const realm = window.sessionStorage.getItem('realm');+ if(realm) manager.displayRealm = realm;const picker = this._getTenants().then((tenants) => {const menuItems = tenants.map((r) => {diff --git a/ui/app/or-app/src/pages/page-roles.ts b/ui/app/or-app/src/pages/page-roles.tsindex 55a367dbe..9b27e8e63 100644--- a/ui/app/or-app/src/pages/page-roles.ts+++ b/ui/app/or-app/src/pages/page-roles.ts@@ -13,7 +13,7 @@ import "@openremote/or-translate";import { EnhancedStore } from "@reduxjs/toolkit";import { AppStateKeyed } from "../app";import { Page } from "../types";-import { Role } from "@openremote/model";+import { ClientRole, Role } from "@openremote/model";import { i18next } from "@openremote/or-translate";import { OrIcon } from "@openremote/or-icon";import { InputType, OrInputChangedEvent } from "@openremote/or-input";@@ -39,7 +39,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {return [unsafeCSS(tableStyle),css`- #wrapper {+ #wrapper {height: 100%;width: 100%;display: flex;@@ -71,6 +71,16 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {padding: 20px;}+ .panel-title {+ text-transform: uppercase;+ font-weight: bolder;+ line-height: 1em;+ color: var(--internal-or-asset-viewer-title-text-color);+ margin-bottom: 20px;+ flex: 0 0 auto;+ letter-spacing: 0.025em;+ }+#table-users {width: 100%;}@@ -80,11 +90,18 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px 0 50px;+ padding: 0 20px 0 30px;}or-input {- margin-bottom: 20px;+ margin-bottom: 10px;+ margin-right: 20px;+ }++ or-icon {+ vertical-align: middle;+ --or-icon-width: 20px;+ --or-icon-height: 20px;}.row {@@ -97,16 +114,31 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {.column {display: flex;flex-direction: column;- margin: 10px;+ margin: 0px;flex: 1 1 0;+}.mdc-data-table__header-cell {font-weight: bold;}++ .padded-cell {+ overflow-wrap: break-word;+ word-wrap: break-word+ }++ .attribute-meta-row td {+ padding: 0;+ }++ .attribute-meta-row {+ max-width: 0px;+ }.attribute-meta-row.expanded .meta-item-container {max-height: 1000px;+ max-width: none;transition: max-height 1s ease-in;}@@ -123,11 +155,22 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {--or-icon-fill: var(--or-app-color4);}- @media screen and (max-width: 769px){+ @media screen and (max-width: 1024px){+ .row {+ display: block;+ flex-direction: column;+ }+.panel {border-radius: 0;}}++ @media screen and (max-width: 768px){+ .hide-mobile {+ display: none;+ }+ }`,];}@@ -235,6 +278,10 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {expanderIcon.icon = "chevron-down";}};+ 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))+ const otherRoles = this._roles.filter(role => !role.name.includes('read') && !role.name.includes('write')).sort((a, b) => a.name.localeCompare(b.name))return html`<div id="wrapper"><div id="title">@@ -243,14 +290,14 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {)}</div><div class="panel">- <p>${i18next.t("role")}</p>+ <p class="panel-title">${i18next.t("role")}</p><div id="table-users" class="mdc-data-table"><table class="mdc-data-table__table" aria-label="attribute list" ><thead><tr class="mdc-data-table__header-row"><th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="name"></or-translate></th><th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="description"></or-translate></th>- <th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="user_role"></or-translate></th>+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col"><or-translate value="permissions"></or-translate></th></tr></thead><tbody class="mdc-data-table__content">@@ -268,32 +315,57 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {<td class="padded-cell mdc-data-table__cell">${role.description}</td>- <td class="padded-cell mdc-data-table__cell">+ <td class="padded-cell hide-mobile mdc-data-table__cell">${compositeRoleName}</td></tr><tr id="attribute-meta-row-${index}" class="attribute-meta-row${!role.name ? " expanded" : ""}"><td colspan="4"><div class="meta-item-container">- <or-input .label="${i18next.t("role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-input>- <or-input .label="${i18next.t("description")}" .type="${InputType.TEXT}" min="1" required .value="${role.description}" @or-input-changed="${(e: OrInputChangedEvent) => role.description = e.detail.value}"></or-input>++ <div class="row">+ <div class="column">+ <or-input .label="${i18next.t("role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-input>+ </div>+ <div class="column">+ <or-input .label="${i18next.t("description")}" .type="${InputType.TEXT}" min="1" required .value="${role.description}" @or-input-changed="${(e: OrInputChangedEvent) => role.description = e.detail.value}"></or-input>+ </div>+ </div><div class="row"><div class="column">- ${this._roles.map(r => {+ <strong>${i18next.t("read")}</strong>++ ${readRoles.map(r => {return html`- <or-input .label="${r.name}" .type="${InputType.CHECKBOX}" .value="${role.compositeRoleIds && role.compositeRoleIds.find(id => id === r.id)}" @or-input-changed="${(e: OrInputChangedEvent) => e.detail.value ? role.compositeRoleIds = [...role.compositeRoleIds, r.id]: role.compositeRoleIds = role.compositeRoleIds.filter(id=> id !== r.id) }"></or-input>+ <or-input ?readonly="${readonly}" .label="${r.name.split(":")[1]}: ${r.description}" .type="${InputType.CHECKBOX}" .value="${role.compositeRoleIds && role.compositeRoleIds.find(id => id === r.id)}" @or-input-changed="${(e: OrInputChangedEvent) => e.detail.value ? role.compositeRoleIds = [...role.compositeRoleIds, r.id]: role.compositeRoleIds = role.compositeRoleIds.filter(id=> id !== r.id) }"></or-input>`})}</div><div class="column">+ <strong>${i18next.t("write")}</strong>+ ${writeRoles.map(r => {+ return html`+ <or-input ?readonly="${readonly}" .label="${r.name.split(":")[1]}: ${r.description}" .type="${InputType.CHECKBOX}" .value="${role.compositeRoleIds && role.compositeRoleIds.find(id => id === r.id)}" @or-input-changed="${(e: OrInputChangedEvent) => e.detail.value ? role.compositeRoleIds = [...role.compositeRoleIds, r.id]: role.compositeRoleIds = role.compositeRoleIds.filter(id=> id !== r.id) }"></or-input>+ `+ })}+ </div>+ </div>+ <div class="row">+ <div class="column">+ ${otherRoles.map(r => {+ return html`+ <or-input ?readonly="${readonly}" .label="${r.name.split(":")[1]}: ${r.description}" .type="${InputType.CHECKBOX}" .value="${role.compositeRoleIds && role.compositeRoleIds.find(id => id === r.id)}" @or-input-changed="${(e: OrInputChangedEvent) => e.detail.value ? role.compositeRoleIds = [...role.compositeRoleIds, r.id]: role.compositeRoleIds = role.compositeRoleIds.filter(id=> id !== r.id) }"></or-input>+ `+ })}</div></div><div class="row">- ${role.id ? html`++ ${role.id && !readonly ? html`<or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteRole(role)}"></or-input><or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>` : html`@@ -306,7 +378,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {</tr>`})}- ${!!this._compositeRoles[this._compositeRoles.length -1].id ? html`+ ${!!this._compositeRoles[this._compositeRoles.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="4"><a class="button" @click="${() => this._compositeRoles = [...this._compositeRoles, {compositeRoleIds:[]}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("role")}</strong></a>diff --git a/ui/app/or-app/src/pages/page-users.ts b/ui/app/or-app/src/pages/page-users.tsindex 0c0522f62..9ec444b4c 100644--- a/ui/app/or-app/src/pages/page-users.ts+++ b/ui/app/or-app/src/pages/page-users.ts@@ -13,7 +13,7 @@ import "@openremote/or-translate";import { EnhancedStore } from "@reduxjs/toolkit";import { AppStateKeyed } from "../app";import { Page } from "../types";-import { Role, User } from "@openremote/model";+import { ClientRole, Role, User } from "@openremote/model";import { i18next } from "@openremote/or-translate";import { OrIcon } from "@openremote/or-icon";import { InputType, OrInputChangedEvent } from "@openremote/or-input";@@ -71,6 +71,16 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {padding: 20px;}+ .panel-title {+ text-transform: uppercase;+ font-weight: bolder;+ line-height: 1em;+ color: var(--internal-or-asset-viewer-title-text-color);+ margin-bottom: 20px;+ flex: 0 0 auto;+ letter-spacing: 0.025em;+ }+#table-users {width: 100%;}@@ -80,11 +90,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px 0 50px;+ padding: 0 20px 0 30px;}or-input {margin-bottom: 20px;+ margin-right: 20px;+ }++ or-icon {+ vertical-align: middle;+ --or-icon-width: 20px;+ --or-icon-height: 20px;}.row {@@ -97,13 +114,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.column {display: flex;flex-direction: column;- margin: 10px;+ margin: 0px;flex: 1 1 0;+}.mdc-data-table__header-cell {font-weight: bold;}++ .attribute-meta-row td {+ padding: 0;+ }.attribute-meta-row.expanded .meta-item-container {max-height: 1000px;@@ -124,6 +146,11 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}@media screen and (max-width: 769px){+ .row {+ display: block;+ flex-direction: column;+ }+.panel {border-radius: 0;}@@ -141,6 +168,9 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {@property()protected _userRoleMapper = {};+ @property()+ public validPassword?: boolean = true;+@property()public realm?: string;@@ -201,14 +231,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {private _createUser(user, passwords, role) {manager.rest.api.UserResource.create(manager.displayRealm, user).then((response:any) => {- this.getUsers()if(passwords && passwords.resetPassword && passwords.repeatPassword) {- if(passwords.resetPassword !== passwords.repeatPassword) return;+ if(passwords.resetPassword !== passwords.repeatPassword) {+ this.validPassword = false;+ return;+ }const credentials = {value: passwords.resetPassword}const id = response.data.id;manager.rest.api.UserResource.resetPassword(manager.displayRealm, id, credentials);if(role) {- this._updateRole(response.data, role)+ this._updateRole(response.data, role);+ } else {+ this.getUsers()}}});@@ -220,14 +254,19 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {const role = this._compositeRoles.find(c => c.id === value);if(role){role['assigned'] = true;- manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role])+ manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role]).then(response => {+ this.getUsers()+ })this._userRoleMapper[user.id] = role;}}private _updateUser(user, passwords, role) {if(passwords && passwords.resetPassword && passwords.repeatPassword) {- if(passwords.resetPassword !== passwords.repeatPassword) return;+ if(passwords.resetPassword !== passwords.repeatPassword) {+ this.validPassword = false;+ return;+ };const credentials = {value: passwords.resetPassword}manager.rest.api.UserResource.resetPassword(manager.displayRealm, user.id, credentials);}@@ -278,6 +317,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {const selectOptions = this._compositeRoles.map(role => {return [role.id, role.name]})+ const readonly = !manager.hasRole(ClientRole.WRITE_USER);return html`<div id="wrapper"><div id="title">@@ -286,7 +326,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {)}</div><div class="panel">- <p>${i18next.t("user_plural")}</p>+ <p class="panel-title">${i18next.t("user_plural")}</p><div id="table-users" class="mdc-data-table"><table class="mdc-data-table__table" aria-label="attribute list" ><thead>@@ -302,6 +342,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {(user, index) => {let passwords = {resetPassword: "", repeatPassword:""};let role = undefined;+ const isSameUser = user.username === manager.username;return html`<tr id="mdc-data-table-row-${index}" class="mdc-data-table__row" @click="${(ev) => expanderToggle(ev, index)}"><td@@ -325,23 +366,23 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {<div class="meta-item-container"><div class="row"><div class="column">- <or-input .label="${i18next.t("user")}" .type="${InputType.TEXT}" min="1" required .value="${user.username}" @or-input-changed="${(e: OrInputChangedEvent) => user.username = e.detail.value}"></or-input>- <or-input .label="${i18next.t("email")}" .type="${InputType.EMAIL}" min="1" required .value="${user.email}" @or-input-changed="${(e: OrInputChangedEvent) => user.email = e.detail.value}"></or-input>- <or-input .label="${i18next.t("firstName")}" .type="${InputType.TEXT}" min="1" required .value="${user.firstName}" @or-input-changed="${(e: OrInputChangedEvent) => user.firstName = e.detail.value}"></or-input>- <or-input .label="${i18next.t("lastName")}" .type="${InputType.TEXT}" min="1" required .value="${user.lastName}" @or-input-changed="${(e: OrInputChangedEvent) => user.lastName = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("user")}" .type="${InputType.TEXT}" min="1" required .value="${user.username}" @or-input-changed="${(e: OrInputChangedEvent) => user.username = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("email")}" .type="${InputType.EMAIL}" min="1" .value="${user.email}" @or-input-changed="${(e: OrInputChangedEvent) => user.email = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("firstName")}" .type="${InputType.TEXT}" min="1" .value="${user.firstName}" @or-input-changed="${(e: OrInputChangedEvent) => user.firstName = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("surname")}" .type="${InputType.TEXT}" min="1" .value="${user.lastName}" @or-input-changed="${(e: OrInputChangedEvent) => user.lastName = e.detail.value}"></or-input></div><div class="column">- <or-input .value="${this._userRoleMapper[user.id] ? this._userRoleMapper[user.id].id : null}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => role = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .value="${this._userRoleMapper[user.id] ? this._userRoleMapper[user.id].id : null}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => role = e.detail.value}"></or-input>- <or-input .label="${i18next.t("resetPassword")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => passwords.resetPassword = e.detail.value}"></or-input>- <or-input .label="${i18next.t("repeatPassword")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => passwords.repeatPassword = e.detail.value}"></or-input>- <or-input .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" required .value="${user.enabled}" @or-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => passwords.resetPassword = e.detail.value}"></or-input>+ <or-input helperText="${this.validPassword ? "" : i18next.t("samePassword")}" helperPersistent ?readonly="${readonly}" .label="${i18next.t("repeatPassword")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => {passwords.repeatPassword = e.detail.value; }}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" required .value="${user.enabled}" @or-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"></or-input></div></div><div class="row">- ${user.id ? html`+ ${user.id && !readonly ? html`<or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteUser(user)}"></or-input><or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateUser(user, passwords, role)}"></or-input>` : html`@@ -354,7 +395,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {</tr>`})}- ${!!this._users[this._users.length -1].id ? html`+ ${!!this._users[this._users.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="4"><a class="button" @click="${() => this._users = [...this._users, {enabled: true}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("user")}</strong></a>