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
Improvements user and role management page
Robin Dekkers274fd8c18e7c
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex adeb88f6b..ca03a10dd 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -193,6 +193,11 @@"tenant": "Tenant","tenant_plural": "Tenants","user_plural": "Users",+ "user_role": "Role",+ "role_plural": "Roles",+ "username":"Username",+ "deleteUserConfirm":"Are you sure you want to delete this user?",+ "deleteRoleConfirm":"Are you sure you want to delete this role?","realmRules": "realm rules","globalRules": "global rules","recipients": "Recipients",diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex 933742891..31002483c 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -193,6 +193,11 @@"tenant": "Tenant","tenant_plural": "Tenants","user_plural": "Gebruikers",+ "user_role": "Rol",+ "role_plural": "Rollen",+ "username":"Gebruikersnaam",+ "deleteUserConfirm":"Are you sure you want to delete this user?",+ "deleteRoleConfirm":"Are you sure you want to delete this role?","realmRules": "Realm regels","globalRules": "Globale regels","recipients": "Ontvangers",diff --git a/ui/app/or-app/src/pages/page-roles.ts b/ui/app/or-app/src/pages/page-roles.tsindex a9f4fc29a..55a367dbe 100644--- a/ui/app/or-app/src/pages/page-roles.ts+++ b/ui/app/or-app/src/pages/page-roles.ts@@ -17,6 +17,7 @@ import { Role } from "@openremote/model";import { i18next } from "@openremote/or-translate";import { OrIcon } from "@openremote/or-icon";import { InputType, OrInputChangedEvent } from "@openremote/or-input";+import {showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";const tableStyle = require("!!raw-loader!@material/data-table/dist/mdc.data-table.css");@@ -38,7 +39,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {return [unsafeCSS(tableStyle),css`- #wrapper {+ #wrapper {height: 100%;width: 100%;display: flex;@@ -47,16 +48,20 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {}#title {- margin: 20px auto;- padding: 0;+ margin: 0 auto;+ padding: 20px;font-size: 18px;font-weight: bold;- width: 100%;+ width: calc(100% - 40px);max-width: 1400px;}-++ #title or-icon {+ margin-right: 10px;+ }+.panel {- width: 100%;+ width: calc(100% - 80px);max-width: 1400px;background-color: white;border: 1px solid #e5e5e5;@@ -96,6 +101,10 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {flex: 1 1 0;}+ .mdc-data-table__header-cell {+ font-weight: bold;+ }+.attribute-meta-row.expanded .meta-item-container {max-height: 1000px;transition: max-height 1s ease-in;@@ -106,12 +115,19 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {display: flex;flex-direction: row;align-content: center;- margin: 10px 0px;+ margin: 10px 15px;+ align-items: center;}.button or-icon {--or-icon-fill: var(--or-app-color4);}++ @media screen and (max-width: 769px){+ .panel {+ border-radius: 0;+ }+ }`,];}@@ -174,16 +190,26 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {})}- private _createRole(role) {-- }-private _updateRoles() {const roles = [...this._compositeRoles, ...this._roles];- manager.rest.api.UserResource.updateRoles(manager.displayRealm, roles);+ manager.rest.api.UserResource.updateRoles(manager.displayRealm, roles).then(response => {+ this.getRoles()+ });+ }++ private _deleteRole(role) {+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteRoleConfirm"))+ .then((ok) => {+ if (ok) {+ this.doDelete(role);+ }+ });}++ private doDelete(role) {+ this._compositeRoles = [...this._compositeRoles.filter(u => u.id != role.id)]+ this._updateRoles()- private _deleterole(role) {}protected render(): TemplateResult | void {@@ -246,10 +272,11 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {${compositeRoleName}</td></tr>- <tr id="attribute-meta-row-${index}" class="attribute-meta-row">+ <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">@@ -267,9 +294,10 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {<div class="row">${role.id ? html`- <or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>+ <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`+ <or-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._compositeRoles.splice(-1,1); this._compositeRoles = [...this._compositeRoles]}}"></or-input><or-input style="margin-left: auto;" .label="${i18next.t("create")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>`}</div>@@ -278,11 +306,17 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {</tr>`})}+ ${!!this._compositeRoles[this._compositeRoles.length -1].id ? 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>+ </td>+ </tr>+ ` : ``}</tbody></table></div>- <a class="button" @click="${() => this._compositeRoles = [...this._compositeRoles, {compositeRoleIds:[]}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("role")}</strong></a></div></div>diff --git a/ui/app/or-app/src/pages/page-users.ts b/ui/app/or-app/src/pages/page-users.tsindex 9e83d7a74..0c0522f62 100644--- a/ui/app/or-app/src/pages/page-users.ts+++ b/ui/app/or-app/src/pages/page-users.ts@@ -17,6 +17,7 @@ import { Role, User } from "@openremote/model";import { i18next } from "@openremote/or-translate";import { OrIcon } from "@openremote/or-icon";import { InputType, OrInputChangedEvent } from "@openremote/or-input";+import {showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";const tableStyle = require("!!raw-loader!@material/data-table/dist/mdc.data-table.css");@@ -47,16 +48,20 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}#title {- margin: 20px auto;- padding: 0;+ margin: 0 auto;+ padding: 20px;font-size: 18px;font-weight: bold;- width: 100%;+ width: calc(100% - 40px);max-width: 1400px;}-++ #title or-icon {+ margin-right: 10px;+ }+.panel {- width: 100%;+ width: calc(100% - 80px);max-width: 1400px;background-color: white;border: 1px solid #e5e5e5;@@ -96,6 +101,10 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {flex: 1 1 0;}+ .mdc-data-table__header-cell {+ font-weight: bold;+ }+.attribute-meta-row.expanded .meta-item-container {max-height: 1000px;transition: max-height 1s ease-in;@@ -106,12 +115,19 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {display: flex;flex-direction: row;align-content: center;- margin: 10px 0px;+ margin: 10px 15px;+ align-items: center;}.button or-icon {--or-icon-fill: var(--or-app-color4);}++ @media screen and (max-width: 769px){+ .panel {+ border-radius: 0;+ }+ }`,];}@@ -183,9 +199,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {);}- private _createUser(user) {- manager.rest.api.UserResource.create(manager.displayRealm, user).then(response => {+ 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;+ 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)+ }+ }});}@@ -193,22 +218,38 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {private _updateRole(user, value) {if(this._compositeRoles.length === 0) returnconst role = this._compositeRoles.find(c => c.id === value);- role['assigned'] = true;- manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role])+ if(role){+ role['assigned'] = true;+ manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role])+ this._userRoleMapper[user.id] = role;+ }}- private _updateUser(user, passwords) {+ private _updateUser(user, passwords, role) {if(passwords && passwords.resetPassword && passwords.repeatPassword) {if(passwords.resetPassword !== passwords.repeatPassword) return;const credentials = {value: passwords.resetPassword}manager.rest.api.UserResource.resetPassword(manager.displayRealm, user.id, credentials);-+ }+ if(role) {+ this._updateRole(user, role)}manager.rest.api.UserResource.update(manager.displayRealm, user.id, user);}private _deleteUser(user) {- manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => console.log(response));+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteUserConfirm"))+ .then((ok) => {+ if (ok) {+ this.doDelete(user);+ }+ });+ }++ private doDelete(user) {+ manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => {+ this._users = [...this._users.filter(u => u.id != user.id)]+ })}protected render(): TemplateResult | void {@@ -260,6 +301,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${this._users.map((user, index) => {let passwords = {resetPassword: "", repeatPassword:""};+ let role = undefined;return html`<tr id="mdc-data-table-row-${index}" class="mdc-data-table__row" @click="${(ev) => expanderToggle(ev, index)}"><td@@ -278,7 +320,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${user.enabled ? "Active" : "In active"}</td></tr>- <tr id="attribute-meta-row-${index}" class="attribute-meta-row">+ <tr id="attribute-meta-row-${index}" class="attribute-meta-row${!user.username ? " expanded" : ""}"><td colspan="4"><div class="meta-item-container"><div class="row">@@ -290,12 +332,10 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {</div><div class="column">- ${user.id ? html`- <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) => this._updateRole(user, e.detail.value)}"></or-input>+ <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 .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("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></div></div>@@ -303,9 +343,10 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {<div class="row">${user.id ? 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)}"></or-input>+ <or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateUser(user, passwords, role)}"></or-input>` : html`- <or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._createUser(user)}"></or-input>+ <or-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._users.splice(-1,1); this._users = [...this._users]}}"></or-input>+ <or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._createUser(user, passwords, role)}"></or-input>`}</div></div>@@ -313,11 +354,18 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {</tr>`})}+ ${!!this._users[this._users.length -1].id ? 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>+ </td>+ </tr>+ ` : ``}+</tbody></table></div>- <a class="button" @click="${() => this._users = [...this._users, {}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("user")}</strong></a></div></div>