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
Implement actions for Realm page
Robin Dekkers48809edb34ef
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 048c32a34..d587db034 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -192,6 +192,9 @@"custom": "Manual input","tenant": "Tenant","tenant_plural": "Tenants",+ "displayName":"Friendly name",+ "realm management":"Realm management",+ "deleteTenantConfirm":"Are you sure you want to delete this Realm?","user_plural": "Users","user_role": "Role","role_plural": "Roles",diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex 492c9cc16..21fac6190 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -192,6 +192,9 @@"custom": "Handmatig input","tenant": "Tenant","tenant_plural": "Tenants",+ "displayName":"Friendly name",+ "realm management":"Realm management",+ "deleteTenantConfirm":"Are you sure you want to delete this Realm?","user_plural": "Gebruikers","user_role": "Rol","role_plural": "Rollen",diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.tsindex fe812ef6c..bc6de941d 100644--- a/ui/app/or-app/src/index.ts+++ b/ui/app/or-app/src/index.ts@@ -140,10 +140,10 @@ export function headerItemRoles<S extends AppStateKeyed, A extends AnyAction>(or}export function headerItemRealms<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {return {- icon: " account-circle",+ icon: "account-circle-outline",value: "realms",href: "realms",- text: "realms",+ text: "realm management",roles: ["write:admin"]};}diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex ca2ed9d7d..07c690535 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -464,7 +464,7 @@ class OrHeader extends LitElement {protected async _getTenants() {if (!this._tenants) {const response = await manager.rest.api.TenantResource.getAll();- this._tenants = response.data;+ this._tenants = response.data.filter(t => t.enabled);}return this._tenants;diff --git a/ui/app/or-app/src/pages/page-realms.ts b/ui/app/or-app/src/pages/page-realms.tsindex a01ce746b..310e060a9 100644--- a/ui/app/or-app/src/pages/page-realms.ts+++ b/ui/app/or-app/src/pages/page-realms.ts@@ -269,17 +269,18 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {this._getTenants()}- private _deleteRealms(role) {+ private _deleteTenant(tenant) {showOkCancelDialog(i18next.t("delete"), i18next.t("deleteTenantConfirm")).then((ok) => {if (ok) {- this.doDelete(role);+ this._doDelete(tenant);}});}- private doDelete(realm) {- this._tenants = [...this._tenants.filter(u => u.id != realm.id)]+ private async _doDelete(tenant) {+ await manager.rest.api.TenantResource.delete(tenant.realm);+ this._tenants = [...this._tenants.filter(u => u.id != tenant.id)]}private expanderToggle(ev: MouseEvent, index:number) {@@ -322,8 +323,8 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {<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 hide-mobile large" role="columnheader" scope="col"><or-translate value="permissions"></or-translate></th>+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="displayName"></or-translate></th>+ <th class="mdc-data-table__header-cell hide-mobile large" role="columnheader" scope="col"><or-translate value="status"></or-translate></th></tr></thead><tbody class="mdc-data-table__content">@@ -364,7 +365,9 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {<div class="row" style="margin-bottom: 0;">${tenant.id && !readonly ? html`- <or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteRealms(tenant)}"></or-input>+ ${tenant.realm !== "master" ? html`+ <or-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteTenant(tenant)}"></or-input>+ ` : ``}<or-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateTenant(tenant)}"></or-input>` : html`<or-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._tenants.splice(-1,1); this._tenants = [...this._tenants]}}"></or-input>diff --git a/ui/app/or-app/src/pages/page-users.ts b/ui/app/or-app/src/pages/page-users.tsindex 49fa3e5d9..f8f1218a1 100644--- a/ui/app/or-app/src/pages/page-users.ts+++ b/ui/app/or-app/src/pages/page-users.ts@@ -379,7 +379,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {</tr></thead><tbody class="mdc-data-table__content">- ${this._users.map(+ ${this._users.length > 0 ? this._users.map((user, index) => {const isSameUser = user.username === manager.username;const userRole = this._userRoleMapper[user.id];@@ -414,7 +414,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${user.id && this._userRoleMapper[user.id] ? html`<or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .value="${userRole ? ifDefined(userRole.id) : ifDefined(null)}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper[user.id] = e.detail.value}"></or-input>` : html`- <or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => {console.log(e.detail.value); this._userRoleMapper["newUser"] = e.detail.value;}}"></or-input>+ <or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper["newUser"] = e.detail.value}"></or-input>`}<or-input id="password-${index}" ?readonly="${readonly}" .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-input>@@ -438,8 +438,8 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {</td></tr>`- })}- ${!!this._users[this._users.length -1].id && !readonly ? html`+ }) : ``}+ ${this._users.length === 0 || this._users.length > 0 && !!this._users[this._users.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="100%"><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>diff --git a/ui/util/cli.js b/ui/util/cli.jsold mode 100644new mode 100755