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: Bug fix for stored config retrieval
Rich Turner31f024a1d6cf
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex d70daf322..dabc896e9 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -556,7 +556,7 @@ export class OrAttributeCard extends LitElement {return;}- const view = config && config.views ? config.views[viewSelector][this.panelName] : undefined;+ const view = config && config.views && config.views[viewSelector] ? config.views[viewSelector][this.panelName] : undefined;if (!view) {return;@@ -638,11 +638,14 @@ export class OrAttributeCard extends LitElement {config = {realm: this.realm,views: {- [viewSelector]: {}}}}+ if (!config.views[viewSelector]) {+ config.views[viewSelector] = {};+ }+if (!this.assets || !this.assetAttributes || this.assets.length === 0 || this.assetAttributes.length === 0) {delete config.views[viewSelector][this.panelName];} else {diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex 56a86d471..0ead3b686 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -708,7 +708,7 @@ export class OrChart extends translate(i18next)(LitElement) {return;}- const view = config && config.views ? config.views[viewSelector][this.panelName] : undefined;+ const view = config && config.views && config.views[viewSelector] ? config.views[viewSelector][this.panelName] : undefined;if (!view) {return;@@ -790,11 +790,14 @@ export class OrChart extends translate(i18next)(LitElement) {config = {realm: this.realm,views: {- [viewSelector]: {}}}}+ if (!config.views[viewSelector]) {+ config.views[viewSelector] = {};+ }+if (!this.assets || !this.assetAttributes || this.assets.length === 0 || this.assetAttributes.length === 0) {delete config.views[viewSelector][this.panelName];} else {diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.tsindex 5465079b4..8ba6441d9 100644--- a/ui/component/or-data-viewer/src/index.ts+++ b/ui/component/or-data-viewer/src/index.ts@@ -41,28 +41,36 @@ export interface DataViewerConfig {chartConfig?: OrChartConfig;}-class EventHandler {- public _callbacks: Function[];+export class OrDataViewerRenderCompleteEvent extends CustomEvent<void> {++ public static readonly NAME = "or-data-viewer-render-complete-event";constructor() {- this._callbacks = [];+ super(OrDataViewerRenderCompleteEvent.NAME, {+ bubbles: true,+ composed: true+ });}+}- public startCallbacks() {- return new Promise<void>((resolve, reject) => {- if (this._callbacks && this._callbacks.length > 0) {- this._callbacks.forEach((cb) => cb());- }- resolve();- });+export class OrDataViewerConfigInvalidEvent extends CustomEvent<void> {++ public static readonly NAME = "or-data-viewer-config-invalid-event";+ constructor() {+ super(OrDataViewerConfigInvalidEvent.NAME, {+ bubbles: true,+ composed: true+ });}+}- public addCallback(callback: Function) {- this._callbacks.push(callback);+declare global {+ export interface HTMLElementEventMap {+ [OrDataViewerRenderCompleteEvent.NAME]: OrDataViewerRenderCompleteEvent;+ [OrDataViewerConfigInvalidEvent.NAME]: OrDataViewerConfigInvalidEvent;}}-const onRenderComplete = new EventHandler();@customElement("or-data-viewer")export class OrDataViewer extends translate(i18next)(LitElement) {@@ -187,20 +195,16 @@ export class OrDataViewer extends translate(i18next)(LitElement) {window.removeEventListener("resize", this._resizeHandler);}- public async onCompleted() {- await this.updateComplete;- }-public refresh() {- this.realm = window.sessionStorage.getItem('realm') || manager.getRealm();+ this.realm = manager.displayRealm;}- public getPanel(name: string, panelConfig: PanelConfig) {+ public getPanel(name: string, panelConfig: PanelConfig): TemplateResult {const content = this.getPanelContent(name, panelConfig);if (!content) {- return;+ return html``;}return html`@@ -225,7 +229,7 @@ export class OrDataViewer extends translate(i18next)(LitElement) {return;}- this.realm = window.sessionStorage.getItem('realm') || manager.getRealm();+ this.realm = manager.displayRealm;let content: TemplateResult | undefined;@@ -256,12 +260,26 @@ export class OrDataViewer extends translate(i18next)(LitElement) {return html`<div id="wrapper"><div id="container" style="${this.config.viewerStyles ? styleMap(this.config.viewerStyles) : ""}">- ${Object.entries(this.config.panels).map(([name, panelConfig]) => this.getPanel(name, panelConfig))}+ ${this.renderConfig()}</div></div>`;}+ protected renderConfig(): TemplateResult[] {+ const hasConfig = !!this.config;+ let config = hasConfig ? this.config : OrDataViewer.DEFAULT_CONFIG;+ try {+ return Object.entries(config!.panels).map(([name, panelConfig]) => this.getPanel(name, panelConfig))+ } catch (e) {+ console.warn("OR data viewer config is invalid");+ this.config = undefined;+ this.dispatchEvent(new OrDataViewerConfigInvalidEvent());+ config = OrDataViewer.DEFAULT_CONFIG;+ return Object.entries(config!.panels).map(([name, panelConfig]) => this.getPanel(name, panelConfig))+ }+ }+protected updated(_changedProperties: PropertyValues) {super.updated(_changedProperties);@@ -269,10 +287,9 @@ export class OrDataViewer extends translate(i18next)(LitElement) {this.refresh();}- this.onCompleted().then(() => {- onRenderComplete.startCallbacks().then(() => {- OrDataViewer.generateGrid(this.shadowRoot);- });+ this.updateComplete.then(() => {+ this.dispatchEvent(new OrDataViewerRenderCompleteEvent());+ OrDataViewer.generateGrid(this.shadowRoot);});}}