Skip to content

armgit / core

Public Imported from GitHub
0

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

Bug fix for GWT client JsInterop

Rich Turnerba03665f00c6
diff --git a/client/src/main/webapp/src/or-app/or-app.html b/client/src/main/webapp/src/or-app/or-app.html
index cdbe0c324..ecd30f37d 100644
--- a/client/src/main/webapp/src/or-app/or-app.html
+++ b/client/src/main/webapp/src/or-app/or-app.html
@@ -591,7 +591,7 @@
if (av.metaItemDescriptors) {
metaItemDescriptors = av.metaItemDescriptors.map(mid => {
let access = mid.access ? new Model.MetaItemDescriptorAccess(mid.access.restrictedRead, mid.access.restrictedWrite, mid.access.publicRead) : null;
- let initialValue = mid.initialValue !== undefined && mid.initialValue !== null ? Model.Values.fromAny(mid.initialValue).orElse(null) : null;
+ let initialValue = mid.initialValue !== undefined && mid.initialValue !== null ? Model.Values.parseOrNull(mid.initialValue) : null;
return new Model.MetaItemDescriptor(mid.urn, Model.ValueType.fromString(mid.valueType), access, mid.required, mid.pattern, mid.patternFailureMessage, mid.maxPerAttribute, initialValue, mid.valueFixed);
});
}
diff --git a/model/src/main/java/org/openremote/model/value/Values.java b/model/src/main/java/org/openremote/model/value/Values.java
index 6c34d45fa..c230b7e52 100644
--- a/model/src/main/java/org/openremote/model/value/Values.java
+++ b/model/src/main/java/org/openremote/model/value/Values.java
@@ -58,7 +58,7 @@ public class Values {
return ValueFactoryImpl.INSTANCE;
}
-
+ @JsMethod(namespace = "Model.Values")
public static Value parseOrNull(String jsonString) {
try {
return parse(jsonString).orElse(null);
@@ -71,7 +71,6 @@ public class Values {
return instance().parse(jsonString);
}
- @JsMethod(namespace = "Model.Values")
public static native <T extends Value> Optional<T> fromAny(Any any) /*-{
// TODO This makes a copy which is inefficient, need twice the memory. We need a better JSON API to share with Java and JS.
return @org.openremote.model.value.Values::parse(Ljava/lang/String;)(JSON.stringify(any));