Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Add user role page and role permissions

Robin Dekkersf7a5b8604d36
diff --git a/ui/app/main/src/index.ts b/ui/app/main/src/index.ts
index b6a6105ab..68a783e3c 100644
--- a/ui/app/main/src/index.ts
+++ b/ui/app/main/src/index.ts
@@ -16,6 +16,7 @@ import {
headerItemRules,
headerItemAccount,
headerItemUsers,
+ headerItemRoles,
headerItemInsights} from "@openremote/or-app";
import "@openremote/or-app/dist/pages/page-map";
import {pageMapReducer, pageMapProvider} from "@openremote/or-app/dist/pages/page-map";
@@ -33,6 +34,8 @@ import "@openremote/or-app/dist/pages/page-account";
import {pageAccountProvider} from "@openremote/or-app/dist/pages/page-account";
import "@openremote/or-app/dist/pages/page-users";
import {pageUsersProvider} from "@openremote/or-app/dist/pages/page-users";
+import "@openremote/or-app/dist/pages/page-roles";
+import {pageRolesProvider} from "@openremote/or-app/dist/pages/page-roles";
const rootReducer = combineReducers({
app: appReducer,
@@ -56,6 +59,7 @@ const appConfig: AppConfig<RootState> = {
insights: pageInsightsProvider(store),
rules: pageRulesProvider(store),
account: pageAccountProvider(store),
+ roles: pageRolesProvider(store),
users: pageUsersProvider(store)
},
default: {
@@ -80,6 +84,7 @@ const appConfig: AppConfig<RootState> = {
headerItemLogs(orApp),
headerItemAccount(orApp),
headerItemUsers(orApp),
+ headerItemRoles(orApp),
headerItemLogout(orApp)
// {
// icon: "account-cog",
diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.ts
index b2a8fa0f1..5520e1d86 100644
--- a/ui/app/or-app/src/index.ts
+++ b/ui/app/or-app/src/index.ts
@@ -128,6 +128,15 @@ export function headerItemUsers<S extends AppStateKeyed, A extends AnyAction>(or
roles: ["write:admin"]
};
}
+export function headerItemRoles<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "account-group",
+ value: "roles",
+ href: "roles",
+ text: "role_plural",
+ roles: ["write:admin"]
+ };
+}
export function getRealmQueryParameter(): string {
if(location.search && location.search !== "") {
return Util.getQueryParameter(location.search, "realm");
diff --git a/ui/app/or-app/src/pages/page-roles.ts b/ui/app/or-app/src/pages/page-roles.ts
new file mode 100644
index 000000000..a9f4fc29a
--- /dev/null
+++ b/ui/app/or-app/src/pages/page-roles.ts
@@ -0,0 +1,293 @@
+import {
+ css,
+ customElement,
+ html,
+ property,
+ PropertyValues,
+ TemplateResult,
+ unsafeCSS,
+} from "lit-element";
+import manager, { OREvent } from "@openremote/core";
+import "@openremote/or-panel";
+import "@openremote/or-translate";
+import { EnhancedStore } from "@reduxjs/toolkit";
+import { AppStateKeyed } from "../app";
+import { Page } from "../types";
+import { Role } from "@openremote/model";
+import { i18next } from "@openremote/or-translate";
+import { OrIcon } from "@openremote/or-icon";
+import { InputType, OrInputChangedEvent } from "@openremote/or-input";
+
+const tableStyle = require("!!raw-loader!@material/data-table/dist/mdc.data-table.css");
+
+export function pageRolesProvider<S extends AppStateKeyed>(
+ store: EnhancedStore<S>
+) {
+ return {
+ routes: ["roles"],
+ pageCreator: () => {
+ return new PageRoles(store);
+ },
+ };
+}
+
+@customElement("page-roles")
+class PageRoles<S extends AppStateKeyed> extends Page<S> {
+ static get styles() {
+ // language=CSS
+ return [
+ unsafeCSS(tableStyle),
+ css`
+ #wrapper {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: auto;
+ }
+
+ #title {
+ margin: 20px auto;
+ padding: 0;
+ font-size: 18px;
+ font-weight: bold;
+ width: 100%;
+ max-width: 1400px;
+ }
+
+ .panel {
+ width: 100%;
+ max-width: 1400px;
+ background-color: white;
+ border: 1px solid #e5e5e5;
+ border-radius: 5px;
+ position: relative;
+ margin: 0 auto;
+ padding: 20px;
+ }
+
+ #table-users {
+ width: 100%;
+ }
+
+ .meta-item-container {
+ flex-direction: row;
+ overflow: hidden;
+ max-height: 0;
+ transition: max-height 0.25s ease-out;
+ padding: 0 20px 0 50px;
+ }
+
+ or-input {
+ margin-bottom: 20px;
+ }
+
+ .row {
+ display: flex;
+ flex-direction: row;
+ margin: 10px 0;
+ flex: 1 1 0;
+ }
+
+ .column {
+ display: flex;
+ flex-direction: column;
+ margin: 10px;
+ flex: 1 1 0;
+ }
+
+ .attribute-meta-row.expanded .meta-item-container {
+ max-height: 1000px;
+ transition: max-height 1s ease-in;
+ }
+
+ .button {
+ cursor: pointer;
+ display: flex;
+ flex-direction: row;
+ align-content: center;
+ margin: 10px 0px;
+ }
+
+ .button or-icon {
+ --or-icon-fill: var(--or-app-color4);
+ }
+ `,
+ ];
+ }
+ @property()
+ protected _compositeRoles: Role[] = [];
+
+ @property()
+ protected _roles: Role[] = [];
+
+ @property()
+ protected _rolesMapper = {};
+
+ @property()
+ public realm?: string;
+
+ get name(): string {
+ return "roles";
+ }
+
+ 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")) {
+ this.getRoles();
+ }
+
+ return super.shouldUpdate(_changedProperties);
+ }
+
+ public connectedCallback() {
+ super.connectedCallback();
+ manager.addListener(this._onManagerEvent);
+ }
+
+ public disconnectedCallback() {
+ super.disconnectedCallback();
+ manager.removeListener(this._onManagerEvent);
+ }
+
+
+ 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 => {
+ this._rolesMapper[role.id] = role.name
+ })
+ })
+ }
+
+ private _createRole(role) {
+
+ }
+
+ private _updateRoles() {
+ const roles = [...this._compositeRoles, ...this._roles];
+ manager.rest.api.UserResource.updateRoles(manager.displayRealm, roles);
+ }
+
+ private _deleterole(role) {
+ }
+
+ protected render(): TemplateResult | void {
+ if (!manager.authenticated) {
+ return html`
+ <or-translate value="notAuthenticated"></or-translate>
+ `;
+ }
+
+ if (!manager.isKeycloak()) {
+ return html`
+ <or-translate value="notSupported"></or-translate>
+ `;
+ }
+ const expanderToggle = (ev: MouseEvent, index:number) => {
+ const metaRow = this.shadowRoot.getElementById('attribute-meta-row-'+index)
+ const expanderIcon = this.shadowRoot.getElementById('mdc-data-table-icon-'+index) as OrIcon
+ if(metaRow.classList.contains('expanded')){
+ metaRow.classList.remove("expanded");
+ expanderIcon.icon = "chevron-right";
+ } else {
+ metaRow.classList.add("expanded");
+ expanderIcon.icon = "chevron-down";
+ }
+ };
+ return html`
+ <div id="wrapper">
+ <div id="title">
+ <or-icon icon="account-group"></or-icon>${i18next.t(
+ "role"
+ )}
+ </div>
+ <div class="panel">
+ <p>${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>
+ </tr>
+ </thead>
+ <tbody class="mdc-data-table__content">
+ ${this._compositeRoles.map(
+ (role, index) => {
+ const compositeRoleName = role.compositeRoleIds.map(id => this._rolesMapper[id]).join(', ');
+ return html`
+ <tr id="mdc-data-table-row-${index}" class="mdc-data-table__row" @click="${(ev) => expanderToggle(ev, index)}">
+ <td
+ class="padded-cell mdc-data-table__cell"
+ >
+ <or-icon id="mdc-data-table-icon-${index}" icon="chevron-right"></or-icon>
+ <span>${role.name}</span>
+ </td>
+ <td class="padded-cell mdc-data-table__cell">
+ ${role.description}
+ </td>
+ <td class="padded-cell mdc-data-table__cell">
+ ${compositeRoleName}
+ </td>
+ </tr>
+ <tr id="attribute-meta-row-${index}" class="attribute-meta-row">
+ <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>
+
+ <div class="row">
+ <div class="column">
+ ${this._roles.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>
+ `
+ })}
+
+ </div>
+
+ <div class="column">
+ </div>
+ </div>
+
+ <div class="row">
+ ${role.id ? html`
+ <or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>
+ <or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>
+ ` : html`
+ <or-input style="margin-left: auto;" .label="${i18next.t("create")}" .type="${InputType.BUTTON}" @click="${() => this._updateRoles()}"></or-input>
+ `}
+ </div>
+ </div>
+ </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>
+
+ `;
+ }
+
+ public stateChanged(state: S) {}
+}
diff --git a/ui/app/or-app/src/pages/page-users.ts b/ui/app/or-app/src/pages/page-users.ts
index 766b3506d..9e83d7a74 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 { User } from "@openremote/model";
+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";
@@ -52,7 +52,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
font-size: 18px;
font-weight: bold;
width: 100%;
- max-width: 1360px;
+ max-width: 1400px;
}
.panel {
@@ -119,6 +119,12 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
@property()
protected _users: User[] = [];
+ @property()
+ protected _compositeRoles: Role[] = [];
+
+ @property()
+ protected _userRoleMapper = {};
+
@property()
public realm?: string;
@@ -160,8 +166,20 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
private getUsers() {
+ manager.rest.api.UserResource.getRoles(manager.displayRealm).then(roleResponse => {
+ this._compositeRoles = [...roleResponse.data.filter(role => role.composite)];
+ })
manager.rest.api.UserResource.getAll(manager.displayRealm).then(
- (usersResponse) => (this._users = [...usersResponse.data])
+ (usersResponse) => {
+ this._users = [...usersResponse.data];
+ this._users.map(user => {
+ manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id).then(userRoleResponse => {
+ this._userRoleMapper[user.id] = userRoleResponse.data.find(r => r.composite && r.assigned);
+ this.requestUpdate()
+ })
+ })
+
+ }
);
}
@@ -170,7 +188,14 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
this.getUsers()
});
-}
+ }
+
+ private _updateRole(user, value) {
+ if(this._compositeRoles.length === 0) return
+ const role = this._compositeRoles.find(c => c.id === value);
+ role['assigned'] = true;
+ manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role])
+ }
private _updateUser(user, passwords) {
if(passwords && passwords.resetPassword && passwords.repeatPassword) {
@@ -209,6 +234,9 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
expanderIcon.icon = "chevron-down";
}
};
+ const selectOptions = this._compositeRoles.map(role => {
+ return [role.id, role.name]
+ })
return html`
<div id="wrapper">
<div id="title">
@@ -244,9 +272,10 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
${user.email}
</td>
<td class="padded-cell mdc-data-table__cell">
+ ${this._userRoleMapper[user.id] ? this._userRoleMapper[user.id].name : null}
</td>
<td class="padded-cell mdc-data-table__cell">
- ${user.enabled}
+ ${user.enabled ? "Active" : "In active"}
</td>
</tr>
<tr id="attribute-meta-row-${index}" class="attribute-meta-row">
@@ -262,10 +291,12 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
<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 .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 .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>