Skip to content

armgit / core

Public Imported from GitHub
0

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

UI updates: Added AssetModelUtil static class to core module

Rich Turner2373c0da7c0b
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptor.java b/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptor.java
index a889d00a8..8f2446ef1 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptor.java
@@ -37,10 +37,13 @@ public interface AttributeValueDescriptor {
@JsonProperty
String getName();
+ @JsonProperty
String getIcon();
+ @JsonProperty
ValueType getValueType();
+ @JsonProperty
MetaItemDescriptor[] getMetaItemDescriptors();
@JsonIgnore
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 149fe65ba..a4cf4d5ed 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -6,6 +6,7 @@ import {AxiosRequestConfig} from "axios";
import {EventProvider, EventProviderStatus, WebSocketEventProvider} from "./event";
import i18next from "i18next";
import i18nextXhr from "i18next-xhr-backend";
+import {AssetDescriptor, AttributeDescriptor, AttributeValueDescriptor, MetaItemDescriptor, Asset} from "@openremote/model/dist";
export enum ORError {
NONE = "NONE",
@@ -61,11 +62,76 @@ export interface ManagerConfig {
eventProviderType?: EventProviderType;
pollingIntervalMillis?: number;
loadIcons?: boolean;
+ loadDescriptors?: boolean;
loadTranslations?: string[];
translationsLoadPath?: string;
configureTranslationsOptions?: (i18next: i18next.InitOptions) => void;
}
+export class AssetModelUtil {
+
+ public static _assetDescriptors: AssetDescriptor[] = [];
+ public static _attributeDescriptors: AttributeDescriptor[] = [];
+ public static _attributeValueDescriptors: AttributeValueDescriptor[] = [];
+ public static _metaItemDescriptors: MetaItemDescriptor[] = [];
+
+ public static getAssetDescriptors(): AssetDescriptor[] {
+ return this._assetDescriptors;
+ }
+
+ public static getAttributeDescriptors(): AttributeDescriptor[] {
+ return this._attributeDescriptors;
+ }
+
+ public static getAttributeValueDescriptors(): AttributeValueDescriptor[] {
+ return this._attributeValueDescriptors;
+ }
+
+ public static getMetaItemDescriptors(): MetaItemDescriptor[] {
+ return this._metaItemDescriptors;
+ }
+
+ public static getAssetDescriptor(type?: string): AssetDescriptor | undefined {
+ if (!type) {
+ return;
+ }
+
+ return this._assetDescriptors.find((assetDescriptor) => {
+ return assetDescriptor.type === type;
+ });
+ }
+
+ public static getAttributeDescriptor(attributeName?: string): AttributeDescriptor | undefined {
+ if (!attributeName) {
+ return;
+ }
+
+ return this._attributeDescriptors.find((attributeDescriptor) => {
+ return attributeDescriptor.attributeName === attributeName;
+ });
+ }
+
+ public static getAttributeValueDescriptor(name?: string): AttributeValueDescriptor | undefined {
+ if (!name) {
+ return;
+ }
+
+ return this._attributeValueDescriptors.find((attributeValueDescriptor) => {
+ return attributeValueDescriptor.name === name;
+ });
+ }
+
+ public static getMetaItemDescriptor(urn?: string): MetaItemDescriptor | undefined {
+ if (!urn) {
+ return;
+ }
+
+ return this._metaItemDescriptors.find((metaItemDescriptor) => {
+ return metaItemDescriptor.urn === urn;
+ });
+ }
+}
+
export type EventCallback = (event: OREvent) => any;
export class Manager {
@@ -177,6 +243,10 @@ export class Manager {
normalisedConfig.translationsLoadPath = "locales/{{lng}}/{{ns}}.json";
}
+ if (normalisedConfig.loadDescriptors === undefined) {
+ normalisedConfig.loadDescriptors = true;
+ }
+
return normalisedConfig;
}
@@ -234,15 +304,19 @@ export class Manager {
}
if (success) {
- success = await this.doTranslateInit();
+ success = this.doRestApiInit();
}
if (success) {
- success = this.doRestApiInit();
+ success = await this.doConsoleInit();
}
if (success) {
- success = await this.doConsoleInit();
+ success = await this.doTranslateInit();
+ }
+
+ if (success) {
+ success = await this.doDescriptorsInit();
}
// TODO: Reinstate this once websocket supports anonymous connections
@@ -333,6 +407,28 @@ export class Manager {
return true;
}
+ protected async doDescriptorsInit(): Promise<boolean> {
+ if (!this.config.loadDescriptors) {
+ return true;
+ }
+
+ try {
+ const assetDescriptorResponse = await rest.api.AssetModelResource.getAssetDescriptors();
+ const attributeDescriptorResponse = await rest.api.AssetModelResource.getAttributeDescriptors();
+ const attributeValueDescriptorResponse = await rest.api.AssetModelResource.getAttributeValueDescriptors();
+ const metaItemDescriptorResponse = await rest.api.AssetModelResource.getMetaItemDescriptors();
+
+ AssetModelUtil._assetDescriptors = assetDescriptorResponse.data;
+ AssetModelUtil._attributeDescriptors = attributeDescriptorResponse.data;
+ AssetModelUtil._attributeValueDescriptors = attributeValueDescriptorResponse.data;
+ AssetModelUtil._metaItemDescriptors = metaItemDescriptorResponse.data;
+ } catch (e) {
+ console.error(e);
+ return false;
+ }
+ return true;
+ }
+
protected async doAuthInit(): Promise<boolean> {
let success = true;
switch (this._config.auth) {
diff --git a/ui/demo/demo-core/src/index.ts b/ui/demo/demo-core/src/index.ts
index 1326913fe..1e9df4158 100644
--- a/ui/demo/demo-core/src/index.ts
+++ b/ui/demo/demo-core/src/index.ts
@@ -1,13 +1,15 @@
import {html, render} from "lit-html";
import {when} from "lit-html/directives/when";
import openremote, {Auth, Manager, OREvent} from "@openremote/core";
+import {AssetModelUtil} from "@openremote/core";
+
import "@openremote/or-icon";
import "@openremote/or-translate";
import {IconSets} from "@openremote/or-icon";
import {IconSetSvg} from "@openremote/or-icon/dist/icon-set-svg";
import i18next from "i18next";
-import {AttributeEvent} from "@openremote/model";
+import {AttributeEvent, MetaItemType} from "@openremote/model";
import {getApartment1Asset} from "./util";
@@ -40,6 +42,11 @@ let mainTemplate = (openremote: Manager) => html`
<p><b>Icon Example (OR icon set): </b><or-icon icon="or:logo"></or-icon><or-icon icon="or:logo-plain"></or-icon><or-icon style="fill: #C4D600;" icon="or:marker"></or-icon></p>
<p><b>Icon Example (dynamic Set click to add): </b><button @click="${() => createIconSet()}">Load</button>: <or-icon icon="test:x"></or-icon></p>
<p><b>Translation Example: </b> <or-translate value="temperature"></or-translate> <button @click="${() => toggleLanguage()}">${i18next.language}</button></p>
+<p><b>Asset Descriptors: </b>${JSON.stringify(AssetModelUtil.getAssetDescriptors())}</p>
+<p><b>Attribute Descriptors: </b>${JSON.stringify(AssetModelUtil.getAttributeDescriptors())}</p>
+<p><b>Attribute Value Descriptors: </b>${JSON.stringify(AssetModelUtil.getAttributeValueDescriptors())}</p>
+<p><b>Meta Item Descriptors: </b>${JSON.stringify(AssetModelUtil.getMetaItemDescriptors())}</p>
+<p><b>Rule State Meta Item </b>${JSON.stringify(AssetModelUtil.getMetaItemDescriptor(MetaItemType.RULE_STATE.urn))}</p>
`;
let assetTemplate = (alarmEnabled: boolean) => html `
@@ -91,6 +98,8 @@ openremote.addListener((event: OREvent) => {
case OREvent.READY:
if (openremote.authenticated) {
initApartment1Asset().then(refreshUI);
+ } else {
+ refreshUI();
}
break;
default:
@@ -103,6 +112,9 @@ openremote.init({
keycloakUrl: "http://localhost:8080/auth",
auth: Auth.KEYCLOAK,
autoLogin: false,
- realm: "tenantA"
+ realm: "tenantA",
+ configureTranslationsOptions: (options) => {
+ options.lng = "nl"; // Change initial language to dutch
+ }
})
;