Skip to content

armgit / core

Public Imported from GitHub
0

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

Updates for GWT manager asset editor

Rich Turneraf34f4f8332c
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientProtocol.java
index a80b4d60a..035c4ea21 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientProtocol.java
@@ -237,7 +237,10 @@ public class UdpClientProtocol extends AbstractProtocol {
* Indicates whether the server replies to each packet not just polling requests (need this to successfully match
* request and response packets)
*/
- public static final MetaItemDescriptor META_SERVER_ALWAYS_RESPONDS = metaItemFixedBoolean(PROTOCOL_NAMESPACE + ":serverAlwaysResponds", ACCESS_PRIVATE, false);
+ public static final MetaItemDescriptor META_SERVER_ALWAYS_RESPONDS = metaItemFixedBoolean(
+ PROTOCOL_NAME+ ":serverAlwaysResponds",
+ ACCESS_PRIVATE,
+ false);
/**
* Indicates how long to wait for a response from the server before re-attempting {@link #META_SEND_RETRIES} times
@@ -305,6 +308,15 @@ public class UdpClientProtocol extends AbstractProtocol {
return ATTRIBUTE_META_ITEM_DESCRIPTORS;
}
+ @Override
+ public AssetAttribute getProtocolConfigurationTemplate() {
+ return super.getProtocolConfigurationTemplate()
+ .addMeta(
+ new MetaItem(META_PROTOCOL_HOST, null),
+ new MetaItem(META_PROTOCOL_PORT, null)
+ );
+ }
+
@Override
protected void doLinkProtocolConfiguration(AssetAttribute protocolConfiguration) {
diff --git a/client/src/main/java/org/openremote/app/client/widget/ValueEditors.java b/client/src/main/java/org/openremote/app/client/widget/ValueEditors.java
index 61f838da0..4e33194c0 100644
--- a/client/src/main/java/org/openremote/app/client/widget/ValueEditors.java
+++ b/client/src/main/java/org/openremote/app/client/widget/ValueEditors.java
@@ -66,6 +66,15 @@ public final class ValueEditors {
ManagerMessages managerMessages) {
switch(valueType) {
+ case ANY:
+ return createAnyEditor(
+ currentValue,
+ onValueModified,
+ timestamp,
+ readOnly,
+ widgetStyle,
+ managerMessages
+ );
case OBJECT:
ObjectValue currentValueObj = Values.getObject(currentValue).orElse(null);
@@ -191,6 +200,30 @@ public final class ValueEditors {
return panel;
}
+ public static IsWidget createAnyEditor(Value currentValue,
+ Consumer<Value> onValueModified,
+ Optional<Long> timestamp,
+ boolean readOnly,
+ WidgetStyle widgetStyle,
+ ManagerMessages managerMessages) {
+
+ Consumer<Value> updateConsumer = readOnly ? null : onValueModified::accept;
+
+ FlowPanel panel = new FlowPanel();
+ panel.setStyleName("flex layout horizontal center or-ValueEditor or-ObjectValueEditor");
+ String label = managerMessages.jsonObject();
+ String title = managerMessages.edit() + " " + managerMessages.jsonObject();
+ IsWidget widget = createJsonEditorWidget(
+ new JsonEditor(title, widgetStyle, managerMessages), readOnly, label, currentValue, updateConsumer
+ );
+ FlowPanel widgetWrapper = new FlowPanel();
+ widgetWrapper.setStyleName("flex layout horizontal center");
+ widgetWrapper.add(widget);
+ panel.add(widgetWrapper);
+ timestamp.ifPresent(time -> addTimestampLabel(time, panel));
+ return panel;
+ }
+
public static IsWidget createObjectEditor(ObjectValue currentValue,
Consumer<ObjectValue> onValueModified,
Optional<Long> timestamp,
diff --git a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
index ead12fa93..ed0607a07 100644
--- a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
+++ b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
@@ -405,6 +405,14 @@ metaItemDisplayName[urnopenremoteprotocolcontrollerClientcommandDeviceName]=Cont
metaItemDisplayName[urnopenremoteprotocolcontrollerClientcommandName]=Controller command name
metaItemDisplayName[urnopenremoteprotocolcontrollerClientcommandsMap]=Controller commands map
metaItemDisplayName[urnopenremoteprotocolcontrollerClientbaseUri]=Controller base URI
+metaItemDisplayName[urnopenremoteprotocoludpClienthost]=UDP server hostname/IP
+metaItemDisplayName[urnopenremoteprotocoludpClientport]=UDP server port
+metaItemDisplayName[urnopenremoteprotocoludpClientbindPort]=UDP Client bind port
+metaItemDisplayName[urnopenremoteprotocoludpClientresponseTimeoutMillis]=Response timeout (ms)
+metaItemDisplayName[urnopenremoteprotocoludpClientsendRetries]=No. of Retries
+metaItemDisplayName[urnopenremoteprotocoludpClientserverAlwaysResponds]=UDP server always responds
+
+
attributeLinkConverterValues=Converter values
attributeLinkNewConverterValue=New converter value
enterConverterValue=Enter converter value
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItem.java b/model/src/main/java/org/openremote/model/attribute/MetaItem.java
index d2e7d9e36..8a0c7e4a1 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItem.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItem.java
@@ -26,6 +26,7 @@ import org.openremote.model.ValidationFailure;
import org.openremote.model.util.TextUtil;
import org.openremote.model.value.ObjectValue;
import org.openremote.model.value.Value;
+import org.openremote.model.value.ValueType;
import org.openremote.model.value.Values;
import java.util.Collection;
@@ -117,7 +118,7 @@ public class MetaItem extends AbstractValueHolder {
);
}
- if (getValue().map(Value::getType).map(type -> descriptor.getValueType() != null && descriptor.getValueType() != type).orElse(true)) {
+ if (getValue().map(Value::getType).map(type -> descriptor.getValueType() != null && descriptor.getValueType() != ValueType.ANY && descriptor.getValueType() != type).orElse(true)) {
failures.add(new ValidationFailure(META_ITEM_VALUE_MISMATCH, descriptor.getValueType() != null ? descriptor.getValueType().name() : null));
return true;
}