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: or-asset-viewer improvements
Rich Turnere0d9f650d210
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 9052bcd85..e9fd23a96 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -249,5 +249,6 @@"EUR_PER_MONTH": "€/month","GBP_PER_KILOWATT_HOUR": "£/kWh","GBP_PER_MONTH": "£/month"- }+ },+ "noChildAssets": "No child assets"}diff --git a/ui/app/main/webpack.config.js b/ui/app/main/webpack.config.jsindex df1b92bc3..189be51b6 100644--- a/ui/app/main/webpack.config.js+++ b/ui/app/main/webpack.config.js@@ -87,10 +87,10 @@ module.exports = (env, argv) => {to: "modules/@webcomponents/webcomponentsjs",ignore: "!*.js"},- {- from: path.join(path.dirname(require.resolve("@openremote/or-app/package.json")), "locales"),- to: "locales"- },+ // {+ // from: path.join(path.dirname(require.resolve("@openremote/or-app/package.json")), "locales"),+ // to: "locales"+ // },{from: "./images",to: "images"diff --git a/ui/app/or-app/locales/en/app.json b/ui/app/or-app/locales/en/app.jsondeleted file mode 100644index 69099d324..000000000--- a/ui/app/or-app/locales/en/app.json+++ /dev/null@@ -1,14 +0,0 @@-{- "userFlushSeconds": "User flush (s)",- "smartFlushSeconds": "Smart flush (s)",- "idleTimeoutMinutes": "Idle timeout (mins)",- "maxTemperatureLimit": "Max temp limit (C)",- "flushPeriod": "Flush period",- "startHour": "Start hour",- "endHour": "End hour",- "disablePeriod": "Disable period",- "startQuarter": "Start quarter",- "endQuarter": "End quarter",- "config": "Config",- "flush": "Flush"-}\ No newline at end of filediff --git a/ui/app/or-app/locales/nl/app.json b/ui/app/or-app/locales/nl/app.jsondeleted file mode 100644index 7c19b44d6..000000000--- a/ui/app/or-app/locales/nl/app.json+++ /dev/null@@ -1,132 +0,0 @@-{- "scenario": "Scenario",- "colorRGBW": "Kleur RGBW",- "groupNumber": "Groep nummer",- "lightStatus": "Status",- "lightDimLevel": "Dim niveau (%)",- "nO2": "NO2 (µg/m3)",- "ozon": "Ozon",- "relHumidity": "Relatieve vochtigheid (%)",- "Temperature": "Temperatuur (oC)",- "particlesPM1": "Fijnstof PM1 (µg/m3)",- "particlesPM10": "Fijnstof PM10 (µg/m3)",- "particlesPM2_5": "Fijnstof PM2.5 (µg/m3)",- "peopleCountIn": "Aantal mensen in",- "peopleCountOut": "Aantal mensen uit",- "peopleCountTotal": "Totaal aantal mensen",- "peopleCountGrowth": "Toename aantal mensen",- "peopleCountInMinute": "Aantal mensen in (/min)",- "peopleCountOutMinute": "Aantal mensen uit (/min)",- "city": "Stad",- "street": "Straat",- "country": "Land",- "postalCode": "Postcode",- "microphoneLevel": "Geluidsniveau",- "allLightsOffSwitch": "Status alle lichten",- "dayScene": "Scene Dag",- "nightScene": "Scene Nacht",- "alarmEnabled": "Alarm status",- "eveningScene": "Scene Avond",- "morningScene": "Scene Ochtend",- "vacationUntil": "Op vakantie tot",- "ventilationAuto": "Ventilatie auto",- "enableSceneTimer": "Scene timer aan",- "presenceDetected": "Aanwezigheid waargenomen",- "ventilationLevel": "Ventilatie niveau (%)",- "disableSceneTimer": "Scene timer uit",- "lastExecutedScene": "Laatste scene",- "sceneTimerEnabled": "Scene timer status",- "daySceneTimeFRIDAY": "Scene Dag starttijd vrijdag",- "daySceneTimeMONDAY": "Scene Dag starttijd maandag",- "daySceneTimeSUNDAY": "Scene Dag starttijd zondag",- "daySceneTimeTUESDAY": "Scene Dag starttijd dinsdag",- "daySceneAlarmEnabled": "Scene Dag alarm status",- "daySceneTimeSATURDAY": "Scene Dag starttijd zaterdag",- "daySceneTimeTHURSDAY": "Scene Dag starttijd donderdag",- "nightSceneTimeFRIDAY": "Scene Nacht starttijd vrijdag",- "nightSceneTimeMONDAY": "Scene Nacht starttijd maandag",- "nightSceneTimeSUNDAY": "Scene Nacht starttijd zondag",- "daySceneEnabledFRIDAY": "Scene Dag status vrijdag",- "daySceneEnabledMONDAY": "Scene Dag status maandag",- "daySceneEnabledSUNDAY": "Scene Dag status zondag",- "daySceneTimeWEDNESDAY": "Scene Dag starttijd woensdag",- "nightSceneTimeTUESDAY": "Scene Nacht starttijd dinsdag",- "daySceneEnabledTUESDAY": "Scene Dag status dinsdag",- "eveningSceneTimeFRIDAY": "Scene Avond starttijd vrijdag",- "eveningSceneTimeMONDAY": "Scene Avond starttijd maandag",- "eveningSceneTimeSUNDAY": "Scene Avond starttijd zondag",- "morningSceneTimeFRIDAY": "Scene Ochtend starttijd vrijdag",- "morningSceneTimeMONDAY": "Scene Ochtend starttijd maandag",- "morningSceneTimeSUNDAY": "Scene Ochtend starttijd zondag",- "nightSceneAlarmEnabled": "Scene Nacht alarm status",- "nightSceneTimeSATURDAY": "Scene Nacht starttijd zaterdag",- "nightSceneTimeTHURSDAY": "Scene Nacht starttijd donderdag",- "daySceneEnabledSATURDAY": "Scene Dag status zaterdag",- "daySceneEnabledTHURSDAY": "Scene Dag status donderdag",- "eveningSceneTimeTUESDAY": "Scene Avond starttijd dinsdag",- "morningSceneTimeTUESDAY": "Scene Ochtend starttijd dinsdag",- "nightSceneEnabledFRIDAY": "Scene Nacht status vrijdag",- "nightSceneEnabledMONDAY": "Scene Nacht status maandag",- "nightSceneEnabledSUNDAY": "Scene Nacht status zondag",- "nightSceneTimeWEDNESDAY": "Scene Nacht starttijd woensdag",- "daySceneEnabledWEDNESDAY": "Scene Dag status woensdag",- "eveningSceneAlarmEnabled": "Scene Avond alarm status",- "eveningSceneTimeSATURDAY": "Scene Avond starttijd zaterdag",- "eveningSceneTimeTHURSDAY": "Scene Avond starttijd donderdag",- "morningSceneAlarmEnabled": "Scene Ochtend alarm status",- "morningSceneTimeSATURDAY": "Scene Ochtend starttijd zaterdag",- "morningSceneTimeTHURSDAY": "Scene Ochtend starttijd donderdag",- "nightSceneEnabledTUESDAY": "Scene Nacht status dinsdag",- "daySceneTargetTemperature": "Scene Ochtend temperatuur",- "eveningSceneEnabledFRIDAY": "Scene Avond status vrijdag",- "eveningSceneEnabledMONDAY": "Scene Avond status maandag",- "eveningSceneEnabledSUNDAY": "Scene Avond status zondag",- "eveningSceneTimeWEDNESDAY": "Scene Avond starttijd woensdag",- "morningSceneEnabledFRIDAY": "Scene Ochtend status vrijdag",- "morningSceneEnabledMONDAY": "Scene Ochtend status maandag",- "morningSceneEnabledSUNDAY": "Scene Ochtend status zondag",- "morningSceneTimeWEDNESDAY": "Scene Ochtend starttijd woensdag",- "nightSceneEnabledSATURDAY": "Scene Nacht status zaterdag",- "nightSceneEnabledTHURSDAY": "Scene Nacht status donderdag",- "eveningSceneEnabledTUESDAY": "Scene Avond status dinsdag",- "morningSceneEnabledTUESDAY": "Scene Ochtend status dinsdag",- "nightSceneEnabledWEDNESDAY": "Scene Nacht status woensdag",- "eveningSceneEnabledSATURDAY": "Scene Avond status zaterdag",- "eveningSceneEnabledTHURSDAY": "Scene Avond status donderdag",- "morningSceneEnabledSATURDAY": "Scene Ochtend status zaterdag",- "morningSceneEnabledTHURSDAY": "Scene Ochtend status donderdag",- "nightSceneTargetTemperature": "Scene Nacht temperatuur",- "eveningSceneEnabledWEDNESDAY": "Scene Avond status woensdag",- "morningSceneEnabledWEDNESDAY": "Scene Ochtend status woensdag",- "eveningSceneTargetTemperature": "Scene Avond temperatuur",- "morningSceneTargetTemperature": "Scene Ochtend temperatuur",- "lights": "Lampen",- "motionSensor": "Bewegingssensor",- "lastPresenceDetected": "Laatste aanwezigheid",- "firstPresenceDetected": "Eerste aanwezigheid",- "co2Level": "CO2 (µg/m3)",- "humidity": "Vochtigheid (%)",- "targetTemperature": "Ingestelde temperatuur",- "currentTemperature": "Huidige temperatuur",- "lightsCeiling": "Plafond lamp",- "smartSwitchModeA": "Slimme schakelaar A",- "smartSwitchModeB": "Slimme schakelaar B",- "smartSwitchModeC": "Slimme schakelaar C",- "smartSwitchEnabledA": "Schakelaar A status",- "smartSwitchEnabledB": "Schakelaar B status",- "smartSwitchEnabledC": "Schakelaar C status",- "smartSwitchBeginEndA": "Schakelaar A start-stop",- "smartSwitchBeginEndB": "Schakelaar B start-stop",- "smartSwitchBeginEndC": "Schakelaar C start-stop",- "smartSwitchStopTimeA": "Schakelaar A stoptijd",- "smartSwitchStopTimeB": "Schakelaar B stoptijd",- "smartSwitchStopTimeC": "Schakelaar C stoptijd",- "smartSwitchStartTimeA": "Schakelaar A starttijd",- "smartSwitchStartTimeB": "Schakelaar B starttijd",- "smartSwitchStartTimeC": "Schakelaar C starttijd",- "plantsWaterLevels": "Plant waterniveau",- "lightSwitch": "Licht schakelaar",- "windowOpen": "Raam open",- "lightSwitchTriggerTimes": "Lichtschakelaar tijden",- "lightsStand": "Staande lamp"-}diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 950fad356..0900e1e64 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -644,8 +644,8 @@ export class Manager implements EventProviderFactory {ns: this.config.loadTranslations,interpolation: {format: function(value, format, lng) {- if (format === 'uppercase') return value.toUpperCase();- if(value instanceof Date) {+ if (format === "uppercase") return value.toUpperCase();+ if (value instanceof Date) {return moment(value).format(format);}return value;diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.tsindex c0fb84142..e0279cef1 100644--- a/ui/component/core/src/util.ts+++ b/ui/component/core/src/util.ts@@ -273,11 +273,10 @@ export function getAttributeValue(attribute: Attribute, descriptor: AttributeDes}const format = getMetaValue(MetaItemType.FORMAT, attribute , undefined);const valueType = attribute.type;- if(format){- return i18next.t(format, { postProcess: 'sprintf', sprintf: [attribute.value] });- }- else if(attribute.value) {- return i18next.t(["attributeValueType."+valueType, fallbackFormat || "%s"], { postProcess: 'sprintf', sprintf: [attribute.value] });+ if (format) {+ return i18next.t(format, { postProcess: "sprintf", sprintf: [attribute.value] });+ } else if (attribute.value) {+ return i18next.t(["attributeValueType." + valueType, fallbackFormat || "%s"], { postProcess: "sprintf", sprintf: [attribute.value] });} else {return attribute.value;}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 3c38d34fd..c6634cb87 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -31,6 +31,8 @@ import i18next from "i18next";import {styleMap} from "lit-html/directives/style-map";import {classMap} from "lit-html/directives/class-map";import {DialogAction, OrMwcDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import { GenericAxiosResponse } from "axios";+import { OrIcon } from "@openremote/or-icon";export type PanelType = "property" | "location" | "attribute" | "history" | "chart" | "group";@@ -391,19 +393,22 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: Assconst loadingMsg: OrTranslate = hostElement.shadowRoot!.getElementById(panelName + "-attribute-table-msg") as OrTranslate;const attributeTable: OrTable = hostElement.shadowRoot!.getElementById(panelName + "-attribute-table") as OrTable;+ const addRemoveButton: OrIcon = hostElement.shadowRoot!.getElementById(panelName + "-add-remove-columns") as OrIcon;- if (!loadingMsg || !attributeTable) {+ if (!loadingMsg || !attributeTable || !addRemoveButton) {return;}if (selectedAttributes.length === 0 || !childAssets || childAssets.length === 0) {- loadingMsg.value = "noData";+ loadingMsg.value = "noChildAssets";loadingMsg.hidden = false;attributeTable.hidden = true;+ addRemoveButton.classList.remove("active");return;}// Update table properties which will cause a re-render+ addRemoveButton.classList.add("active");loadingMsg.hidden = true;attributeTable.hidden = false;const headers = [...selectedAttributes].sort();@@ -430,20 +435,24 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: Ass// Define the DOM content for this panelcontent = html`<style>- #asset-group-add-remove-columns {+ .asset-group-add-remove-button {position: absolute;top: 20px;right: var(--internal-or-asset-viewer-panel-padding);+ opacity: 0.5;+ }+ .asset-group-add-remove-button.active {cursor: pointer;+ opacity: 1;}</style>- <or-icon id="asset-group-add-remove-columns" icon="pencil" @click="${() => attributePickerModalOpen()}"></or-icon>+ <or-icon class="asset-group-add-remove-button" .id="${panelName}-add-remove-columns" icon="pencil" @click="${() => attributePickerModalOpen()}"></or-icon><or-table hidden .id="${panelName}-attribute-table" .options="{stickyFirstColumn:true}"></or-table><span><or-translate id="${panelName}-attribute-table-msg" value="loading"></or-translate></span><or-mwc-dialog id="${panelName}-attribute-modal" dialogTitle="addRemoveAttributes" .dialogActions="${attributePickerModalActions}"></or-mwc-dialog>`;} else {- if(attrs.length === 0) {+ if (attrs.length === 0) {return undefined;}@@ -482,17 +491,24 @@ export function getField(name: string, isProperty: boolean, styles: { [style: st}async function getAssetChildren(id: string, childAssetType: string): Promise<Asset[]> {- const response = await manager.rest.api.AssetResource.queryAssets({- select: {- excludePath: true,- excludeParentInfo: true- },- parents: [- {- id: id- }- ]- });+ let response: GenericAxiosResponse<Asset[]>;++ try {+ response = await manager.rest.api.AssetResource.queryAssets({+ select: {+ excludePath: true,+ excludeParentInfo: true+ },+ parents: [+ {+ id: id+ }+ ]+ });+ } catch (e) {+ console.log("Failed to get child assets: " + e);+ return [];+ }if (response.status !== 200 || !response.data) {return [];diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex d2e8953e3..eae2656d2 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -30,7 +30,6 @@ import {JSONPath} from "jsonpath-plus";import moment from "moment";import {styleMap} from "lit-html/directives/style-map";-export class OrAttributeHistoryEvent extends CustomEvent<OrAttributeHistoryEventDetail> {public static readonly NAME = "or-attribute-history-event";@@ -58,7 +57,6 @@ declare global {}}-export type TableColumnType = "timestamp" | "prop";export interface TableColumnConfig {@@ -87,7 +85,7 @@ export interface TableConfig {attributeNames?: {[attributeName: string]: AssetTableConfig};attributeValueTypes?: {[attributeValueType: string]: AssetTableConfig};};- },+ };attributeNames?: {[attributeName: string]: AssetTableConfig};attributeValueTypes?: {[attributeValueType: string]: AssetTableConfig};}