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: Added RULE_RESET_IMMEDIATE MetaItemType and bug fix for or-mwc-input select input

Rich Turner5cf4a707cefc
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 04206710b..5f304dffd 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -38,6 +38,7 @@ import org.openremote.model.rules.*;
import org.openremote.model.rules.json.*;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.TimeUtil;
+import org.openremote.model.value.MetaItemType;
import org.openremote.model.value.Values;
import org.quartz.CronExpression;
@@ -263,7 +264,19 @@ public class JsonRulesBuilder extends RulesBuilder {
// Remove previous matches where the asset state no longer matches
previouslyMatchedAssetStates.removeIf(previousAssetState -> {
- boolean noLongerMatches = !matchedAssetStates.contains(previousAssetState);
+ Optional<AssetState<?>> matched = matchedAssetStates.stream()
+ .filter(matchedAssetState -> Objects.equals(previousAssetState, matchedAssetState))
+ .findFirst();
+
+ boolean noLongerMatches = !matched.isPresent();
+
+ if (!noLongerMatches) {
+ noLongerMatches = matched.map(matchedAssetState -> {
+ // If reset immediate meta item is set then remove previous state if timestamp is greater
+ boolean resetImmediately = matchedAssetState.getMeta().getValue(MetaItemType.RULE_RESET_IMMEDIATE).orElse(false);
+ return resetImmediately && matchedAssetState.getTimestamp() > previousAssetState.getTimestamp();
+ }).orElse(false);
+ }
if (noLongerMatches) {
log(Level.FINER, "Rule trigger previously matched asset state no longer matches so resetting: " + previousAssetState);
@@ -432,7 +445,7 @@ public class JsonRulesBuilder extends RulesBuilder {
thenMatchedAssetIds.addAll(ruleConditionGroup.getItems().stream()
.map(ruleCondition -> conditionStateMap.get(ruleCondition.tag))
.filter(ruleConditionState -> ruleConditionState.lastEvaluationResult != null && ruleConditionState.lastEvaluationResult.matches)
- .map(RuleConditionState::getMatchedAssetIds)//Get all unmatched assetIds
+ .map(RuleConditionState::getMatchedAssetIds)//Get all matched assetIds
.flatMap(Collection::stream)
.collect(Collectors.toSet()));
diff --git a/model/src/main/java/org/openremote/model/value/MetaItemType.java b/model/src/main/java/org/openremote/model/value/MetaItemType.java
index 1d3104ce8..d3e65b9e1 100644
--- a/model/src/main/java/org/openremote/model/value/MetaItemType.java
+++ b/model/src/main/java/org/openremote/model/value/MetaItemType.java
@@ -138,7 +138,11 @@ public final class MetaItemType {
*/
public static final MetaItemDescriptor<Boolean> RULE_STATE = new MetaItemDescriptor<>("ruleState", ValueType.BOOLEAN);
-
+ /**
+ * Used by when-then rules to indicate that the rule should be allowed to re-trigger immediately; this can be useful for attributes
+ * that contain event based data rather than state data.
+ */
+ public static final MetaItemDescriptor<Boolean> RULE_RESET_IMMEDIATE = new MetaItemDescriptor<>("ruleResetImmediate", ValueType.BOOLEAN);
/* FORMATTING / DISPLAY META */
diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.ts
index 8e362dd46..5ae39225e 100644
--- a/ui/component/or-mwc-components/src/or-mwc-input.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts
@@ -1314,6 +1314,9 @@ export class OrMwcInput extends LitElement {
} else {
// some components need to be kept in sync with the DOM
if (this.type === InputType.SELECT && this._mdcComponent) {
+ if (_changedProperties.has("options")) {
+ (this._mdcComponent as MDCSelect).layoutOptions();
+ }
const selectedText = this.getSelectedTextValue();
(this._mdcComponent as any).foundation.adapter.setSelectedText(selectedText);
(this._mdcComponent as any).foundation.adapter.floatLabel(!!selectedText);