Skip to content

armgit / core

Public Imported from GitHub
0

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

UI update: Added loading animation for or-chart (#1017)

Martin Peeterse0064bd447ee
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index 342fb5b85..2a9e8ed34 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -39,6 +39,7 @@ import {
Tooltip
} from "chart.js";
import {InputType} from "@openremote/or-mwc-components/or-mwc-input";
+import "@openremote/or-components/or-loading-indicator";
import moment from "moment";
import {OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";
import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";
@@ -618,7 +619,12 @@ export class OrChart extends translate(i18next)(LitElement) {
return html`
<div id="container">
<div id="chart-container">
- <canvas id="chart"></canvas>
+ ${disabled ? html`
+ <div style="position: absolute; height: 100%; width: 100%;">
+ <or-loading-indicator ?overlay="false"></or-loading-indicator>
+ </div>
+ ` : undefined}
+ <canvas id="chart" style="visibility: ${disabled ? 'hidden' : 'visible'}"></canvas>
</div>
${(this.timestampControls || this.attributeControls || this.showLegend) ? html`
@@ -1037,10 +1043,10 @@ export class OrChart extends translate(i18next)(LitElement) {
});
}
- this._loading = false;
if(promises) {
await Promise.all(promises);
}
+ this._loading = false;
this._data = data;
}