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
Use display name for realm picker when closed
Rich Turnercc65b59bc6f0
diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex f62975f29..7756da519 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -397,7 +397,7 @@ class OrHeader extends LitElement {${getContentWithMenuTemplate(html`<div id="realm-picker">- <span style="margin-left: 10px;">${manager.displayRealm}</span>+ <span style="margin-left: 10px;">${tenants.find((t) => t.realm === manager.displayRealm).displayName}</span><or-icon icon="chevron-down"></or-icon></div>`,diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex b8d77e8eb..d0abac062 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -496,11 +496,9 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {/* Subscribe mixin overrides */- public async _addEventSubscriptions(): Promise<string[]> {+ public async _addEventSubscriptions(): Promise<void> {// Subscribe to asset events for all assets in the realm- const subscriptions = [];- subscriptions.push(await manager.getEventProvider()!.subscribeAssetEvents(null, false, (event) => this._onEvent(event)));- return subscriptions;+ this._subscriptionIds = [await manager.getEventProvider()!.subscribeAssetEvents(null, false, (event) => this._onEvent(event))];}public onEventsConnect() {