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
UI Updates: Updated to work with realm picker
Rich Turner9389c6c61352
diff --git a/ui/app/main/src/components/my-app.ts b/ui/app/main/src/components/my-app.tsindex 8ace112cf..ca47bd457 100644--- a/ui/app/main/src/components/my-app.ts+++ b/ui/app/main/src/components/my-app.ts@@ -83,11 +83,11 @@ class MyApp extends connect(store)(LitElement) {<a slot="desktop-left" ?selected="${this.page === "map"}" @click="${() => router.navigate("map")}"><or-icon icon="map"></or-icon><or-translate value="map"></or-translate></a><a slot="desktop-left" ?selected="${this.page === "assets"}" @click="${() => router.navigate("assets")}"><or-icon icon="sitemap"></or-icon><or-translate value="asset_plural"></or-translate></a><a slot="desktop-left" ?selected="${this.page === "rules"}" @click="${() => router.navigate("rules")}"><or-icon icon="cogs"></or-icon><or-translate value="rule_plural"></or-translate></a>+ ${(manager.isSuperUser() ? html`<a slot="desktop-right"><or-realm-picker></or-realm-picker></a>` : ``)}<a slot="desktop-right"><or-language></or-language></a><a slot="desktop-right" @click="${() => this.logout()}"><or-translate value="logout"></or-translate></a><a slot="mobile-top" ?selected="${this.page === "map"}" @click="${() => router.navigate("map")}"><or-icon icon="map"></or-icon><or-translate value="map"></or-translate></a><a slot="mobile-top" ?selected="${this.page === "assets"}" @click="${() => router.navigate("assets")}"><or-icon icon="sitemap"></or-icon><or-translate value="asset_plural"></or-translate></a>-<a slot="mobile-top" @click="${() => this.logout()}"><or-icon icon="logout"></or-icon><or-translate value="logout"></or-translate></a></or-header>diff --git a/ui/app/main/src/components/or-language/src/index.ts b/ui/app/main/src/components/or-language/src/index.tsindex 405f75ad8..57a1152cb 100644--- a/ui/app/main/src/components/or-language/src/index.ts+++ b/ui/app/main/src/components/or-language/src/index.ts@@ -18,11 +18,11 @@ export class OrLanguage extends LitElement {<div class="background-close ${this.isVisible ? "active" : ""}" @click="${this.closeMenu}"></div>${this.isVisible ? html`<div class="dropdown-menu">- <span @click="${() => this.changeLanguage("en")}"><or-translate value="English"></or-translate></span>- <span @click="${() => this.changeLanguage("nl")}"><or-translate value="Dutch"></or-translate></span>- <span @click="${() => this.changeLanguage("fr")}"><or-translate value="French"></or-translate></span>- <span @click="${() => this.changeLanguage("de")}"><or-translate value="German"></or-translate></span>- <span @click="${() => this.changeLanguage("es")}"><or-translate value="Spanish"></or-translate></span>+ <span @click="${() => this.changeLanguage("en")}"><or-translate value="english"></or-translate></span>+ <span @click="${() => this.changeLanguage("nl")}"><or-translate value="dutch"></or-translate></span>+ <span @click="${() => this.changeLanguage("fr")}"><or-translate value="french"></or-translate></span>+ <span @click="${() => this.changeLanguage("de")}"><or-translate value="german"></or-translate></span>+ <span @click="${() => this.changeLanguage("es")}"><or-translate value="spanish"></or-translate></span></div>` : ``}`;diff --git a/ui/app/main/src/components/pages/page-rules.ts b/ui/app/main/src/components/pages/page-rules.tsindex f708ae702..0c6e2988c 100644--- a/ui/app/main/src/components/pages/page-rules.ts+++ b/ui/app/main/src/components/pages/page-rules.ts@@ -1,13 +1,13 @@-import {html, LitElement, property, css, query, customElement, PropertyValues} from "lit-element";+import {css, customElement, html, LitElement} from "lit-element";import {store} from "../../store";import {connect} from "pwa-helpers/connect-mixin";import "@openremote/or-rules";import {RulesConfig} from "@openremote/or-rules";-import {RulesetLang, AssetType, AttributeType} from "@openremote/model";+import {AssetType, AttributeType, RulesetLang} from "@openremote/model";const rulesConfig: RulesConfig = {controls: {- allowedLanguages: [RulesetLang.JSON]+ allowedLanguages: [RulesetLang.JSON, RulesetLang.FLOW]},descriptors: {all: {diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 7ff30cbef..7740ec725 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -70,7 +70,8 @@ export enum OREvent {EVENTS_CONNECTING = "EVENTS_CONNECTING",EVENTS_DISCONNECTED = "EVENTS_DISCONNECTED",TRANSLATE_INIT = "TRANSLATE_INIT",- TRANSLATE_LANGUAGE_CHANGED = "TRANSLATE_LANGUAGE_CHANGED"+ TRANSLATE_LANGUAGE_CHANGED = "TRANSLATE_LANGUAGE_CHANGED",+ DISPLAY_REALM_CHANGED = "DISPLAY_REALM_CHANGED"}export enum EventProviderType {@@ -423,6 +424,15 @@ export class Manager implements EventProviderFactory {this.console.storeData("LANGUAGE", lang);}+ get displayRealm() {+ return this._displayRealm || this._config.realm;+ }++ set displayRealm(realm: string) {+ this._displayRealm = realm;+ this._emitEvent(OREvent.DISPLAY_REALM_CHANGED);+ }+getEventProvider(): EventProvider | undefined {return this.events;}@@ -501,6 +511,7 @@ export class Manager implements EventProviderFactory {private _listeners: EventCallback[] = [];private _console!: Console;private _events?: EventProvider;+ private _displayRealm?: string = "";public isManagerSameOrigin(): boolean {if (!this.initialised) {@@ -566,6 +577,8 @@ export class Manager implements EventProviderFactory {this._emitEvent(OREvent.READY);}+ this._displayRealm = config.realm;+return success;}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 536243b6d..7b47fd94e 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -144,9 +144,6 @@ export class OrAssetTree extends LitElement {@property({type: Array})public rootAssetIds?: string[];- @property({type: String})- public realm?: string;-@property({type: Boolean})public readonly: boolean = false;@@ -168,9 +165,6 @@ export class OrAssetTree extends LitElement {@property({type: String})public sortBy?: string;- @property({attribute: false})- protected _realms?: Tenant[];-@property({attribute: false})protected _nodes?: UiAssetTreeNode[];@@ -185,26 +179,34 @@ export class OrAssetTree extends LitElement {return this._selectedNodes ? [...this._selectedNodes] : [];}+ public disconnectedCallback() {+ super.disconnectedCallback();+ manager.removeListener(this.onManagerEvent);+ }+protected _onReady() {this._ready = true;- this._loadRealms();this._loadAssets();}protected firstUpdated(_changedProperties: PropertyValues): void {super.firstUpdated(_changedProperties);+ manager.addListener(this.onManagerEvent);+ if (manager.ready) {+ this._onReady();+ }+ }- if (!manager.ready) {- // Defer until openremote is initialised- this._initCallback = (initEvent: OREvent) => {- if (initEvent === OREvent.READY) {+ protected onManagerEvent = (event: OREvent) => {+ switch (event) {+ case OREvent.READY:+ if (!manager.ready) {this._onReady();- manager.removeListener(this._initCallback!);}- };- manager.addListener(this._initCallback);- } else {- this._onReady();+ break;+ case OREvent.DISPLAY_REALM_CHANGED:+ this._nodes = undefined;+ break;}}@@ -214,7 +216,6 @@ export class OrAssetTree extends LitElement {<div id="header"><div id="title-container"><or-translate id="title" value="asset_plural"></or-translate>- ${manager.isSuperUser() ? html `<or-input id="realm-picker" type="${InputType.SELECT}" .value="${this._getRealm()}" .options="${this._realms ? this._realms.map((tenant) => [tenant.realm, tenant.displayName]) : []}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onRealmChanged(evt)}"></or-input>` : ``}</div><div id="header-btns">@@ -233,7 +234,7 @@ export class OrAssetTree extends LitElement {${!this._nodes || this._showLoading? html`- <span id="loading"><or-translate value="loading"></or-translate></span>`+ <span id="loading"><or-translate value="loading"></or-translate></span>`: html`<div id="list-container"><ol id="list">@@ -277,9 +278,8 @@ export class OrAssetTree extends LitElement {const result = super.shouldUpdate(_changedProperties);if (_changedProperties.has("assetIds")- || _changedProperties.has("rootAssets")- || _changedProperties.has("rootAssetIds")- || _changedProperties.has("realm")) {+ || _changedProperties.has("rootAssets")+ || _changedProperties.has("rootAssetIds")) {this._nodes = undefined;}@@ -299,14 +299,6 @@ export class OrAssetTree extends LitElement {return result;}- protected _loadRealms() {- if (manager.isSuperUser()) {- manager.rest.api.TenantResource.getAll().then((response) => {- this._realms = response.data;- });- }- }-protected _updateSelectedNodes() {const actuallySelectedIds: string[] = [];const selectedNodes: UiAssetTreeNode[] = [];@@ -483,16 +475,7 @@ export class OrAssetTree extends LitElement {}protected _getRealm(): string | undefined {- if (manager.isSuperUser() && this.realm) {- return this.realm;- }-- return manager.getRealm();- }-- protected _onRealmChanged(evt: OrInputChangedEvent) {- this.realm = evt.detail.value;- this.assets = undefined;+ return manager.isSuperUser() ? manager.displayRealm : manager.getRealm();}protected _doRequest<T>(event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void) {diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 5e1edc01a..9cd573c45 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -60,7 +60,7 @@ export interface ViewerConfig {historyConfig?: HistoryConfig;}-class EventHandler{+class EventHandler {_callbacks: Function[];constructor() {@@ -68,8 +68,8 @@ class EventHandler{}startCallbacks() {- return new Promise((resolve, reject)=> {- if(this._callbacks && this._callbacks.length > 0){+ return new Promise((resolve, reject) => {+ if (this._callbacks && this._callbacks.length > 0) {this._callbacks.forEach(cb => cb());}resolve();@@ -77,7 +77,7 @@ class EventHandler{}- addCallback(callback:Function) {+ addCallback(callback: Function) {this._callbacks.push(callback);}}@@ -167,7 +167,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemsuper();window.addEventListener('resize', () => OrAssetViewer.generateGrid(this.shadowRoot));- this.addEventListener(OrAttributeHistoryEvent.NAME,() => OrAssetViewer.generateGrid(this.shadowRoot));+ this.addEventListener(OrAttributeHistoryEvent.NAME, () => OrAssetViewer.generateGrid(this.shadowRoot));}shouldUpdate(changedProperties: PropertyValues): boolean {@@ -220,14 +220,14 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem<div id="title"><or-icon title="${descriptor && descriptor.type ? descriptor.type : "unset"}" style="--or-icon-fill: ${descriptor && descriptor.color ? "#" + descriptor.color : "unset"}" icon="${descriptor && descriptor.icon ? descriptor.icon : AssetType.THING.icon}"></or-icon>${this.asset.name}</div>- <div id="created" class="mobileHidden"><or-translate value="createdOnWithDate" .options="${{date: new Date(this.asset!.createdOn!)} as i18next.TOptions<i18next.InitOptions>}"></or-translate></div>+ <div id="created" class="mobileHidden"><or-translate value="createdOnWithDate" .options="${{ date: new Date(this.asset!.createdOn!) } as i18next.TOptions<i18next.InitOptions>}"></or-translate></div></div><div id="container" style="${this._viewerConfig.viewerStyles ? styleMap(this._viewerConfig.viewerStyles) : ""}">${html`${Object.entries(this._viewerConfig.panels).map(([name, panelConfig]) => {const panelTemplate = OrAssetViewer.getPanel(name, this.asset!, this._attributes!, this._viewerConfig!, panelConfig, this.shadowRoot);return panelTemplate || ``;})}`- }+ }</div></div>`;@@ -247,7 +247,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}this.onCompleted().then(() => {- onRenderComplete.startCallbacks().then(()=> {+ onRenderComplete.startCallbacks().then(() => {OrAssetViewer.generateGrid(this.shadowRoot);});});@@ -258,19 +258,19 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemawait this.updateComplete;}- public static generateGrid(shadowRoot: ShadowRoot | null){- if(shadowRoot) {+ public static generateGrid(shadowRoot: ShadowRoot | null) {+ if (shadowRoot) {const grid = shadowRoot.querySelector('#container');- if(grid){+ if (grid) {const rowHeight = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-auto-rows'));const rowGap = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-row-gap'));const items = shadowRoot.querySelectorAll('.panel');- if(items){+ if (items) {items.forEach((item) => {const content = item.querySelector('.panel-content-wrapper');- if(content) {+ if (content) {const rowSpan = Math.ceil((content.getBoundingClientRect().height + rowGap) / (rowHeight + rowGap));- (item as HTMLElement).style.gridRowEnd = "span "+rowSpan;+ (item as HTMLElement).style.gridRowEnd = "span " + rowSpan;}});}@@ -343,7 +343,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemcontent = html`${properties.map((prop) => {let style = styles ? styles[prop!] : undefined;- return prop === "attributes" ? `` : OrAssetViewer.getField(prop, true, style, OrAssetViewer.getPropertyTemplate(prop, (asset as {[index: string]:any})[prop], viewerConfig, panelConfig, shadowRoot));+ return prop === "attributes" ? `` : OrAssetViewer.getField(prop, true, style, OrAssetViewer.getPropertyTemplate(prop, (asset as { [index: string]: any })[prop], viewerConfig, panelConfig, shadowRoot));})}`;} else if (panelConfig && panelConfig.type === "history") {@@ -368,7 +368,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}};const options = historyAttrs.map((attr) => [attr.name, Util.getAttributeLabel(attr, undefined)]);- const attrName:string = historyAttrs[0].name!;+ const attrName: string = historyAttrs[0].name!;onRenderComplete.addCallback(() => attributeChanged(attrName));content = html`<style>@@ -473,7 +473,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}}- switch(property) {+ switch (property) {case "path":if (!value || !(Array.isArray(value))) {return;@@ -549,6 +549,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemthis._loading = false;}+protected _getPanelConfig(asset: Asset): AssetViewerConfig {let config = {...OrAssetViewer.DEFAULT_CONFIG};@@ -556,6 +557,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemconfig.viewerStyles = {...config.viewerStyles};config.panels = {...config.panels};+ config.viewerStyles = { ...config.viewerStyles };+ config.panels = { ...config.panels };const assetConfig = this.config.assetTypes && this.config.assetTypes.hasOwnProperty(asset.type!) ? this.config.assetTypes[asset.type!] : this.config.default;if (assetConfig) {diff --git a/yarn.lock b/yarn.lockindex 3923f4944..af6d12f71 100644--- a/yarn.lock+++ b/yarn.lock@@ -2040,6 +2040,11 @@resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.3.tgz#1c3b71b091eaeaf5924538006b7f70603ce63d38"integrity sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==+"@types/shortid@^0.0.29":+ version "0.0.29"+ resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"+ integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=+"@types/simplebar@^2.4.2":version "2.4.2"resolved "https://registry.yarnpkg.com/@types/simplebar/-/simplebar-2.4.2.tgz#f45e3268b7153bfe8da50658a929be5cd098c4cb"@@ -4448,6 +4453,14 @@ flush-write-stream@^1.0.0:inherits "^2.0.3"readable-stream "^2.3.6"+focus-trap@^5.0.0:+ version "5.1.0"+ resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-5.1.0.tgz#64a0bfabd95c382103397dbc96bfef3a3cf8e5ad"+ integrity sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==+ dependencies:+ tabbable "^4.0.0"+ xtend "^4.0.1"+version "1.5.10"resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"@@ -6516,6 +6529,11 @@ nan@^2.12.1:resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==+nanoid@^2.1.0:+ version "2.1.7"+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.7.tgz#d775e3e7c6470bbaaae3da9a647a80e228e0abf7"+ integrity sha512-fmS3qwDldm4bE01HCIRqNk+f255CNjnAoeV3Zzzv0KemObHKqYgirVaZA9DtKcjogicWjYcHkJs4D5A8CjnuVQ==+nanomatch@^1.2.9:version "1.2.13"resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"@@ -7932,6 +7950,11 @@ resize-observer-polyfill@^1.5.1:resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==+resize-observer@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/resize-observer/-/resize-observer-1.0.0.tgz#4f8380b73b411af4ed7d916fe85a2d59900e71ef"+ integrity sha512-D7UFShDm2TgrEDEyeg+/tTEbvOgPWlvPAfJtxiKp+qutu6HowmcGJKjECgGru0PPDIj3SAucn3ZPpOx54fF7DQ==+resolve-cwd@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"@@ -8241,6 +8264,13 @@ shelljs@^0.8.1:interpret "^1.0.0"rechoir "^0.6.2"+shortid@^2.2.15:+ version "2.2.15"+ resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"+ integrity sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==+ dependencies:+ nanoid "^2.1.0"+shx@^0.3.2:version "0.3.2"resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.2.tgz#40501ce14eb5e0cbcac7ddbd4b325563aad8c123"@@ -8725,6 +8755,11 @@ symbol-observable@^1.2.0:resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==+tabbable@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-4.0.0.tgz#5bff1d1135df1482cf0f0206434f15eadbeb9261"+ integrity sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ==+tapable@^1.0.0, tapable@^1.1.3:version "1.1.3"resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"@@ -9555,7 +9590,7 @@ xpath@^0.0.27:resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==-xtend@^4.0.0, xtend@~4.0.1:+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:version "4.0.2"resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==