Skip to content

armgit / core

Public Imported from GitHub
0

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

UI updates: minor updates and fixes

Rich Turner76429d0bdbc2
diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.ts
index 9eb58df25..5d3858dc4 100644
--- a/ui/app/or-app/src/index.ts
+++ b/ui/app/or-app/src/index.ts
@@ -134,6 +134,7 @@ export function headerItemInsights<S extends AppStateKeyed, A extends AnyAction>
export function headerItemGatewayConnection<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
return {
icon: "cloud",
+ value: "gateway",
href: "#!gateway",
text: "gatewayConnection",
roles: ["write:admin", "read:admin"]
diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.ts
index 6b3df2935..bb9dc4e8d 100644
--- a/ui/app/or-app/src/or-header.ts
+++ b/ui/app/or-app/src/or-header.ts
@@ -6,6 +6,7 @@ import manager from "@openremote/core";
import "@openremote/or-mwc-components/dist/or-mwc-dialog";
import "@openremote/or-icon";
import {MenuItem, getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";
+import { Tenant } from "@openremote/model";
export interface HeaderConfig {
mainMenu: HeaderItem[];
@@ -45,37 +46,6 @@ function getHeaderMenuItems(items: HeaderItem[]): MenuItem[] {
});
}
-function getRealmMenu(callback: (language: string) => void): TemplateResult {
- if (!manager.isSuperUser()) {
- return html``;
- }
-
- const picker = manager.rest.api.TenantResource.getAll().then((response) => {
-
- const menuItems = response.data.map((r) => {
- return {
- text: r.displayName!,
- value: r.realm!
- } as MenuItem;
- });
-
- return html`
- ${getContentWithMenuTemplate(
- html`
- <div id="realm-picker">
- <span style="margin-left: 10px;">${manager.displayRealm}</span>
- <or-icon icon="chevron-down"></or-icon>
- </div>
- `,
- menuItems,
- manager.displayRealm,
- (values: string | string[]) => callback(values as string))}
- `;
- });
-
- return html`${until(picker, html``)}`;
-}
-
@customElement("or-header")
class OrHeader extends LitElement {
@@ -97,7 +67,7 @@ class OrHeader extends LitElement {
@query("div[id=mobile-bottom]")
protected _mobileBottomDiv!: HTMLDivElement;
- protected _realmPicker?: TemplateResult;
+ protected _tenants?: Tenant[];
protected _hashCallback = (e: Event) => {
this._onHashChanged(e);
};
@@ -340,10 +310,6 @@ class OrHeader extends LitElement {
protected render() {
- if (!this._realmPicker) {
- this._realmPicker = getRealmMenu((value: string) => this._onRealmSelect(value));
- }
-
const mainItems = this.config ? this.config.mainMenu : undefined;
const secondaryItems = this.config ? this.config.secondaryMenu : undefined;
@@ -364,7 +330,7 @@ class OrHeader extends LitElement {
</div>
</nav>
<div id="desktop-right">
- ${this._realmPicker}
+ ${this._getRealmMenu((value: string) => this._onRealmSelect(value))}
${secondaryItems ? getContentWithMenuTemplate(html`
<button id="menu-btn-desktop" class="menu-btn" title="Menu"><or-icon icon="dots-vertical"></or-icon></button>
`,
@@ -402,6 +368,46 @@ class OrHeader extends LitElement {
`;
}
+ protected _getRealmMenu(callback: (language: string) => void): TemplateResult {
+ if (!manager.isSuperUser()) {
+ return html``;
+ }
+
+ const picker = this._getTenants().then((tenants) => {
+
+ const menuItems = tenants.map((r) => {
+ return {
+ text: r.displayName!,
+ value: r.realm!
+ } as MenuItem;
+ });
+
+ return html`
+ ${getContentWithMenuTemplate(
+ html`
+ <div id="realm-picker">
+ <span style="margin-left: 10px;">${manager.displayRealm}</span>
+ <or-icon icon="chevron-down"></or-icon>
+ </div>
+ `,
+ menuItems,
+ manager.displayRealm,
+ (values: string | string[]) => callback(values as string))}
+ `;
+ });
+
+ return html`${until(picker, html``)}`;
+ }
+
+ protected async _getTenants() {
+ if (!this._tenants) {
+ const response = await manager.rest.api.TenantResource.getAll();
+ this._tenants = response.data;
+ }
+
+ return this._tenants;
+ }
+
protected _onSecondaryMenuSelect(value: string) {
const headerItem = this.config!.secondaryMenu!.find((item) => item.value === value);
if (headerItem) {
@@ -417,7 +423,7 @@ class OrHeader extends LitElement {
}
}
- protected _onRealmSelect(realm: string) {
+ _onRealmSelect(realm: string) {
manager.displayRealm = realm;
this.requestUpdate();
}
diff --git a/ui/app/or-app/src/pages/page-gateway.ts b/ui/app/or-app/src/pages/page-gateway.ts
index e32c71f4d..a09fa8feb 100644
--- a/ui/app/or-app/src/pages/page-gateway.ts
+++ b/ui/app/or-app/src/pages/page-gateway.ts
@@ -2,7 +2,7 @@ import {css, customElement, html, property, PropertyValues, TemplateResult, unsa
import i18next from "i18next";
import "@openremote/or-panel";
import {ConnectionStatus, GatewayConnection, GatewayConnectionStatusEvent} from "@openremote/model";
-import manager, {DefaultColor1} from "@openremote/core";
+import manager, {DefaultColor1, OREvent} from "@openremote/core";
import {InputType, OrInputChangedEvent} from "@openremote/or-input";
import {AppStateKeyed, Page} from "../index";
import {EnhancedStore} from "@reduxjs/toolkit";
@@ -95,6 +95,14 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
protected _readonly = false;
protected _eventSubscriptionId?: string;
+ protected _onManagerEvent = (event: OREvent) => {
+ switch (event) {
+ case OREvent.DISPLAY_REALM_CHANGED:
+ this.realm = manager.displayRealm;
+ break;
+ }
+ };
+
constructor(store: EnhancedStore<S>) {
super(store);
}
@@ -102,12 +110,14 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
connectedCallback() {
super.connectedCallback();
this._readonly = !manager.hasRole("write:admin");
+ manager.addListener(this._onManagerEvent)
this._subscribeEvents();
}
disconnectedCallback(): void {
super.disconnectedCallback();
this._unsubscribeEvents();
+ manager.removeListener(this._onManagerEvent);
}
public shouldUpdate(_changedProperties: PropertyValues): boolean {
@@ -123,7 +133,7 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
super.updated(_changedProperties);
if (!this.realm) {
- this.realm = this._getRealm();
+ this.realm = manager.displayRealm;
}
}
@@ -220,8 +230,4 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
this._connectionStatus = event.connectionStatus;
}
}
-
- protected _getRealm(): string {
- return this.realm || manager.getRealm();
- }
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 12c59d3ff..3dee77212 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -414,6 +414,9 @@ export class Manager implements EventProviderFactory {
}
set displayRealm(realm: string) {
+ if (!this.isSuperUser()) {
+ return;
+ }
this._displayRealm = realm;
this._emitEvent(OREvent.DISPLAY_REALM_CHANGED);
}