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: Improve realm change handling (Closes #559)

Rich Turner02070ccfbba9
diff --git a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
index daa0c9807..a56dbc32c 100644
--- a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
@@ -31,6 +31,7 @@ import javax.ws.rs.ClientErrorException;
import javax.ws.rs.NotAllowedException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+import java.util.Arrays;
import java.util.logging.Logger;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
@@ -60,6 +61,18 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
}
+ @Override
+ public Tenant[] getAccessible(RequestParams requestParams) {
+ try {
+ Tenant[] tenants = isSuperUser() ? identityService.getIdentityProvider().getTenants() : new Tenant[] {getAuthenticatedTenant()};
+ return Arrays.stream(tenants).map(tenant -> new Tenant().setRealm(tenant.getRealm()).setDisplayName(tenant.getDisplayName())).toArray(Tenant[]::new);
+ } catch (ClientErrorException ex) {
+ throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
+ } catch (Exception ex) {
+ throw new WebApplicationException(ex);
+ }
+ }
+
@Override
public Tenant get(RequestParams requestParams, String realm) {
Tenant tenant = identityService.getIdentityProvider().getTenant(realm);
diff --git a/model/src/main/java/org/openremote/model/security/TenantResource.java b/model/src/main/java/org/openremote/model/security/TenantResource.java
index 5c5bddb4e..cc5bb1eed 100644
--- a/model/src/main/java/org/openremote/model/security/TenantResource.java
+++ b/model/src/main/java/org/openremote/model/security/TenantResource.java
@@ -42,9 +42,16 @@ public interface TenantResource {
@GET
@Produces(APPLICATION_JSON)
- @RolesAllowed(Constants.READ_LOGS_ROLE)
Tenant[] getAll(@BeanParam RequestParams requestParams);
+ /**
+ * Will return realm and display names for accessible realms by authenticated user
+ */
+ @GET
+ @Path("accessible")
+ @Produces(APPLICATION_JSON)
+ Tenant[] getAccessible(@BeanParam RequestParams requestParams);
+
/**
* Regular users can call this, but only to obtain details about their currently authenticated and active realm.
*/
diff --git a/ui/app/manager/src/index.ts b/ui/app/manager/src/index.ts
index a4ca51aca..34e9ca553 100644
--- a/ui/app/manager/src/index.ts
+++ b/ui/app/manager/src/index.ts
@@ -59,6 +59,10 @@ const rootReducer = combineReducers({
type RootState = ReturnType<typeof rootReducer>;
+export const store = configureStore({
+ reducer: rootReducer
+});
+
type HeaderName = "map" | "assets" | "rules" | "insights" | "gateway" | "logs" | "account" | "users" | "roles" | "realms" | "logout" | "language" | "export";
export interface ManagerRealmConfig {
@@ -83,10 +87,6 @@ export interface ManagerAppConfig {
manager?: ManagerConfig;
}
-export const store = configureStore({
- reducer: rootReducer
-});
-
const orApp = new OrApp(store);
export const DefaultPagesConfig: PageProvider<any>[] = [
diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.ts
index 7cb4d7c19..d8a113503 100644
--- a/ui/app/manager/src/pages/page-gateway.ts
+++ b/ui/app/manager/src/pages/page-gateway.ts
@@ -1,5 +1,5 @@
import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
-import {customElement, property} from "lit/decorators.js";
+import {customElement, property, state} from "lit/decorators.js";
import i18next from "i18next";
import "@openremote/or-components/or-panel";
import {ConnectionStatus, GatewayConnection, GatewayConnectionStatusEvent} from "@openremote/model";
@@ -111,16 +111,16 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
`;
}
- @property()
- public realm?: string;
+ @state()
+ protected realm?: string;
- @property()
+ @state()
protected _loading = true;
- @property()
+ @state()
protected _connection?: GatewayConnection;
- @property()
+ @state()
protected _connectionStatus?: ConnectionStatus;
@property()
@@ -129,14 +129,6 @@ 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;
- }
- };
-
get name(): string {
return "gatewayConnection";
}
@@ -148,14 +140,12 @@ 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 {
@@ -207,6 +197,7 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {
}
public stateChanged(state: S) {
+ this.realm = state.app.realm;
}
protected async _subscribeEvents() {
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index e50a5cff0..b031baed6 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -33,7 +33,8 @@ export function pageRealmsProvider<S extends AppStateKeyed>(store: EnhancedStore
@customElement("page-realms")
class PageRealms<S extends AppStateKeyed> extends Page<S> {
- static get styles() {
+
+ static get styles() {
// language=CSS
return [
unsafeCSS(tableStyle),
@@ -217,9 +218,6 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
@property()
protected _tenants: Tenant[] = [];
- @property()
- public realm?: string;
-
get name(): string {
return "realm_plural";
}
@@ -229,14 +227,6 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
this._getTenants();
}
- 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")) {
@@ -246,69 +236,6 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
return super.shouldUpdate(_changedProperties);
}
- public connectedCallback() {
- super.connectedCallback();
- manager.addListener(this._onManagerEvent);
- }
-
- public disconnectedCallback() {
- super.disconnectedCallback();
- manager.removeListener(this._onManagerEvent);
- }
-
-
-
- protected async _getTenants() {
- const response = await manager.rest.api.TenantResource.getAll();
- this._tenants = response.data;
- return this._tenants;
- }
-
- private async _updateTenant(tenant) {
- const response = await manager.rest.api.TenantResource.update(tenant.realm, tenant);
- const data:any = response.data;
- this._tenants = this._tenants.map(t => {
- if(t.id === data.id) {
- return data;
- } else {
- return t
- }
- })
- }
-
- private async _createTenant(tenant) {
- await manager.rest.api.TenantResource.create(tenant).then(response => {
- //TODO improve this so that header realm picker is updated
- window.location.reload()
- });
- }
-
- private _deleteTenant(tenant) {
- showOkCancelDialog(i18next.t("delete"), i18next.t("deleteTenantConfirm"), i18next.t("delete"))
- .then((ok) => {
- if (ok) {
- this._doDelete(tenant);
- }
- });
- }
-
- 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) {
- 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";
- }
- }
-
protected render(): TemplateResult | void {
if (!manager.authenticated) {
return html`
@@ -409,5 +336,56 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
`;
}
- public stateChanged(state: S) {}
+ public stateChanged(state: S) {
+ }
+
+ protected async _getTenants() {
+ const response = await manager.rest.api.TenantResource.getAll();
+ this._tenants = response.data;
+ return this._tenants;
+ }
+
+ private async _updateTenant(tenant) {
+ const response = await manager.rest.api.TenantResource.update(tenant.realm, tenant);
+ const data: any = response.data;
+ this._tenants = this._tenants.map(t => {
+ if (t.id === data.id) {
+ return data;
+ }
+ return t;
+ })
+ }
+
+ private async _createTenant(tenant) {
+ await manager.rest.api.TenantResource.create(tenant).then(response => {
+ //TODO improve this so that header realm picker is updated
+ window.location.reload();
+ });
+ }
+
+ private _deleteTenant(tenant) {
+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteTenantConfirm"), i18next.t("delete"))
+ .then((ok) => {
+ if (ok) {
+ this._doDelete(tenant);
+ }
+ });
+ }
+
+ 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) {
+ 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";
+ }
+ }
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 19638e375..abcadcac8 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -618,7 +618,7 @@ export class Manager implements EventProviderFactory {
private _console!: Console;
private _consoleAppConfig?: ConsoleAppConfig;
private _events?: EventProvider;
- private _displayRealm?: string = "";
+ private _displayRealm?: string;
public isManagerSameOrigin(): boolean {
if (!this.ready) {
diff --git a/ui/component/or-app/src/app.ts b/ui/component/or-app/src/app.ts
index d6caa9d57..f000463c7 100644
--- a/ui/component/or-app/src/app.ts
+++ b/ui/component/or-app/src/app.ts
@@ -1,3 +1,4 @@
+import manager from "@openremote/core";
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
export interface AppState {
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index 37efde5d1..4cad6e899 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -6,7 +6,7 @@ import {
TemplateResult,
unsafeCSS
} from "lit";
-import {customElement, property, query} from "lit/decorators.js";
+import {customElement, property, query, state} from "lit/decorators.js";
import {AppConfig, Page, RealmAppConfig, router} from "./types";
import "@openremote/or-translate";
import "@openremote/or-mwc-components/or-mwc-menu";
@@ -16,7 +16,7 @@ import "@openremote/or-icon";
import {updateMetadata} from "pwa-helpers/metadata";
import i18next from "i18next";
import manager, {Auth, DefaultColor2, DefaultColor3, DefaultColor4, ManagerConfig, Util, BasicLoginResult, OREvent, normaliseConfig, Manager} from "@openremote/core";
-import {DEFAULT_LANGUAGES, HeaderConfig, Languages} from "./or-header";
+import {DEFAULT_LANGUAGES, HeaderConfig} from "./or-header";
import {OrMwcDialog, showErrorDialog, showDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import {OrMwcSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
import {AnyAction, EnhancedStore, Unsubscribe} from "@reduxjs/toolkit";
@@ -24,6 +24,7 @@ import {ThunkMiddleware} from "redux-thunk";
import {AppStateKeyed, updatePage, updateRealm} from "./app";
import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
import { ORError } from "@openremote/core";
+import { Tenant } from "@openremote/model";
const DefaultLogo = require("../images/logo.svg");
const DefaultMobileLogo = require("../images/logo-mobile.svg");
@@ -61,7 +62,7 @@ const DEFAULT_MANAGER_CONFIG: ManagerConfig = {
keycloakUrl: KEYCLOAK_URL,
auth: Auth.KEYCLOAK,
autoLogin: true,
- realm: getRealmQueryParameter(),
+ realm: undefined,
consoleAutoEnable: true,
loadTranslations: ["or"]
};
@@ -80,15 +81,19 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
@query("main")
protected _mainElem!: HTMLElement;
- @property()
+ @state()
protected _initialised = false;
- @property()
+ @state()
protected _page?: string;
- @property()
+ @state()
protected _config!: RealmAppConfig;
+ @state()
+ protected _realm?: string;
+
+ protected _realms!: Tenant[];
protected _store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware<S>>>;
protected _storeUnsubscribe!: Unsubscribe;
@@ -165,42 +170,16 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
super.disconnectedCallback();
}
- protected _onManagerEvent = (event: OREvent) => {
- switch (event) {
- case OREvent.DISPLAY_REALM_CHANGED:
- this._store.dispatch(updateRealm(manager.displayRealm));
- const config = this._getConfig(manager.displayRealm);
-
- if (!config) {
- console.error("No default AppConfig or realm specific config for requested realm: " + manager.displayRealm);
- return;
- } else {
- this._config = config;
- }
- break;
- }
- };
-
- protected doAppConfigInit() {
- this.appConfig = this.appConfig || (this.appConfigProvider ? this.appConfigProvider(manager) : undefined);
-
- if (!this.appConfig) {
- return;
- }
-
- if (!this._config) {
- const realm = getRealmQueryParameter();
- this._config = this._getConfig(realm);
- }
- }
-
protected firstUpdated(_changedProperties: Map<PropertyKey, unknown>): void {
super.firstUpdated(_changedProperties);
const managerConfig: ManagerConfig = this.managerConfig ? {...DEFAULT_MANAGER_CONFIG,...this.managerConfig} : DEFAULT_MANAGER_CONFIG;
+ if (!managerConfig.realm) {
+ // Use realm query parameter if no specific realm provided
+ managerConfig.realm = getRealmQueryParameter();
+ }
managerConfig.skipFallbackToBasicAuth = true; // We do this so we can load styling config before displaying basic login
managerConfig.basicLoginProvider = (u, p) => this.doBasicLogin(u, p);
- manager.addListener(this._onManagerEvent);
console.info("Initialising the manager");
@@ -240,8 +219,25 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
return;
}
+ // Load available realm info
+ const response = await manager.rest.api.TenantResource.getAccessible();
+ this._realms = response.data;
+ let realm: string | null | undefined = undefined;
+
+ // Set current display realm if super user
+ if (manager.isSuperUser()) {
+ // Look in session storage
+ realm = window.sessionStorage.getItem("realm");
+ if (realm && !this._realms.some(r => r.realm === realm)) {
+ realm = undefined;
+ }
+ }
+
+ this._store.dispatch(updateRealm(realm || manager.getRealm() || "master"));
+
this._initialised = true;
+ // Configure routes
this.appConfig.pages.forEach((pageProvider, index) => {
if (pageProvider.routes) {
pageProvider.routes.forEach((route) => {
@@ -253,17 +249,11 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
});
}
});
-
if (this.appConfig.pages.length > 0) {
router.notFound(() => {
this._store.dispatch(updatePage(this.appConfig!.pages[0].name));
});
}
-
- window.onhashchange = (e: Event) => {
- console.log(e);
- };
-
router.resolve();
} else {
showErrorDialog(manager.isError ? "managerError." + manager.error : "");
@@ -271,52 +261,6 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
});
}
- protected doBasicLogin(username: string | undefined, password: string | undefined): PromiseLike<BasicLoginResult> {
- const deferred = new Util.Deferred<BasicLoginResult>();
-
- let u = username;
- let p = password;
-
- // language=CSS
- const styles = html`
- #login-logo {
- width: 24px;
- height: 24px;
- }
-
- #login_wrapper > or-mwc-input {
- margin: 10px 0;
- width: 100%;
- }
- `;
-
- const dialog = showDialog(new OrMwcDialog()
- .setStyles(html`<style>${styles}</style>`)
- .setHeading(html`<img id="login-logo" src="${this._config.logoMobile || this._config.logo}" /></or-icon><or-translate value="login"></or-translate>`)
- .setContent(html`
- <div id="login_wrapper">
- <or-mwc-input .label="${i18next.t("user")}" .type="${InputType.TEXT}" min="1" required .value="${username}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => u = e.detail.value}"></or-mwc-input>
- <or-mwc-input .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" required .value="${password}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => p = e.detail.value}"></or-mwc-input>
- </div>
- `)
- .setActions([
- {
- actionName: "submit",
- default: true,
- action: () => {
- deferred.resolve({
- cancel: false,
- username: u!,
- password: p!
- });
- },
- content: html`<or-mwc-input .type=${InputType.BUTTON} .label="${i18next.t("submit")}" raised></or-mwc-input>`
- }
- ]), document.body); // Attach to document as or-app isn't visible until initialised
-
- return deferred.promise;
- }
-
protected updated(changedProps: PropertyValues) {
super.updated(changedProps);
@@ -342,25 +286,17 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
}
}
- protected updateWindowTitle() {
- if (!this._initialised) {
- return;
- }
-
- const appTitle = this._config.appTitle || "";
- let pageTitle = (i18next.isInitialized ? i18next.t(appTitle) : appTitle);
- const pageElem = (this._mainElem ? this._mainElem.firstElementChild : undefined) as Page<any>;
- if (pageElem) {
- pageTitle += (i18next.isInitialized ? " - " + i18next.t(pageElem.name) : " - " + pageElem.name);
+ protected shouldUpdate(changedProps: PropertyValues): boolean {
+ if (changedProps.has("_realm")) {
+ this._config = this._getConfig();
+ if (this._realm) {
+ manager.displayRealm = this._realm;
+ window.sessionStorage.setItem("realm", this._realm!);
+ } else {
+ window.sessionStorage.removeItem("realm");
+ }
}
- updateMetadata({
- title: pageTitle,
- description: pageTitle
- });
- }
-
- protected shouldUpdate(changedProps: PropertyValues): boolean {
if (changedProps.has("_config") && this._config) {
if (!this._config.logo) {
@@ -402,7 +338,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
${this._config.styles ? typeof(this._config.styles) === "string" ? html`<style>${this._config.styles}</style>` : this._config.styles.strings : ``}
${consoleStyles}
${this._config.header ? html`
- <or-header .logo="${this._config.logo}" .logoMobile="${this._config.logoMobile}" .config="${this._config.header}"></or-header>
+ <or-header .store="${this._store}" .realm="${this._realm}" .realms="${this._realms}" .logo="${this._config.logo}" .logoMobile="${this._config.logoMobile}" .config="${this._config.header}"></or-header>
` : ``}
<!-- Main content -->
@@ -412,6 +348,11 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
`;
}
+ public stateChanged(state: S) {
+ this._realm = state.app.realm;
+ this._page = state.app!.page;
+ }
+
public logout() {
manager.logout();
}
@@ -425,23 +366,94 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
.setHeading("language")
.setDismissAction(null)
.setActions(Object.entries(DEFAULT_LANGUAGES).map(([key, value]) => {
- return {
- content: i18next.t(value),
- actionName: key,
- action: () => {
- manager.language = key;
+ return {
+ content: i18next.t(value),
+ actionName: key,
+ action: () => {
+ manager.language = key;
+ }
+ }})));
+ }
+
+ protected doAppConfigInit() {
+ this.appConfig = this.appConfig || (this.appConfigProvider ? this.appConfigProvider(manager) : undefined);
+
+ if (!this.appConfig) {
+ return;
+ }
+
+ if (!this._config) {
+ this._config = this._getConfig();
+ }
+ }
+
+ protected doBasicLogin(username: string | undefined, password: string | undefined): PromiseLike<BasicLoginResult> {
+ const deferred = new Util.Deferred<BasicLoginResult>();
+
+ let u = username;
+ let p = password;
+
+ // language=CSS
+ const styles = html`
+ #login-logo {
+ width: 24px;
+ height: 24px;
+ }
+
+ #login_wrapper > or-mwc-input {
+ margin: 10px 0;
+ width: 100%;
+ }
+ `;
+
+ const dialog = showDialog(new OrMwcDialog()
+ .setStyles(html`<style>${styles}</style>`)
+ .setHeading(html`<img id="login-logo" src="${this._config.logoMobile || this._config.logo}" /></or-icon><or-translate value="login"></or-translate>`)
+ .setContent(html`
+ <div id="login_wrapper">
+ <or-mwc-input .label="${i18next.t("user")}" .type="${InputType.TEXT}" min="1" required .value="${username}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => u = e.detail.value}"></or-mwc-input>
+ <or-mwc-input .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" required .value="${password}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => p = e.detail.value}"></or-mwc-input>
+ </div>
+ `)
+ .setActions([
+ {
+ actionName: "submit",
+ default: true,
+ action: () => {
+ deferred.resolve({
+ cancel: false,
+ username: u!,
+ password: p!
+ });
+ },
+ content: html`<or-mwc-input .type=${InputType.BUTTON} .label="${i18next.t("submit")}" raised></or-mwc-input>`
}
- }})));
+ ]), document.body); // Attach to document as or-app isn't visible until initialised
+
+ return deferred.promise;
}
- public stateChanged(state: S) {
- this._page = state.app!.page;
+ protected updateWindowTitle() {
+ if (!this._initialised) {
+ return;
+ }
+
+ const appTitle = this._config.appTitle || "";
+ let pageTitle = (i18next.isInitialized ? i18next.t(appTitle) : appTitle);
+ const pageElem = (this._mainElem ? this._mainElem.firstElementChild : undefined) as Page<any>;
+ if (pageElem) {
+ pageTitle += (i18next.isInitialized ? " - " + i18next.t(pageElem.name) : " - " + pageElem.name);
+ }
+
+ updateMetadata({
+ title: pageTitle,
+ description: pageTitle
+ });
}
- protected _getConfig(realm: string | undefined): RealmAppConfig {
- realm = realm || "default";
+ protected _getConfig(): RealmAppConfig {
const defaultConfig = this.appConfig!.realms ? this.appConfig!.realms.default : {};
- let realmConfig = this.appConfig!.realms ? this.appConfig!.realms![realm] : undefined;
+ let realmConfig = this.appConfig!.realms ? this.appConfig!.realms![this._realm || ""] : undefined;
realmConfig = Util.mergeObjects(defaultConfig, realmConfig, false);
if (this.appConfig && this.appConfig.superUserHeader && manager.isSuperUser()) {
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.ts
index 6d86679c9..923308eb9 100644
--- a/ui/component/or-app/src/or-header.ts
+++ b/ui/component/or-app/src/or-header.ts
@@ -1,22 +1,23 @@
import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";
-import {customElement, property, query} from "lit/decorators.js";
-import {until} from "lit/directives/until.js";
+import {customElement, property, query, state} from "lit/decorators.js";
import manager, {
- Util,
DefaultBoxShadowBottom,
DefaultColor1,
DefaultColor2,
DefaultColor3,
DefaultColor4,
DefaultColor5,
- DefaultHeaderHeight
+ DefaultHeaderHeight,
+ Util
} from "@openremote/core";
import "@openremote/or-mwc-components/or-mwc-dialog";
import "@openremote/or-icon";
import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";
import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";
import {Tenant} from "@openremote/model";
-import {router} from "./index";
+import {AppStateKeyed, router, updateRealm} from "./index";
+import {AnyAction, EnhancedStore} from "@reduxjs/toolkit";
+import {ThunkMiddleware} from "redux-thunk";
export interface HeaderConfig {
mainMenu: HeaderItem[];
@@ -331,6 +332,15 @@ class OrHeader extends LitElement {
`;
}
+ @property({type: Array})
+ public realms!: Tenant[];
+
+ @property({type: String})
+ public realm!: string;
+
+ @property({type: Object})
+ public store!: EnhancedStore<AppStateKeyed, AnyAction, ReadonlyArray<ThunkMiddleware<AppStateKeyed>>>;
+
@property({type: String})
public logo?: string;
@@ -343,12 +353,10 @@ class OrHeader extends LitElement {
@query("div[id=mobile-bottom]")
protected _mobileBottomDiv!: HTMLDivElement;
- protected _tenants?: Tenant[];
-
- @property({type: Boolean})
+ @state()
private _drawerOpened = false;
- @property({ type: String })
+ @state()
private activeMenu: string | undefined;
constructor() {
@@ -358,20 +366,8 @@ class OrHeader extends LitElement {
});
}
- public connectedCallback(): void {
- super.connectedCallback();
- const realm = window.sessionStorage.getItem('realm');
- if (realm) manager.displayRealm = realm;
- }
-
- public disconnectedCallback(): void {
- super.disconnectedCallback();
- }
-
public _onRealmSelect(realm: string) {
- manager.displayRealm = realm;
- window.sessionStorage.setItem('realm', realm);
- this.requestUpdate();
+ this.store.dispatch(updateRealm(realm));
}
protected shouldUpdate(changedProperties: PropertyValues): boolean {
@@ -441,44 +437,35 @@ class OrHeader extends LitElement {
`;
}
- protected _getRealmMenu(callback: (language: string) => void): TemplateResult {
- if (!manager.isSuperUser()) {
- return html``;
- }
+ protected _getRealmMenu(callback: (realm: string) => void): TemplateResult {
- const picker = this._getTenants().then((tenants) => {
+ const currentRealm = this.realms.find((t) => t.realm === this.realm);
- const menuItems = tenants.map((r) => {
+ let realmTemplate = html`
+ <div id="realm-picker">
+ <span>${currentRealm ? currentRealm.displayName : ""}</span>
+ ${this.realms.length > 1 ? html`<or-icon icon="chevron-down"></or-icon>` : ``}
+ </div>
+ `;
+
+ if (manager.isSuperUser()) {
+ const menuItems = this.realms.map((r) => {
return {
text: r.displayName!,
value: r.realm!
} as ListItem;
});
- return html`
- ${getContentWithMenuTemplate(
- html`
- <div id="realm-picker">
- <span>${tenants.find((t) => t.realm === manager.displayRealm)?.displayName}</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.filter(t => t.enabled);
+ realmTemplate = html`
+ ${getContentWithMenuTemplate(
+ realmTemplate,
+ menuItems,
+ currentRealm ? currentRealm.realm : undefined,
+ (values: string | string[]) => callback(values as string))}
+ `;
}
- return this._tenants;
+ return realmTemplate;
}
protected _onSecondaryMenuSelect(value: string) {
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 47df51295..e34ce373f 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -806,7 +806,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
const query: AssetQuery = {
tenant: {
- realm: manager.isSuperUser() ? manager.displayRealm : manager.getRealm()
+ realm: manager.displayRealm
},
select: { // Just need the basic asset info
excludeAttributes: true,
diff --git a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
index 065da2135..7b566bf50 100644
--- a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
+++ b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
@@ -24,6 +24,7 @@ import { showOkCancelDialog } from "@openremote/or-mwc-components/or-mwc-dialog"
*/
let agents: Agent[] | undefined;
let loadingPromise: Promise<Agent[]> | undefined;
+let subscribed = false;
const timeout = 2000;
export function loadAgents(): PromiseLike<Agent[]> {
@@ -36,6 +37,26 @@ export function loadAgents(): PromiseLike<Agent[]> {
return loadingPromise;
}
+ if (!subscribed) {
+ manager.addListener((ev: OREvent) => {
+ switch (ev) {
+ case OREvent.DISPLAY_REALM_CHANGED:
+ agents = undefined;
+ loadingPromise = undefined;
+ break;
+ }
+ });
+
+ manager.events!.subscribeAssetEvents(undefined, false, undefined, (assetEvent) => {
+ if (assetEvent.asset && assetEvent.asset.type!.endsWith("Agent")) {
+ agents = undefined;
+ loadingPromise = undefined;
+ }
+ });
+
+ subscribed = true;
+ }
+
loadingPromise = manager.rest.api.AssetResource.queryAssets({
tenant: {
realm: manager.displayRealm
@@ -52,21 +73,6 @@ export function loadAgents(): PromiseLike<Agent[]> {
.then(response => response.data as Agent[])
.then(agnts => {
agents = agnts;
- manager.addListener((ev: OREvent) => {
- switch (ev) {
- case OREvent.DISPLAY_REALM_CHANGED:
- agents = undefined;
- loadingPromise = undefined;
- break;
- }
- });
- manager.events!.subscribeAssetEvents(undefined, false, undefined, (assetEvent) => {
- if (assetEvent.asset && assetEvent.asset.type!.endsWith("Agent")) {
- agents = undefined;
- loadingPromise = undefined;
- }
- })
-
return agnts;
});