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: Bug fix for unknown meta item descriptors

Rich Turner05308a3f9619
diff --git a/model/src/main/java/org/openremote/model/value/ValueType.java b/model/src/main/java/org/openremote/model/value/ValueType.java
index f80c283c2..95d526b93 100644
--- a/model/src/main/java/org/openremote/model/value/ValueType.java
+++ b/model/src/main/java/org/openremote/model/value/ValueType.java
@@ -19,6 +19,8 @@
*/
package org.openremote.model.value;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.BaseJsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString;
@@ -82,6 +84,8 @@ public final class ValueType {
public static final ValueDescriptor<ObjectNode> JSON_OBJECT = new ValueDescriptor<>("JSONObject", ObjectNode.class);
+ public static final ValueDescriptor<BaseJsonNode> JSON = new ValueDescriptor<>("JSON", BaseJsonNode.class);
+
public static final ValueDescriptor<Integer> POSITIVE_INTEGER = new ValueDescriptor<>("positiveInteger", Integer.class,
new ValueConstraint.Min(0)
);
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 925ff0a89..4cfe28cfd 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -390,34 +390,48 @@ export class AssetModelUtil {
return valueDescriptor;
}
- public static resolveValueDescriptorFromValue(value: any): ValueDescriptor | undefined {
- let valueDescriptor: ValueDescriptor | undefined;
-
+ public static resolveValueTypeFromValue(value: any): string {
if (value === null || value === undefined) {
- return;
+ return WellknownValueTypes.JSON;
}
if (typeof value === "number") {
- valueDescriptor = AssetModelUtil.getValueDescriptor(WellknownValueTypes.NUMBER);
- } else if (typeof value === "string") {
- valueDescriptor = AssetModelUtil.getValueDescriptor(WellknownValueTypes.TEXT);
- } else if (typeof value === "boolean") {
- valueDescriptor = AssetModelUtil.getValueDescriptor(WellknownValueTypes.BOOLEAN);
- } else {
- if (Array.isArray(value)) {
- const v = (value as any[]).find(v => v !== undefined && v !== null);
- const innerValueDescriptor = this.resolveValueDescriptorFromValue(v);
- if (innerValueDescriptor) {
- valueDescriptor = {...innerValueDescriptor, arrayDimensions: 1};
- }
- } else if (value instanceof Date) {
- valueDescriptor = AssetModelUtil.getValueDescriptor(WellknownValueTypes.DATEANDTIME);
- } else {
- valueDescriptor = AssetModelUtil.getValueDescriptor(WellknownValueTypes.JSONOBJECT);
+ return WellknownValueTypes.NUMBER;
+ }
+ if (typeof value === "string") {
+ return WellknownValueTypes.TEXT;
+ }
+ if (typeof value === "boolean") {
+ return WellknownValueTypes.BOOLEAN;
+ }
+ if (Array.isArray(value)) {
+ let dimensions = 1;
+ let v = (value as any[]).find(v => v !== undefined && v !== null);
+
+ while (Array.isArray(v)) {
+ v = (v as any[]).find(v => v !== undefined && v !== null);
+ dimensions++;
}
+
+ let valueType = this.resolveValueTypeFromValue(v);
+
+ while (dimensions > 0) {
+ valueType += "[]";
+ dimensions--;
+ }
+
+ return valueType;
}
+ if (value instanceof Date) {
+ return WellknownValueTypes.DATEANDTIME;
+ } else {
+ return WellknownValueTypes.JSONOBJECT;
+ }
+ }
- return valueDescriptor;
+ public static resolveValueDescriptorFromValue(value: any): ValueDescriptor | undefined {
+ const valueType = AssetModelUtil.resolveValueTypeFromValue(value);
+ return AssetModelUtil.getValueDescriptor(valueType);
}
public static getAttributeAndValueDescriptors(assetType: string | undefined, attributeNameOrDescriptor: string | AttributeDescriptor | undefined, attribute?: Attribute<any>): [AttributeDescriptor | undefined, ValueDescriptor | undefined] {
diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.ts
index b1f15c926..91df65761 100644
--- a/ui/component/core/src/util.ts
+++ b/ui/component/core/src/util.ts
@@ -29,6 +29,7 @@ import Qs from "qs";
import {AssetModelUtil} from "./index";
import moment from "moment";
import DateTimeFormatOptions = Intl.DateTimeFormatOptions;
+import { WellknownValueTypes } from "@openremote/model";
export class Deferred<T> {
@@ -433,13 +434,22 @@ export function getAllowedValueLabel(allowedValue: string, fallback?: string): s
export function getMetaItemNameValueHolder(metaNameOrDescriptor: MetaItemDescriptor | string, value: any): NameValueHolder<any> {
const descriptor = typeof metaNameOrDescriptor === "string" ? AssetModelUtil.getMetaItemDescriptor(metaNameOrDescriptor)! : metaNameOrDescriptor;
+ if (descriptor) {
+ return {
+ name: descriptor.name,
+ type: descriptor.type,
+ value: value
+ };
+ }
+
return {
- name: descriptor.name,
- type: descriptor.type,
+ name: typeof metaNameOrDescriptor,
+ type: AssetModelUtil.resolveValueTypeFromValue(value),
value: value
- };
+ }
}
+
export function getAttributeLabel(attribute: Attribute<any> | undefined, descriptor: AttributeDescriptor | undefined, assetType: string | undefined, showUnits: boolean, fallback?: string): string {
return getValueHolderLabel(attribute, descriptor, assetType, showUnits, true, fallback);
}
@@ -645,7 +655,7 @@ export function mergeObjects(a: object | undefined, b: object | undefined, merge
return {...b};
}
const merged = {...a};
- let path: string[] = [];
+ const path: string[] = [];
Object.entries(b!).forEach(([k, v]) => {
mergeObjectKey(merged, path, k, v,mergeArrays)
});