Skip to content

armgit / core

Public Imported from GitHub
0

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

GWT client bug fixes and updates

Rich Turner5fa6f7a94983
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AbstractAssetActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AbstractAssetActivity.java
index 6e9c4fa89..eb6ddf00d 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AbstractAssetActivity.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AbstractAssetActivity.java
@@ -299,7 +299,7 @@ public abstract class AbstractAssetActivity<V
.getReference()
.map(attributeRef -> {
// Clear timestamp and let the server set it
- attribute.setValueTimestamp(0);
+ attribute.setValueTimestamp(null);
return new AttributeState(attributeRef, attribute.getValue().orElse(null));
})
.map(attributeState -> new AttributeEvent(attributeState, attribute.getValueTimestamp().orElse(0L)))
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
index 26fab1e09..55f9e1021 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
@@ -259,7 +259,7 @@ public class AssetEditActivity
attribute.setName(name);
// Tell the server to set the timestamp when saving because we don't want to use browser time
- attribute.setValueTimestamp(0);
+ attribute.setValueTimestamp(null);
asset.getAttributesList().add(attribute);
writeAttributeToView(attribute, true);
diff --git a/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java b/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
index 511371656..fdf2729ff 100644
--- a/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
+++ b/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
@@ -138,6 +138,12 @@ public class AttributeViewImpl extends FormGroup implements AttributeView {
setError(!validationResult.isValid());
setErrorInExtension(validationResult.getMetaFailures() != null && validationResult.getMetaFailures().size() > 0);
+ if (validationResult.hasAttributeFailures() && validationErrorConsumer != null) {
+ validationResult.getAttributeFailures().forEach(validationFailure ->
+ validationErrorConsumer.accept(this.attribute.getName().orElse(null), null, validationFailure)
+ );
+ }
+
// Notify extensions
getExtensions().forEach(viewExtension -> viewExtension.onValidationStateChange(validationResult));
}
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 6ff162f95..edee5453e 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
@@ -355,6 +355,9 @@ metaItemDisplayName[urnopenremoteprotocolwriteValue]=Write value
metaItemDisplayName[urnopenremoteprotocolcharset]=Charset
metaItemDisplayName[urnopenremoteprotocolconvertBinary]=Convert to/from binary string
metaItemDisplayName[urnopenremoteprotocolconvertHex]=Convert to/from HEX string
+metaItemDisplayName[urnopenremoteprotocolusername]=Username
+metaItemDisplayName[urnopenremoteprotocolpassword]=Password
+metaItemDisplayName[urnopenremoteprotocoloAuthGrant]=OAuth Grant
metaItemDisplayName[urnopenremoteprotocolmacroaction]=Macro action
metaItemDisplayName[urnopenremoteprotocolmacroactionIndex]=Macro action index
metaItemDisplayName[urnopenremoteprotocolvelbustimeInjectionInterval]=VELBUS time injection (s)
@@ -377,12 +380,9 @@ metaItemDisplayName[urnopenremoteprotocoltimeraction]=Timer action
metaItemDisplayName[urnopenremoteprotocoltimercronExpression]=Timer CRON expression
metaItemDisplayName[urnopenremoteprotocoltimerlink]=Timer value link
metaItemDisplayName[urnopenremoteprotocolsimulatormode]=Simulator mode
-metaItemDisplayName[urnopenremoteprotocolsimulator]=Simulator write delay (ms)
+metaItemDisplayName[urnopenremoteprotocolsimulatordelayMilliseconds]=Simulator write delay (ms)
metaItemDisplayName[urnopenremoteprotocolsimulatorelement]=Simulator element type
metaItemDisplayName[urnopenremoteprotocolhttpClientbaseUri]=HTTP base URI
-metaItemDisplayName[urnopenremoteprotocolhttpClientusername]=HTTP basic auth username
-metaItemDisplayName[urnopenremoteprotocolhttpClientpassword]=HTTP basic auth password
-metaItemDisplayName[urnopenremoteprotocolhttpClientoAuthGrant]=HTTP OAuth
metaItemDisplayName[urnopenremoteprotocolhttpClientpingPath]=HTTP ping path
metaItemDisplayName[urnopenremoteprotocolhttpClientpingMethod]=HTTP ping method
metaItemDisplayName[urnopenremoteprotocolhttpClientpingBody]=HTTP ping body
@@ -411,6 +411,11 @@ metaItemDisplayName[urnopenremoteprotocoludpClientbindPort]=UDP client bind port
metaItemDisplayName[urnopenremoteprotocoludpClientresponseTimeoutMillis]=Response timeout (ms)
metaItemDisplayName[urnopenremoteprotocoludpClientsendRetries]=Send retries
metaItemDisplayName[urnopenremoteprotocoludpClientserverAlwaysResponds]=UDP server always responds
+metaItemDisplayName[urnopenremoteprotocolwebsocketClienturi]=Endpoint URI
+metaItemDisplayName[urnopenremoteprotocolwebsocketClientheaders]=Connect Headers
+metaItemDisplayName[urnopenremoteprotocolwebsocketClientsubscriptions]=Subscriptions
+metaItemDisplayName[urnopenremoteprotocolwebsocketClientmessageMatchFilters]=Message match filters
+metaItemDisplayName[urnopenremoteprotocolwebsocketClientmessageMatchPredicate]=Message match predicate
attributeLinkConverterValues=Converter values