@openremote/or-dashboard-builder 1.3.0-snapshot.20250217182018 → 1.3.0-snapshot.20250218143028

package/src/panels/thresholds-panel.ts

@@ -133,7 +133,7 @@ export class ThresholdsPanel extends LitElement {
             <div id="thresholds-list" class="expanded-panel">
 
                 <!-- Thresholds by number -->
-                ${(this.valueType === 'number' || this.valueType === 'positiveInteger'
+                ${(this.valueType === 'number' || this.valueType === 'integer' || this.valueType === 'positiveInteger'
                         || this.valueType === 'positiveNumber' || this.valueType === 'negativeInteger'
                         || this.valueType === 'negativeNumber') ? html`
                     ${(this.thresholds as [number, string][]).sort((x, y) => (x[0] < y[0]) ? -1 : 1).map((threshold, index) => {

package/src/settings/map-settings.ts

@@ -9,7 +9,7 @@ import "../panels/assettypes-panel";
 import "../panels/thresholds-panel";
 import {LngLat} from "maplibre-gl"; // TODO: Replace this import
 import {when} from "lit/directives/when.js";
-import {AssetTypeSelectEvent, AssetTypesFilterConfig, AttributeNamesSelectEvent} from "../panels/assettypes-panel";
+import {AssetIdsSelectEvent, AssetTypeSelectEvent, AssetAllOfTypeSwitchEvent, AssetTypesFilterConfig, AttributeNamesSelectEvent} from "../panels/assettypes-panel";
 import manager from "@openremote/core";
 import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
 import {BoolColorsChangeEvent, ThresholdChangeEvent} from "../panels/thresholds-panel";
@@ -32,8 +32,13 @@ export class MapSettings extends AssetWidgetSettings {
     }
 
     protected render(): TemplateResult {
-        const allowedValueTypes = ["boolean", "number", "positiveInteger", "positiveNumber", "negativeInteger", "negativeNumber", "text"];
+        const allowedValueTypes = ["boolean", "number", "integer", "positiveInteger", "positiveNumber", "negativeInteger", "negativeNumber", "text"];
         const config = {
+            assets: {
+                enabled: true,
+                multi: true,
+                allOfTypeOption: true
+            },
             attributes: {
                 enabled: true,
                 valueTypes: allowedValueTypes
@@ -71,7 +76,10 @@ export class MapSettings extends AssetWidgetSettings {
                 <!-- Panel where Asset type and the selected attribute can be customized -->
                 <settings-panel displayName="attributes" expanded="${true}">
                     <assettypes-panel .assetType="${this.widgetConfig.assetType}" .attributeNames="${this.widgetConfig.attributeName}" .config="${config}"
+                                      .allOfType="${this.widgetConfig.allOfType}" .assetIds="${this.widgetConfig.assetIds}"
                                       @assettype-select="${(ev: AssetTypeSelectEvent) => this.onAssetTypeSelect(ev)}"
+                                      @alloftype-switch="${(ev: AssetAllOfTypeSwitchEvent) => this.onAssetAllOfTypeSwitch(ev)}"
+                                      @assetids-select="${(ev: AssetIdsSelectEvent) => this.onAssetIdsSelect(ev)}"
                                       @attributenames-select="${(ev: AttributeNamesSelectEvent) => this.onAttributeNameSelect(ev)}"
                     ></assettypes-panel>
 
@@ -148,27 +156,50 @@ export class MapSettings extends AssetWidgetSettings {
         }
     }
 
+    protected onAssetAllOfTypeSwitch(ev: AssetAllOfTypeSwitchEvent) {
+        this.widgetConfig.allOfType = ev.detail as boolean;
+        this.notifyConfigUpdate();
+    }
+
+    protected onAssetIdsSelect(ev: AssetIdsSelectEvent) {
+        this.widgetConfig.assetIds = ev.detail as string[];
+        this.notifyConfigUpdate();
+    }
+
     protected async onAttributeNameSelect(ev: AttributeNamesSelectEvent) {
         const attrName = ev.detail as string;
         this.widgetConfig.attributeName = attrName;
-        await manager.rest.api.AssetResource.queryAssets({
-            realm: {
-                name: manager.displayRealm
-            },
-            select: {
-                attributes: [attrName, 'location']
-            },
-            types: [this.widgetConfig.assetType!],
-        }).then(response => {
-            this.widgetConfig.assetIds = response.data.map((a) => a.id!);
-            this.widgetConfig.valueType = (response.data.length > 0) ? response.data[0].attributes![attrName].type : "text"; // sometimes no asset exists of that assetType, so using 'text' as fallback.
-        }).catch((reason) => {
-            console.error(reason);
-            showSnackbar(undefined, "errorOccurred");
-        });
-
-        this.notifyConfigUpdate()
-    }
+
+        const queryAssets = async (ids?: string[]) => {
+            try {
+                const response = await manager.rest.api.AssetResource.queryAssets({
+                    realm: { name: manager.displayRealm },
+                    select: { attributes: [attrName, 'location'] },
+                    types: [this.widgetConfig.assetType!],
+                    ids: ids
+                });
+                this.widgetConfig.assetIds = response.data.map((a) => a.id!);
+                this.widgetConfig.valueType = response.data.length ? response.data[0].attributes![attrName].type : "text";
+                if (!response.data[0].attributes![attrName].type) {
+                    throw new TypeError("Data does not contain property 'attributes' or 'type'.")}
+            } catch (reason) {
+                console.error(reason);
+                if (reason instanceof TypeError) {
+                    showSnackbar(undefined, "noAttributesToShow");
+                } else {
+                    showSnackbar(undefined, "errorOccurred");
+                    }
+            }
+        };
+
+        if (this.widgetConfig.allOfType) {
+            await queryAssets();
+        } else {
+            await queryAssets(this.widgetConfig.assetIds!);
+        }
+
+        this.notifyConfigUpdate();
+     }
 
     protected onShowLabelsToggle(ev: OrInputChangedEvent) {
         this.widgetConfig.showLabels = ev.detail.value;

package/src/settings/table-settings.ts

@@ -3,7 +3,7 @@ import { customElement } from "lit/decorators.js";
 import {AssetWidgetSettings} from "../util/or-asset-widget";
 import {TableWidgetConfig} from "../widgets/table-widget";
 import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
-import {AssetIdsSelectEvent, AssetTypeSelectEvent, AssetTypesFilterConfig, AttributeNamesSelectEvent} from "../panels/assettypes-panel";
+import {AssetIdsSelectEvent, AssetTypeSelectEvent, AssetAllOfTypeSwitchEvent, AssetTypesFilterConfig, AttributeNamesSelectEvent} from "../panels/assettypes-panel";
 
 const styling = css`
   .customMwcInputContainer {
@@ -26,7 +26,8 @@ export class TableSettings extends AssetWidgetSettings {
         const config = {
             assets: {
                 enabled: true,
-                multi: true
+                multi: true,
+                allOfTypeOption: true
             },
             attributes: {
                 enabled: true,
@@ -40,7 +41,9 @@ export class TableSettings extends AssetWidgetSettings {
                     <div style="padding-bottom: 12px;">
                         <assettypes-panel .assetType="${this.widgetConfig.assetType}" .config="${config}"
                                           .assetIds="${this.widgetConfig.assetIds}" .attributeNames="${this.widgetConfig.attributeNames}"
+                                          .allOfType="${this.widgetConfig.allOfType}"
                                           @assettype-select="${(ev: AssetTypeSelectEvent) => this.onAssetTypeSelect(ev)}"
+                                          @alloftype-switch="${(ev: AssetAllOfTypeSwitchEvent) => this.onAssetAllOfTypeSwitch(ev)}"
                                           @assetids-select="${(ev: AssetIdsSelectEvent) => this.onAssetIdsSelect(ev)}"
                                           @attributenames-select="${(ev: AttributeNamesSelectEvent) => this.onAttributesSelect(ev)}"
                         ></assettypes-panel>
@@ -69,6 +72,11 @@ export class TableSettings extends AssetWidgetSettings {
         this.notifyConfigUpdate();
     }
 
+    protected onAssetAllOfTypeSwitch(ev: AssetAllOfTypeSwitchEvent) {
+        this.widgetConfig.allOfType = ev.detail as boolean;
+        this.notifyConfigUpdate();
+    }
+
     protected onAssetIdsSelect(ev: AssetIdsSelectEvent) {
         this.widgetConfig.assetIds = ev.detail as string[];
         this.notifyConfigUpdate();

package/src/widgets/map-widget.ts

@@ -38,6 +38,7 @@ export interface MapWidgetConfig extends WidgetConfig {
     max?: number,
     // Asset type related values
     assetType?: string,
+    allOfType?: boolean,
     valueType?: string,
     attributeName?: string,
     assetTypes: AssetDescriptor[],
@@ -56,6 +57,7 @@ function getDefaultWidgetConfig(): MapWidgetConfig {
         thresholds: [[0, "#4caf50"], [75, "#ff9800"], [90, "#ef5350"]],
         assetTypes: [],
         assetType: undefined,
+        allOfType: true,
         assetIds: [],
         attributes: [],
     } as MapWidgetConfig;
@@ -97,13 +99,39 @@ export class MapWidget extends OrAssetWidget {
     }
 
     protected async loadAssets() {
-        if(this.widgetConfig.assetType && this.widgetConfig.attributeName) {
+         if(this.widgetConfig.assetType && this.widgetConfig.attributeName && this.widgetConfig.allOfType) {
             this.fetchAssetsByType([this.widgetConfig.assetType], this.widgetConfig.attributeName).then((assets) => {
                 this.loadedAssets = assets;
             });
-        }
+        } else if(this.widgetConfig.assetType && this.widgetConfig.attributeName && !this.widgetConfig.allOfType) {
+            this.fetchAssetsById([this.widgetConfig.assetType], this.widgetConfig.attributeName, this.widgetConfig.assetIds).then((assets) => {
+                            this.loadedAssets = assets;
+                    });
+          }
     }
 
+    protected async fetchAssetsById(assetTypes: string[], attributeName: string, assetIds: string[]) {
+        let assets: Asset[] = [];
+        await manager.rest.api.AssetResource.queryAssets({
+            realm: {
+                name:manager.displayRealm
+            },
+            select: {
+                attributes: [attributeName, 'location']
+            },
+            types: assetTypes,
+            ids: assetIds,
+
+            }).then(response => {
+                assets = response.data;
+                this.markers = {};
+            }).catch((reason) => {
+                console.error(reason);
+                showSnackbar(undefined, "errorOccurred");
+            });
+            return assets;
+        }
+
     protected async fetchAssetsByType(assetTypes: string[], attributeName: string) {
         let assets: Asset[] = [];
         await manager.rest.api.AssetResource.queryAssets({

package/src/widgets/table-widget.ts

@@ -13,6 +13,7 @@ import "@openremote/or-mwc-components/or-mwc-table";
 
 export interface TableWidgetConfig extends WidgetConfig {
     assetType?: string
+    allOfType?: boolean,
     assetIds: string[]
     attributeNames: string[],
     tableSize: number,
@@ -22,6 +23,7 @@ export interface TableWidgetConfig extends WidgetConfig {
 function getDefaultConfig(): TableWidgetConfig {
     return {
         assetType: undefined,
+        allOfType: true,
         assetIds: [],
         attributeNames: [],
         tableSize: 10,
@@ -80,16 +82,25 @@ export class TableWidget extends OrAssetWidget {
     /* --------------------------------------- */
 
     protected loadAssets() {
-        if(this.widgetConfig.assetIds.find(id => !this.isAssetLoaded(id))) {
-           this.queryAssets({
-               ids: this.widgetConfig.assetIds,
-               select: {
-                   attributes: this.widgetConfig.attributeNames
-               }
-           }).then((assets) => {
-               this.loadedAssets = assets;
-           })
-        }
+        if(this.widgetConfig.allOfType) {
+            this.queryAssets({
+                types: [this.widgetConfig.assetType],
+                select: {
+                    attributes: this.widgetConfig.attributeNames
+                }
+            }).then((assets) => {
+                this.loadedAssets = assets;
+                })
+        } else if(this.widgetConfig.assetIds.find(id => !this.isAssetLoaded(id))) {
+               this.queryAssets({
+                   ids: this.widgetConfig.assetIds,
+                   select: {
+                       attributes: this.widgetConfig.attributeNames
+                   }
+               }).then((assets) => {
+                   this.loadedAssets = assets;
+               })
+            }
     }
 
     protected getColumns(attributeNames: string[]): TableColumn[] {