Skip to content

armgit / core

Public Imported from GitHub
0

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

Add or-date-viewer, new rules assetTypes config

Robin Dekkers269fc8db6a32
diff --git a/deployment/manager/shared/locales/de/or.json b/deployment/manager/shared/locales/de/or.json
index 2b447d4f1..16fc5ba1f 100644
--- a/deployment/manager/shared/locales/de/or.json
+++ b/deployment/manager/shared/locales/de/or.json
@@ -5,6 +5,7 @@
"rule_plural": "Regeln",
"asset": "Asset",
"asset_plural": "Assets",
+ "insights": "Insights",
"attribute": "Attribut",
"scenes": "Szenen",
"settings": "Einstellungen",
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index 662d84470..c0fb693bb 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -6,6 +6,7 @@
"asset": "Asset",
"asset_plural": "Assets",
"attribute": "Attribute",
+ "insights": "Insights",
"scenes": "Scenes",
"settings": "Settings",
"selectLanguage": "Select Language",
diff --git a/deployment/manager/shared/locales/es/or.json b/deployment/manager/shared/locales/es/or.json
index 03e1e0d0b..53daf521c 100644
--- a/deployment/manager/shared/locales/es/or.json
+++ b/deployment/manager/shared/locales/es/or.json
@@ -6,6 +6,7 @@
"asset": "Activo",
"asset_plural": "Activos",
"attribute": "Atributo",
+ "insights": "Insights",
"scenes": "Escenas",
"settings": "Ajustes",
"selectLanguage": "Elegir Idioma",
diff --git a/deployment/manager/shared/locales/fr/or.json b/deployment/manager/shared/locales/fr/or.json
index 080f4c832..24840f366 100644
--- a/deployment/manager/shared/locales/fr/or.json
+++ b/deployment/manager/shared/locales/fr/or.json
@@ -6,6 +6,7 @@
"asset": "Ressource",
"asset_plural": "Ressources",
"attribute": "Attribut",
+ "insights": "Insights",
"scenes": "Scènes",
"settings": "Réglages",
"selectLanguage": "Séctionner une langue",
diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.json
index 5d3747b6a..93da5f23f 100644
--- a/deployment/manager/shared/locales/nl/or.json
+++ b/deployment/manager/shared/locales/nl/or.json
@@ -6,6 +6,7 @@
"asset": "Asset",
"asset_plural": "Assets",
"attribute": "Attribuut",
+ "insights": "Insights",
"scenes": "Scenes",
"settings": "Instellingen",
"selectLanguage": "Taal kiezen",
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 51ccad798..d40165821 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -383,8 +383,17 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
}
}
};
-
- const options = historyAttrs.map((attr) => [attr.name, Util.getAttributeLabel(attr, undefined)]);
+
+
+ const options = historyAttrs.map((attr) => {
+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attr.name!);
+ let label = Util.getAttributeLabel(attr, attributeDescriptor);
+ let unit = Util.getMetaValue(MetaItemType.UNIT_TYPE, attr, attributeDescriptor);
+ if(unit) {
+ label = label + " ("+i18next.t(unit)+")";
+ }
+ return [attr.name, label]
+ });
const attrName: string = historyAttrs[0].name!;
onRenderComplete.addCallback(() => attributeChanged(attrName));
content = html`
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index 843703e11..a8c22fc15 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -234,7 +234,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
public attributeRef?: AttributeRef;
@property({type: String})
- public interval?: DatapointInterval;
+ public period: moment.unitOfTime.Base = "hour";
@property({type: Number})
public fromTimestamp?: Date;
@@ -282,22 +282,12 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
returnFalse = true;
}
- if (!this.toTimestamp) {
- this.toTimestamp = moment(this.fromTimestamp).add(1, "day").toDate();
- returnFalse = true;
- }
-
- if (!this.interval) {
- this.interval = DatapointInterval.HOUR;
- returnFalse = true;
- }
-
if (returnFalse) {
// Will update on next pass
return false;
}
- let reloadData = _changedProperties.has("interval") || _changedProperties.has("timestamp");
+ let reloadData = _changedProperties.has("period") || _changedProperties.has("fromTimestamp");
if (_changedProperties.has("attributeRef") || _changedProperties.has("attribute")) {
this._type = undefined;
@@ -321,12 +311,12 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
return html`
<div id="container">
<div id="controls">
- <or-input .type="${InputType.SELECT}" ?disabled="${disabled}" .label="${i18next.t("Timeframe")}" @or-input-changed="${(evt: OrInputChangedEvent) => this.interval = evt.detail.value}" .value="${this.interval}" .options="${this._getIntervalOptions()}"></or-input>
+ <or-input .type="${InputType.SELECT}" ?disabled="${disabled}" .label="${i18next.t("Timeframe")}" @or-input-changed="${(evt: OrInputChangedEvent) => this.period = evt.detail.value}" .value="${this.period}" .options="${this._getPeriodOptions().map(item => item.value)}"></or-input>
<div id="ending-controls">
- <or-input id="ending-date" .type="${InputType.DATETIME}" ?disabled="${disabled}" label="${i18next.t("ending")}" .value="${this.toTimestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this._updateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input>
- <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-left" @click="${() => this._updateTimestamp(this.toTimestamp!, false)}"></or-icon>
- <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-right" @click="${() => this._updateTimestamp(this.toTimestamp!, true)}"></or-icon>
- <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-double-right" @click="${() => this._updateTimestamp(new Date())}"></or-icon>
+ <or-input id="ending-date" .type="${InputType.DATETIME}" ?disabled="${disabled}" label="${i18next.t("ending")}" .value="${this.fromTimestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this._updateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input>
+ <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-left" @click="${() => this.fromTimestamp = this._updateTimestamp(this.fromTimestamp!, false)}"></or-icon>
+ <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-right" @click="${() => this.fromTimestamp = this._updateTimestamp(this.fromTimestamp!, true)}"></or-icon>
+ <or-icon class="button button-icon" ?disabled="${disabled}" icon="chevron-double-right" @click="${() => this.fromTimestamp = this._updateTimestamp(new Date())}"></or-icon>
</div>
</div>
@@ -626,6 +616,52 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
return [interval, i18next.t(interval.toLowerCase())];
});
}
+ protected _getPeriodOptions() {
+ return [
+ {
+ text: i18next.t(DatapointInterval.HOUR),
+ value: "hour"
+ },
+ {
+ text: i18next.t(DatapointInterval.DAY),
+ value: "day"
+ },
+ {
+ text: i18next.t(DatapointInterval.WEEK),
+ value: "week"
+ },
+ {
+ text: i18next.t(DatapointInterval.MONTH),
+ value: "month"
+ },
+ {
+ text: i18next.t(DatapointInterval.YEAR),
+ value: "year"
+ }
+ ];
+ }
+
+ protected _getInterval() {
+ let interval: DatapointInterval = DatapointInterval.HOUR;
+ switch (this.period) {
+ case "hour":
+ interval = DatapointInterval.MINUTE;
+ break;
+ case "day":
+ interval = DatapointInterval.HOUR;
+ break;
+ case "week":
+ interval = DatapointInterval.HOUR;
+ break;
+ case "month":
+ interval = DatapointInterval.DAY;
+ break;
+ case "year":
+ interval = DatapointInterval.MONTH;
+ break;
+ }
+ return interval;
+ }
protected async _loadData() {
if (this._loading || this._type === null || !this.assetType || (!this.attribute && !this.attributeRef)) {
@@ -676,18 +712,21 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
return;
}
- if (!this.interval || !this.fromTimestamp || !this.toTimestamp) {
+ if (!this.period || !this.fromTimestamp) {
this._loading = false;
return;
}
+ const startOfPeriod = moment(this.fromTimestamp).startOf(this.period).toDate().getTime();
+ const endOfPeriod = moment(this.fromTimestamp).endOf(this.period).toDate().getTime();
+
const response = await manager.rest.api.AssetDatapointResource.getDatapoints(
assetId,
attributeName,
{
- interval: this.interval || DatapointInterval.HOUR,
- fromTimestamp: this.fromTimestamp.getTime(),
- toTimestamp: this.toTimestamp.getTime()
+ interval: this._getInterval(),
+ fromTimestamp: startOfPeriod,
+ toTimestamp: endOfPeriod
}
);
@@ -697,43 +736,14 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
this._data = response.data;
}
}
-
protected _updateTimestamp(timestamp: Date, forward?: boolean) {
- if (!this.interval) {
- return;
- }
-
const newMoment = moment(timestamp);
- const newToMoment = moment(timestamp);
- const forwardAmount = forward !== undefined ? forward ? 1 : -1 : 0;
- switch (this.interval) {
- case DatapointInterval.MINUTE:
- newMoment.add(forwardAmount, "hour");
- newToMoment.add(1, "hour");
- break;
- case DatapointInterval.HOUR:
- newMoment.add(forwardAmount, "day");
- newToMoment.add(1, "day");
- break;
- case DatapointInterval.DAY:
- newMoment.add(forwardAmount, "week");
- newToMoment.add(1, "week");
- break;
- case DatapointInterval.WEEK:
- newMoment.add(forwardAmount, "month");
- newToMoment.add(1, "month");
- break;
- case DatapointInterval.MONTH:
- newMoment.add(forwardAmount, "year");
- newToMoment.add(1, "year");
- break;
- case DatapointInterval.YEAR:
- newMoment.add(forwardAmount, "year");
- newToMoment.add(7, "year");
- break;
+
+ if (forward !== undefined) {
+ newMoment.add(forward ? 1 : -1, this.period);
}
- this.fromTimestamp = newMoment.toDate();
- this.toTimestamp = newToMoment.toDate();
+ return newMoment.toDate();
}
+
}
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index 6bbbbc596..0df9bb271 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -488,13 +488,20 @@ export class OrChart extends translate(i18next)(LitElement) {
<div id="attribute-list">
${this.assetAttributes.map((attr, index) => {
+
+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attr.name!);
+ let label = Util.getAttributeLabel(attr, attributeDescriptor);
+ let unit = Util.getMetaValue(MetaItemType.UNIT_TYPE, attr, attributeDescriptor);
+ if(unit) {
+ label = label + " ("+i18next.t(unit)+")";
+ }
const bgColor = Util.getMetaValue('color', attr, undefined) ? Util.getMetaValue('color', attr, undefined) : "";
return html`
<div class="attribute-list-item" @mouseover="${()=> this.addDatasetHighlight(bgColor)}" @mouseout="${()=> this.removeDatasetHighlight(bgColor)}">
<span style="margin-right: 10px; --or-icon-width: 20px;">${getAssetDescriptorIconTemplate(AssetModelUtil.getAssetDescriptor(this.assets[index]!.type!), undefined, undefined, bgColor.split('#')[1])}</span>
<div class="attribute-list-item-label">
<span>${this.assets[index].name}</span>
- <span style="font-size:14px; color:grey;">${Util.getAttributeLabel(attr, undefined)}</span>
+ <span style="font-size:14px; color:grey;">${label}</span>
</div>
<button class="button-clear" @click="${() => this._deleteAttribute(index)}"><or-icon icon="close-circle"></or-icon></button>
</div>
diff --git a/ui/component/or-data-viewer/.npmignore b/ui/component/or-data-viewer/.npmignore
new file mode 100644
index 000000000..17e64b1ad
--- /dev/null
+++ b/ui/component/or-data-viewer/.npmignore
@@ -0,0 +1,8 @@
+build/
+build.gradle
+test/
+src/
+webpack.config.js
+tsconfig.json
+dist/*.map
+.tsbuildinfo
\ No newline at end of file
diff --git a/ui/component/or-data-viewer/README.md b/ui/component/or-data-viewer/README.md
new file mode 100644
index 000000000..a152dcfda
--- /dev/null
+++ b/ui/component/or-data-viewer/README.md
@@ -0,0 +1,87 @@
+# @openremote/or-data-viewer \<or-data-viewer\>
+[![NPM Version][npm-image]][npm-url]
+[![Linux Build][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Web Component for displaying an data tree. This component requires an OpenRemote Manager to retrieve, save and query data.
+
+## Install
+```bash
+npm i @openremote/or-data-viewer
+yarn add @openremote/or-data-viewer
+```
+
+## Usage
+By default the or-data-viewer is using a 2 columns grid. This can be changed by using a different config.
+
+4 column grid, 25% for each column:
+```javascript
+const viewerConfig = {
+ viewerStyles: {
+ gridTemplateColumns: "repeat(auto-fill, minmax(calc(25%),1fr))";
+ }
+};
+<or-data-viewer .config="${viewerConfig}"></or-data-viewer>
+```
+
+
+The position of a panel can also be changed by changing the config of or-data-viewer
+
+To change the width of a panel use gridColumn:
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridColumn: "1 / -1" // same as 1 / 3 in a 2 column grid: Start on column 1, End on column 3
+ }
+ }
+ }
+};
+```
+
+gridColumn can also be used to change the position horizontaly.
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridColumnStart: "2" // start the panel in the second column
+ }
+ }
+ }
+};
+```
+
+To change the vertical position of a panel use gridRowStart. To start the panel on the first row set gridRowStart to 1:
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridRowStart: "1"
+ }
+ }
+ }
+};
+```
+
+For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().
+
+## Supported Browsers
+The last 2 versions of all modern browsers are supported, including Chrome, Safari, Opera, Firefox, Edge. In addition,
+Internet Explorer 11 is also supported.
+
+
+## License
+[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
+
+[npm-image]: https://img.shields.io/npm/v/live-xxx.svg
+[npm-url]: https://npmjs.org/package/@openremote/or-asset-list
+[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg
+[travis-url]: https://travis-ci.org/live-js/live-xxx
+[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg
+[coveralls-url]: https://coveralls.io/r/live-js/live-xxx?branch=master
diff --git a/ui/component/or-data-viewer/build.gradle b/ui/component/or-data-viewer/build.gradle
new file mode 100644
index 000000000..98cdcb8e2
--- /dev/null
+++ b/ui/component/or-data-viewer/build.gradle
@@ -0,0 +1,15 @@
+buildDir = "dist"
+
+task clean() {
+ doLast {
+ delete "dist"
+ }
+}
+
+task prepareUi() {
+ dependsOn clean, npmPrepare
+}
+
+task publishUi() {
+ dependsOn clean, npmPublish
+}
\ No newline at end of file
diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.json
new file mode 100644
index 000000000..bd4164092
--- /dev/null
+++ b/ui/component/or-data-viewer/package.json
@@ -0,0 +1,34 @@
+{
+ "name": "@openremote/or-data-viewer",
+ "version": "1.1.0",
+ "description": "OpenRemote data Viewer",
+ "main": "dist/umd/index.bundle.js",
+ "module": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+ "test": "echo \"No tests\" && exit 0",
+ "prepublishOnly": "npx tsc -b && npx webpack"
+ },
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+ "@openremote/core": "^1.1.0",
+ "@openremote/model": "^1.1.0",
+ "@openremote/or-icon": "^1.1.0",
+ "@openremote/or-input": "^1.1.0",
+ "@openremote/or-attribute-input": "^1.1.0",
+ "@openremote/or-attribute-history": "^1.1.0",
+ "@openremote/or-translate": "^1.1.0",
+ "@openremote/or-panel": "^1.1.0",
+ "@openremote/or-map": "^1.1.0",
+ "@openremote/or-chart": "^1.1.0",
+ "@openremote/rest": "^1.1.0",
+ "lit-element": "^2.2.1"
+ },
+ "devDependencies": {
+ "tslint": ">=5.11.0",
+ "typescript": ">=3.4.5",
+ "webpack": "^4.41.2",
+ "webpack-cli": "^3.3.9"
+ }
+}
diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.ts
new file mode 100644
index 000000000..384765d5d
--- /dev/null
+++ b/ui/component/or-data-viewer/src/index.ts
@@ -0,0 +1,255 @@
+import {customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import "@openremote/or-chart";
+import "@openremote/or-translate";
+import {translate} from "@openremote/or-translate";
+import manager, {AssetModelUtil, subscribe, Util} from "@openremote/core";
+import "@openremote/or-panel";
+import {OrChartConfig, OrChartEvent} from "@openremote/or-chart";
+import {
+ Asset,
+ AssetAttribute,
+ AssetEvent,
+ AssetType,
+ Attribute,
+ AttributeEvent,
+ AttributeType,
+ MetaItemType,
+ MetaItem
+} from "@openremote/model";
+import {style} from "./style";
+import i18next from "i18next";
+import {styleMap} from "lit-html/directives/style-map";
+import {classMap} from "lit-html/directives/class-map";
+
+export type PanelType = "chart";
+
+export interface DefaultAssets {
+ assetId?: string;
+ attributes?: string[];
+}
+
+export interface PanelConfig {
+ type?: PanelType;
+ hide?: boolean;
+ hideOnMobile?: boolean;
+ defaults?: DefaultAssets[];
+ include?: string[];
+ exclude?: string[];
+ readonly?: string[];
+ panelStyles?: { [style: string]: string };
+ fieldStyles?: { [field: string]: { [style: string]: string } };
+}
+
+export interface DataViewerConfig {
+ panels: {[name: string]: PanelConfig};
+ viewerStyles?: { [style: string]: string };
+ propertyViewProvider?: (property: string, value: any, viewerConfig: DataViewerConfig, panelConfig: PanelConfig) => TemplateResult | undefined;
+ attributeViewProvider?: (attribute: Attribute, viewerConfig: DataViewerConfig, panelConfig: PanelConfig) => TemplateResult | undefined;
+ panelViewProvider?: (attributes: AssetAttribute[], panelName: string, viewerConfig: DataViewerConfig, panelConfig: PanelConfig) => TemplateResult | undefined;
+ chartConfig?: OrChartConfig;
+}
+
+
+class EventHandler {
+ _callbacks: Function[];
+
+ constructor() {
+ this._callbacks = [];
+ }
+
+ startCallbacks() {
+ return new Promise((resolve, reject) => {
+ if (this._callbacks && this._callbacks.length > 0) {
+ this._callbacks.forEach(cb => cb());
+ }
+ resolve();
+ })
+
+ }
+
+ addCallback(callback: Function) {
+ this._callbacks.push(callback);
+ }
+}
+const onRenderComplete = new EventHandler();
+
+@customElement("or-data-viewer")
+export class OrDataViewer extends subscribe(manager)(translate(i18next)(LitElement)) {
+
+ public static DEFAULT_PANEL_TYPE: PanelType = "chart";
+
+ public static DEFAULT_CONFIG: DataViewerConfig = {
+ viewerStyles: {
+
+ },
+ panels: {
+ "chart": {
+ type: "chart",
+ hideOnMobile: true,
+ panelStyles: {
+ gridColumn: "1 / -1",
+ gridRowStart: "1"
+ }
+ }
+ }
+ };
+
+ static get styles() {
+ return [
+ style
+ ];
+ }
+
+ @property({type: Array, attribute: false})
+ protected _assets?: Asset[];
+
+ @property()
+ protected _loading: boolean = false;
+
+ config?: DataViewerConfig;
+
+
+ constructor() {
+ super();
+ window.addEventListener('resize', () => OrDataViewer.generateGrid(this.shadowRoot));
+
+ this.addEventListener(OrChartEvent.NAME,() => OrDataViewer.generateGrid(this.shadowRoot));
+ }
+
+ firstUpdated() {
+ this.loadAssets();
+ }
+
+ protected render() {
+
+ if (this._loading) {
+ return html`
+ <div class="msg"><or-translate value="loading"></or-translate></div>
+ `;
+ }
+
+ if (!this.config) {
+ return html``;
+ }
+
+ 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))}
+ </div>
+ </div>
+ `;
+ }
+
+ protected updated(_changedProperties: PropertyValues) {
+ super.updated(_changedProperties);
+
+ this.onCompleted().then(() => {
+ onRenderComplete.startCallbacks().then(() => {
+ OrDataViewer.generateGrid(this.shadowRoot);
+ });
+ });
+
+ }
+
+ async onCompleted() {
+ await this.updateComplete;
+ }
+
+ public static generateGrid(shadowRoot: ShadowRoot | null) {
+ if (shadowRoot) {
+ const grid = shadowRoot.querySelector('#container');
+ 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) {
+ items.forEach((item) => {
+ const content = item.querySelector('.panel-content-wrapper');
+ if (content) {
+ const rowSpan = Math.ceil((content.getBoundingClientRect().height + rowGap) / (rowHeight + rowGap));
+ (item as HTMLElement).style.gridRowEnd = "span " + rowSpan;
+ }
+ });
+ }
+ }
+ }
+ }
+
+ public getPanel(name: string, panelConfig: PanelConfig) {
+ const content = this.getPanelContent(name, panelConfig);
+
+ if (!content) {
+ return;
+ }
+
+
+ return html`
+ <div class=${classMap({"panel": true, mobileHidden: panelConfig.hideOnMobile === true})} id="${name}-panel" style="${panelConfig && panelConfig.panelStyles ? styleMap(panelConfig.panelStyles) : ""}">
+ <div class="panel-content-wrapper">
+ <div class="panel-title">
+ <or-translate value="${name}"></or-translate>
+ </div>
+ <div class="panel-content">
+ ${content}
+ </div>
+ </div>
+ </div>
+ `;
+ }
+
+ public getPanelContent(panelName: string, panelConfig: PanelConfig): TemplateResult | undefined {
+ if (panelConfig.hide || !this.config) {
+ return;
+ }
+
+ const defaults = panelConfig && panelConfig.defaults ? panelConfig.defaults : undefined;
+ let assetList: Asset[] = [];;
+ let assetAttributes: Attribute[] = [];
+ if(defaults && this._assets){
+ const assetIds = defaults.map(obj => obj.assetId);
+ const attributeName = defaults.map(obj => obj.attributes);
+
+ this._assets.map(asset => {
+ const index = assetIds.indexOf(asset.id);
+ if(index >= 0) {
+ assetList.push(asset);
+ let attrs:Attribute[] = Util.getAssetAttributes(asset);
+ if(attrs) {
+ attrs = attrs.filter(attr => {
+ const name = attributeName[index];
+ return attr.name && name && name.includes(attr.name);
+ });
+ }
+ assetAttributes = assetAttributes.concat(attrs)
+ }
+ });
+ }
+ let content: TemplateResult | undefined;
+
+ if (panelConfig && panelConfig.type === "chart") {
+ content = html`
+ <or-chart id="chart" .config="${this.config.chartConfig}" .assets="${assetList ? assetList : []}" .assetAttributes="${assetAttributes}">></or-chart>
+ `;
+
+ }
+
+ return content;
+
+ }
+
+ protected async loadAssets() {
+ const query = {
+ select: {
+ excludeAttributeMeta: true,
+ excludeAttributeTimestamp: true,
+ excludeAttributeValue: true,
+ excludeParentInfo: true,
+ excludeRealm: true,
+ excludePath: true
+ }
+ };
+ const response = await manager.rest.api.AssetResource.queryAssets(query);
+ this._assets = response.data;
+ }
+}
diff --git a/ui/component/or-data-viewer/src/style.ts b/ui/component/or-data-viewer/src/style.ts
new file mode 100644
index 000000000..fe4147105
--- /dev/null
+++ b/ui/component/or-data-viewer/src/style.ts
@@ -0,0 +1,159 @@
+import {css, unsafeCSS} from "lit-element";
+import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5} from "@openremote/core";
+
+// language=CSS
+export const style = css`
+
+ :host {
+ --internal-or-asset-viewer-background-color: var(--or-asset-viewer-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));
+ --internal-or-asset-viewer-panel-margin: var(--or-asset-viewer-panel-margin, 20px);
+ --internal-or-asset-viewer-panel-padding: var(--or-asset-viewer-panel-padding, 24px);
+ --internal-or-asset-viewer-text-color: var(--or-asset-viewer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
+ --internal-or-asset-viewer-title-text-color: var(--or-asset-viewer-title-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
+ --internal-or-asset-viewer-panel-color: var(--or-asset-viewer-panel-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));
+ --internal-or-asset-viewer-line-color: var(--or-asset-viewer-line-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));
+
+ height: 100%;
+ width: 100%;
+ background-color: var(--internal-or-asset-viewer-background-color);
+ }
+
+ *[hidden] {
+ display: none;
+ }
+
+ #wrapper {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+
+ overflow: auto;
+ }
+
+ #container {
+ box-sizing: border-box;
+ display: grid;
+ padding: 20px 20px;
+ grid-gap: 10px;
+ grid-template-columns: repeat(auto-fill, minmax(calc(50% - 5px),1fr));
+ grid-auto-rows: 5px;
+
+ -webkit-animation: fadein 0.3s; /* Safari, Chrome and Opera > 12.1 */
+ -moz-animation: fadein 0.3s; /* Firefox < 16 */
+ -ms-animation: fadein 0.3s; /* Internet Explorer */
+ -o-animation: fadein 0.3s; /* Opera < 12.1 */
+ animation: fadein 0.3s;
+ }
+
+ @keyframes fadein {
+ from { opacity: 0; }
+ to { opacity: 1; }
+ }
+
+ /* Firefox < 16 */
+ @-moz-keyframes fadein {
+ from { opacity: 0; }
+ to { opacity: 1; }
+ }
+
+ /* Safari, Chrome and Opera > 12.1 */
+ @-webkit-keyframes fadein {
+ from { opacity: 0; }
+ to { opacity: 1; }
+ }
+
+ /* Internet Explorer */
+ @-ms-keyframes fadein {
+ from { opacity: 0; }
+ to { opacity: 1; }
+ }
+
+ /* Opera < 12.1 */
+ @-o-keyframes fadein {
+ from { opacity: 0; }
+ to { opacity: 1; }
+ }
+
+ .panel {
+ background-color: var(--internal-or-asset-viewer-panel-color);
+ border: 1px solid #e5e5e5;
+ border-radius: 5px;
+ max-width: 100%;
+ }
+
+ .panel-content-wrapper {
+ padding: var(--internal-or-asset-viewer-panel-padding);
+ }
+
+ .panel-content {
+ display: flex;
+ flex-wrap: wrap;
+ }
+
+ .panel-title {
+ text-transform: uppercase;
+ font-weight: bolder;
+ line-height: 1em;
+ color: var(--internal-or-asset-viewer-title-text-color);
+ margin-bottom: 12px;
+ flex: 0 0 auto;
+ }
+
+ .field {
+ margin: 10px 0;
+ width: 100%;
+ flex: 0 0 auto;
+ min-height: 50px;
+ }
+
+ .field > * {
+ width: 100%;
+ box-sizing: border-box;
+ }
+
+ .msg {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ height: 100%;
+ }
+
+ .back-navigation {
+ display: none;
+ cursor: pointer;
+ }
+
+ @media screen and (max-width: 769px) {
+ .back-navigation {
+ display: block;
+ }
+
+ .mobileHidden {
+ display: none;
+ }
+
+ #container {
+ grid-auto-rows: auto;
+ }
+
+ .panel {
+ border-radius: 0;
+ border-right: none;
+ border-left: none;
+ }
+
+ #chart-panel {
+ grid-row-start: 1;
+ }
+
+
+ #container {
+ grid-template-columns: 100% !important;
+ padding: 20px 0;
+ }
+
+
+ }
+`;
\ No newline at end of file
diff --git a/ui/component/or-data-viewer/tsconfig.json b/ui/component/or-data-viewer/tsconfig.json
new file mode 100644
index 000000000..2e82f9066
--- /dev/null
+++ b/ui/component/or-data-viewer/tsconfig.json
@@ -0,0 +1,19 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "tsBuildInfoFile": "./dist/.tsbuildinfo",
+ "rootDir": "src"
+ },
+ "include": [
+ "./src"
+ ],
+ "references": [
+ { "path": "../core" },
+ { "path": "../rest" },
+ { "path": "../model" },
+ { "path": "../or-chart" },
+ { "path": "../or-panel" },
+ { "path": "../or-translate" }
+ ]
+}
\ No newline at end of file
diff --git a/ui/component/or-data-viewer/webpack.config.js b/ui/component/or-data-viewer/webpack.config.js
new file mode 100644
index 000000000..bda3df670
--- /dev/null
+++ b/ui/component/or-data-viewer/webpack.config.js
@@ -0,0 +1,10 @@
+const util = require("../webpack.util");
+
+bundles = {
+ "index": {
+ excludeOr: true
+ },
+ "index.orbundle": undefined
+};
+
+module.exports = util.generateExports(__dirname);
\ No newline at end of file
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index b918934c9..9c73bafb3 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -28,7 +28,8 @@ import {
RulesetUnion,
TenantRuleset,
ValueType,
- ClientRole
+ ClientRole,
+ Asset
} from "@openremote/model";
import "@openremote/or-translate";
import "@openremote/or-mwc-components/dist/or-mwc-drawer";
@@ -216,121 +217,143 @@ export function getAttributeNames(descriptor?: AssetDescriptor) {
return attributes;
}
-export function getAssetDescriptors(config: RulesConfig | undefined, useActionConfig: boolean) {
- const assetDescriptors: AssetDescriptor[] = AssetModelUtil.getAssetDescriptors();
- let allowedAssetTypes: string[] = [];
- let excludedAssetTypes: string[] = [];
+export const getAssetTypes = async () => {
+ const response = await manager.rest.api.AssetResource.queryAssets({
+ select: {
+ excludeAttributes: true,
+ excludeRealm: true,
+ excludeParentInfo: true,
+ excludePath: true,
+ excludeAttributeMeta: true,
+ excludeAttributeTimestamp: true,
+ excludeAttributeType: true,
+ excludeAttributeValue: true
+ },
+ recursive: true
+ });
- if (!config || !config.descriptors) {
- return assetDescriptors;
+ if(response && response.data) {
+ return response.data.map(asset => asset.type!);
}
+}
- const section = useActionConfig ? config.descriptors.action : config.descriptors.when;
-
- if (section && section.includeAssets) {
- allowedAssetTypes = [...section.includeAssets];
- }
- if (config.descriptors.all && config.descriptors.all.includeAssets) {
- allowedAssetTypes = allowedAssetTypes.concat(config.descriptors.all.includeAssets);
- }
+export function getAssetDescriptors(config: RulesConfig | undefined, useActionConfig: boolean) {
+ const assetDescriptors: AssetDescriptor[] = AssetModelUtil.getAssetDescriptors();
+ return getAssetTypes().then(availibleAssetTypes => {
+ let allowedAssetTypes: string[] = availibleAssetTypes ? availibleAssetTypes : [];
+ let excludedAssetTypes: string[] = [];
+ if (!config || !config.descriptors) {
+ return assetDescriptors;
+ }
- if (section && section.excludeAssets) {
- excludedAssetTypes = [...section.excludeAssets];
- }
+ const section = useActionConfig ? config.descriptors.action : config.descriptors.when;
- if (config.descriptors.all && config.descriptors.all.excludeAssets) {
- excludedAssetTypes = excludedAssetTypes.concat(config.descriptors.all.excludeAssets);
- }
+ if (section && section.includeAssets) {
+ allowedAssetTypes = allowedAssetTypes.concat(section.includeAssets);
+ }
- return assetDescriptors.filter((ad) => {
- if (allowedAssetTypes.length > 0 && allowedAssetTypes.indexOf(ad.type!) < 0) {
- return false;
+ if (config.descriptors.all && config.descriptors.all.includeAssets) {
+ allowedAssetTypes = allowedAssetTypes.concat(config.descriptors.all.includeAssets);
+ }
+ if (section && section.excludeAssets) {
+ excludedAssetTypes = [...section.excludeAssets];
}
- return excludedAssetTypes.indexOf(ad.type!) < 0;
- }).map((ad) => {
- // Amalgamate matching descriptor from config if defined
- const configDescriptor = getAssetDescriptorFromSection(ad.type!, config, useActionConfig);
- if (!configDescriptor) {
- return ad;
+ if (config.descriptors.all && config.descriptors.all.excludeAssets) {
+ excludedAssetTypes = excludedAssetTypes.concat(config.descriptors.all.excludeAssets);
}
- const modifiedDescriptor: AssetDescriptor = {
- name: ad.name,
- type: ad.type,
- icon: ad.icon,
- color: ad.color,
- attributeDescriptors: ad.attributeDescriptors ? [...ad.attributeDescriptors] : undefined
- };
+ return assetDescriptors.filter((ad) => {
+ if (allowedAssetTypes.length > 0 && allowedAssetTypes.indexOf(ad.type!) < 0) {
+ return false;
+ }
+ return excludedAssetTypes.indexOf(ad.type!) < 0;
- if (configDescriptor.icon) {
- modifiedDescriptor.icon = configDescriptor.icon;
- }
- if (configDescriptor.name) {
- modifiedDescriptor.name = configDescriptor.name;
- }
- if (configDescriptor.color) {
- modifiedDescriptor.color = configDescriptor.color;
- }
+ }).map((ad) => {
+ // Amalgamate matching descriptor from config if defined
+ const configDescriptor = getAssetDescriptorFromSection(ad.type!, config, useActionConfig);
+ if (!configDescriptor) {
+ return ad;
+ }
- // Remove any excluded attributes
- if (modifiedDescriptor.attributeDescriptors) {
- const inc = configDescriptor.includeAttributes !== undefined ? configDescriptor.includeAttributes : undefined;
- const exc = configDescriptor.excludeAttributes !== undefined ? configDescriptor.excludeAttributes : undefined;
-
- if (inc || exc) {
- modifiedDescriptor.attributeDescriptors = modifiedDescriptor.attributeDescriptors.filter((mad) => {
- if (exc && exc.indexOf(mad.attributeName!) >= 0) {
- return false;
- }
- if (inc && inc.indexOf(mad.attributeName!) < 0) {
- return false;
- }
- return true;
- });
+ const modifiedDescriptor: AssetDescriptor = {
+ name: ad.name,
+ type: ad.type,
+ icon: ad.icon,
+ color: ad.color,
+ attributeDescriptors: ad.attributeDescriptors ? [...ad.attributeDescriptors] : undefined
+ };
+
+ if (configDescriptor.icon) {
+ modifiedDescriptor.icon = configDescriptor.icon;
+ }
+ if (configDescriptor.name) {
+ modifiedDescriptor.name = configDescriptor.name;
+ }
+ if (configDescriptor.color) {
+ modifiedDescriptor.color = configDescriptor.color;
}
- // Override any attribute descriptors
- if (configDescriptor.attributeDescriptors) {
- modifiedDescriptor.attributeDescriptors.map((attributeDescriptor) => {
- let configAttributeDescriptor: RulesConfigAttribute | undefined = configDescriptor.attributeDescriptors![attributeDescriptor.attributeName!];
- if (!configAttributeDescriptor) {
- configAttributeDescriptor = section && section.attributeDescriptors ? section.attributeDescriptors[attributeDescriptor.attributeName!] : undefined;
- }
- if (!configAttributeDescriptor) {
- configAttributeDescriptor = config.descriptors!.all && config.descriptors!.all.attributeDescriptors ? config.descriptors!.all.attributeDescriptors[attributeDescriptor.attributeName!] : undefined;
- }
- if (configAttributeDescriptor) {
- let metaItemDescriptors = attributeDescriptor.metaItemDescriptors;
- if (!metaItemDescriptors) {
- attributeDescriptor.metaItemDescriptors = [];
- metaItemDescriptors = attributeDescriptor.metaItemDescriptors;
- }
+ // Remove any excluded attributes
+ if (modifiedDescriptor.attributeDescriptors) {
+ const inc = configDescriptor.includeAttributes !== undefined ? configDescriptor.includeAttributes : undefined;
+ const exc = configDescriptor.excludeAttributes !== undefined ? configDescriptor.excludeAttributes : undefined;
- if (configAttributeDescriptor.allowedValues) {
- addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.ALLOWED_VALUES, configAttributeDescriptor.allowedValues));
+ if (inc || exc) {
+ modifiedDescriptor.attributeDescriptors = modifiedDescriptor.attributeDescriptors.filter((mad) => {
+ if (exc && exc.indexOf(mad.attributeName!) >= 0) {
+ return false;
}
- if (configAttributeDescriptor.allowedMin) {
- addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.RANGE_MIN, configAttributeDescriptor.allowedMin));
+ if (inc && inc.indexOf(mad.attributeName!) < 0) {
+ return false;
}
- if (configAttributeDescriptor.allowedMax) {
- addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.RANGE_MAX, configAttributeDescriptor.allowedMax));
+ return true;
+ });
+ }
+
+ // Override any attribute descriptors
+ if (configDescriptor.attributeDescriptors) {
+ modifiedDescriptor.attributeDescriptors.map((attributeDescriptor) => {
+ let configAttributeDescriptor: RulesConfigAttribute | undefined = configDescriptor.attributeDescriptors![attributeDescriptor.attributeName!];
+ if (!configAttributeDescriptor) {
+ configAttributeDescriptor = section && section.attributeDescriptors ? section.attributeDescriptors[attributeDescriptor.attributeName!] : undefined;
+ }
+ if (!configAttributeDescriptor) {
+ configAttributeDescriptor = config.descriptors!.all && config.descriptors!.all.attributeDescriptors ? config.descriptors!.all.attributeDescriptors[attributeDescriptor.attributeName!] : undefined;
+ }
+ if (configAttributeDescriptor) {
+ let metaItemDescriptors = attributeDescriptor.metaItemDescriptors;
+ if (!metaItemDescriptors) {
+ attributeDescriptor.metaItemDescriptors = [];
+ metaItemDescriptors = attributeDescriptor.metaItemDescriptors;
+ }
+
+ if (configAttributeDescriptor.allowedValues) {
+ addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.ALLOWED_VALUES, configAttributeDescriptor.allowedValues));
+ }
+ if (configAttributeDescriptor.allowedMin) {
+ addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.RANGE_MIN, configAttributeDescriptor.allowedMin));
+ }
+ if (configAttributeDescriptor.allowedMax) {
+ addOrReplaceMetaItemDescriptor(metaItemDescriptors, AssetModelUtil.getMetaItemDescriptorInitialValue(MetaItemType.RANGE_MAX, configAttributeDescriptor.allowedMax));
+ }
+
+ return {
+ attributeName: attributeDescriptor.attributeName,
+ valueDescriptor: configAttributeDescriptor.valueDescriptor ? configAttributeDescriptor.valueDescriptor : attributeDescriptor.valueDescriptor,
+ initialValue: configAttributeDescriptor.initialValue ? configAttributeDescriptor.initialValue : attributeDescriptor.initialValue,
+ metaItemDescriptors: attributeDescriptor.metaItemDescriptors
+ };
}
- return {
- attributeName: attributeDescriptor.attributeName,
- valueDescriptor: configAttributeDescriptor.valueDescriptor ? configAttributeDescriptor.valueDescriptor : attributeDescriptor.valueDescriptor,
- initialValue: configAttributeDescriptor.initialValue ? configAttributeDescriptor.initialValue : attributeDescriptor.initialValue,
- metaItemDescriptors: attributeDescriptor.metaItemDescriptors
- };
- }
-
- return attributeDescriptor;
- });
+ return attributeDescriptor;
+ });
+ }
}
- }
- return modifiedDescriptor;
+ return modifiedDescriptor;
+ });
+
});
}
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
index 3d13de011..786d1c244 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
@@ -137,7 +137,11 @@ export class OrRuleActionAttribute extends translate(i18next)(LitElement) {
return html`
<or-input id="matchSelect" .label="${i18next.t("asset")}" .type="${InputType.SELECT}" @or-input-changed="${(e: OrInputChangedEvent) => this._assetId = (e.detail.value)}" ?readonly="${this.readonly}" .options="${idOptions}" .value="${idValue}"></or-input>
- <or-input id="attributeSelect" .label="${i18next.t("attribute")}" .type="${InputType.SELECT}" @or-input-changed="${(e: OrInputChangedEvent) => this.setActionAttributeName(e.detail.value)}" ?readonly="${this.readonly}" .options="${attributes}" .value="${this.action.attributeName}"></or-input>
+ ${attributes.length > 0 ? html`
+ <or-input id="attributeSelect" .label="${i18next.t("attribute")}" .type="${InputType.SELECT}" @or-input-changed="${(e: OrInputChangedEvent) => this.setActionAttributeName(e.detail.value)}" ?readonly="${this.readonly}" .options="${attributes}" .value="${this.action.attributeName}"></or-input>
+ ` : html`
+ <or-translate value="No attributes with write permission"></or-translate>
+ `}
${inputTemplate ? inputTemplate(this.action.value) : ``}
`;
}
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
index a8187bbb8..3a00239bb 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
@@ -1,4 +1,4 @@
-import {customElement, html, LitElement, property, TemplateResult, css} from "lit-element";
+import {customElement, html, LitElement, property, TemplateResult, css, PropertyValues} from "lit-element";
import {
getAssetDescriptors,
getAssetTypeFromQuery,
@@ -87,8 +87,8 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
protected _rule!: JsonRule;
protected _unsupported = false;
protected _assetDescriptors?: AssetDescriptor[];
- protected _whenAssetDescriptors?: AssetDescriptor[];
- protected _actionAssetDescriptors?: AssetDescriptor[];
+ _whenAssetDescriptors?: AssetDescriptor[];
+ _actionAssetDescriptors?: AssetDescriptor[];
constructor() {
super();
@@ -146,6 +146,13 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
}
}
+ updated(changedPropreties:PropertyValues) {
+ if(changedPropreties.has('config')){
+ this.getAssetDescriptors(false);
+ this.getAssetDescriptors(true);
+ }
+ }
+
protected render(): TemplateResult | void {
if (!this._rule) {
@@ -153,35 +160,38 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
}
const targetTypeMap = this.getTargetTypeMap();
- const whenDescriptors = this.getAssetDescriptors(false);
- const actionDescriptors = this.getAssetDescriptors(true);
-
return html`
<div class="section-container">
- <or-rule-when .rule="${this._rule}" .config="${this.config}" .assetDescriptors="${whenDescriptors}" ?readonly="${this.readonly}"></or-rule-when>
+ <or-rule-when .rule="${this._rule}" .config="${this.config}" .assetDescriptors="${this._whenAssetDescriptors}" ?readonly="${this.readonly}"></or-rule-when>
</div>
<div class="section-container">
- <or-rule-then-otherwise .rule="${this._rule}" .config="${this.config}" .targetTypeMap="${targetTypeMap}" .assetDescriptors="${actionDescriptors}" ?readonly="${this.readonly}"></or-rule-then-otherwise>
+ <or-rule-then-otherwise .rule="${this._rule}" .config="${this.config}" .targetTypeMap="${targetTypeMap}" .assetDescriptors="${this._actionAssetDescriptors}" ?readonly="${this.readonly}"></or-rule-then-otherwise>
</div>
`;
}
protected getAssetDescriptors(useActionConfig: boolean) {
- if (useActionConfig) {
- if (this._actionAssetDescriptors) {
+ getAssetDescriptors(this.config, useActionConfig).then(result => {
+ if (useActionConfig) {
+ if (this._actionAssetDescriptors) {
+ return this._actionAssetDescriptors;
+ }
+ this._actionAssetDescriptors = [...result];
+ this.requestUpdate();
+
return this._actionAssetDescriptors;
}
- this._actionAssetDescriptors = getAssetDescriptors(this.config, useActionConfig);
- return this._actionAssetDescriptors;
- }
+
+ if (this._whenAssetDescriptors) {
+ return this._whenAssetDescriptors;
+ }
+
+ this._whenAssetDescriptors = [...result];
+ this.requestUpdate();
- if (this._whenAssetDescriptors) {
return this._whenAssetDescriptors;
- }
-
- this._whenAssetDescriptors = getAssetDescriptors(this.config, useActionConfig);
- return this._whenAssetDescriptors;
+ })
}
protected getTargetTypeMap(): [string, string?][] {
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
index acb113f25..a3693e9bc 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
@@ -34,6 +34,7 @@ function getActionTypesMenu(config?: RulesConfig, assetDescriptors?: AssetDescri
addNotification = config.controls.allowedActionTypes.indexOf(ActionType.NOTIFICATION) >= 0;
}
+
const menu: MenuItem[] = [];
if (addAssetTypes && assetDescriptors) {
@@ -188,6 +189,7 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {
public config?: RulesConfig;
+ @property({type: Object, attribute: false})
public assetDescriptors?: AssetDescriptor[];
protected get thenAllowAdd() {
@@ -305,7 +307,6 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {
}
protected render() {
-
return html`
<div>
<or-panel .heading="${i18next.t("then")}...">
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.ts
index 3ccab0396..004e3608b 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts
@@ -110,6 +110,7 @@ class OrRuleWhen extends translate(i18next)(LitElement) {
public config?: RulesConfig;
+ @property({type: Object, attribute: false})
public assetDescriptors?: AssetDescriptor[];
protected ruleGroupTemplate(group: LogicGroup<RuleCondition>, parentGroup?: LogicGroup<RuleCondition>): TemplateResult | undefined {