Skip to content

Commit

Permalink
GWT client bug fixes and updates
Browse files Browse the repository at this point in the history
  • Loading branch information
richturner committed Aug 13, 2019
1 parent c5776bb commit 5fa6f7a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ protected void writeAttributeValue(AssetAttribute attribute) {
.getReference() .getReference()
.map(attributeRef -> { .map(attributeRef -> {
// Clear timestamp and let the server set it // Clear timestamp and let the server set it
attribute.setValueTimestamp(0); attribute.setValueTimestamp(null);
return new AttributeState(attributeRef, attribute.getValue().orElse(null)); return new AttributeState(attributeRef, attribute.getValue().orElse(null));
}) })
.map(attributeState -> new AttributeEvent(attributeState, attribute.getValueTimestamp().orElse(0L))) .map(attributeState -> new AttributeEvent(attributeState, attribute.getValueTimestamp().orElse(0L)))
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public boolean addAttribute(String name, String type) {
attribute.setName(name); attribute.setName(name);


// Tell the server to set the timestamp when saving because we don't want to use browser time // 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); asset.getAttributesList().add(attribute);
writeAttributeToView(attribute, true); writeAttributeToView(attribute, true);
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ public void onValidationStateChange(AttributeValidationResult validationResult)
setError(!validationResult.isValid()); setError(!validationResult.isValid());
setErrorInExtension(validationResult.getMetaFailures() != null && validationResult.getMetaFailures().size() > 0); 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 // Notify extensions
getExtensions().forEach(viewExtension -> viewExtension.onValidationStateChange(validationResult)); getExtensions().forEach(viewExtension -> viewExtension.onValidationStateChange(validationResult));
} }
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@ metaItemDisplayName[urnopenremoteprotocolwriteValue]=Write value
metaItemDisplayName[urnopenremoteprotocolcharset]=Charset metaItemDisplayName[urnopenremoteprotocolcharset]=Charset
metaItemDisplayName[urnopenremoteprotocolconvertBinary]=Convert to/from binary string metaItemDisplayName[urnopenremoteprotocolconvertBinary]=Convert to/from binary string
metaItemDisplayName[urnopenremoteprotocolconvertHex]=Convert to/from HEX string metaItemDisplayName[urnopenremoteprotocolconvertHex]=Convert to/from HEX string
metaItemDisplayName[urnopenremoteprotocolusername]=Username
metaItemDisplayName[urnopenremoteprotocolpassword]=Password
metaItemDisplayName[urnopenremoteprotocoloAuthGrant]=OAuth Grant
metaItemDisplayName[urnopenremoteprotocolmacroaction]=Macro action metaItemDisplayName[urnopenremoteprotocolmacroaction]=Macro action
metaItemDisplayName[urnopenremoteprotocolmacroactionIndex]=Macro action index metaItemDisplayName[urnopenremoteprotocolmacroactionIndex]=Macro action index
metaItemDisplayName[urnopenremoteprotocolvelbustimeInjectionInterval]=VELBUS time injection (s) metaItemDisplayName[urnopenremoteprotocolvelbustimeInjectionInterval]=VELBUS time injection (s)
Expand All @@ -377,12 +380,9 @@ metaItemDisplayName[urnopenremoteprotocoltimeraction]=Timer action
metaItemDisplayName[urnopenremoteprotocoltimercronExpression]=Timer CRON expression metaItemDisplayName[urnopenremoteprotocoltimercronExpression]=Timer CRON expression
metaItemDisplayName[urnopenremoteprotocoltimerlink]=Timer value link metaItemDisplayName[urnopenremoteprotocoltimerlink]=Timer value link
metaItemDisplayName[urnopenremoteprotocolsimulatormode]=Simulator mode metaItemDisplayName[urnopenremoteprotocolsimulatormode]=Simulator mode
metaItemDisplayName[urnopenremoteprotocolsimulator]=Simulator write delay (ms) metaItemDisplayName[urnopenremoteprotocolsimulatordelayMilliseconds]=Simulator write delay (ms)
metaItemDisplayName[urnopenremoteprotocolsimulatorelement]=Simulator element type metaItemDisplayName[urnopenremoteprotocolsimulatorelement]=Simulator element type
metaItemDisplayName[urnopenremoteprotocolhttpClientbaseUri]=HTTP base URI 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[urnopenremoteprotocolhttpClientpingPath]=HTTP ping path
metaItemDisplayName[urnopenremoteprotocolhttpClientpingMethod]=HTTP ping method metaItemDisplayName[urnopenremoteprotocolhttpClientpingMethod]=HTTP ping method
metaItemDisplayName[urnopenremoteprotocolhttpClientpingBody]=HTTP ping body metaItemDisplayName[urnopenremoteprotocolhttpClientpingBody]=HTTP ping body
Expand Down Expand Up @@ -411,6 +411,11 @@ metaItemDisplayName[urnopenremoteprotocoludpClientbindPort]=UDP client bind port
metaItemDisplayName[urnopenremoteprotocoludpClientresponseTimeoutMillis]=Response timeout (ms) metaItemDisplayName[urnopenremoteprotocoludpClientresponseTimeoutMillis]=Response timeout (ms)
metaItemDisplayName[urnopenremoteprotocoludpClientsendRetries]=Send retries metaItemDisplayName[urnopenremoteprotocoludpClientsendRetries]=Send retries
metaItemDisplayName[urnopenremoteprotocoludpClientserverAlwaysResponds]=UDP server always responds 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 attributeLinkConverterValues=Converter values
Expand Down

0 comments on commit 5fa6f7a

Please sign in to comment.