Skip to content

armgit / core

Public Imported from GitHub
0

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

Update packages

robindekkersc1a9dd494780
diff --git a/ui/component/or-icon/package.json b/ui/component/or-icon/package.json
index 79073a488..e66943701 100644
--- a/ui/component/or-icon/package.json
+++ b/ui/component/or-icon/package.json
@@ -13,7 +13,7 @@
"dependencies": {
"xmldom": "^0.1.27",
"@openremote/rest": "^1.0.0",
- "lit-element": "^2.0.1"
+ "lit-element": "^2.1.0"
},
"devDependencies": {
"@mdi/svg": "^3.5.95",
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index df07c482e..2c8a6cdc4 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -12,7 +12,6 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@polymer/polymer": "^3.2.0",
- "@polymer/decorators": "^3.0.0",
"@openremote/core": "^1.0.0",
"@types/mapbox-gl": "^0.51.1",
"lit-element": "^2.1.0",
diff --git a/ui/component/or-rules-editor/src/or-rule-then/index.ts b/ui/component/or-rules-editor/src/or-rule-then/index.ts
index 5c7e67b66..b43369770 100644
--- a/ui/component/or-rules-editor/src/or-rule-then/index.ts
+++ b/ui/component/or-rules-editor/src/or-rule-then/index.ts
@@ -6,8 +6,6 @@ import {Rule, RuleTrigger, RuleActionUnion, NewAssetQuery, BaseAssetQueryMatch}
import '../or-rule-then-condition';
-let hasAddThenCondition:Boolean = false
-
const defaultAssetType:NewAssetQuery = {
"types": [{
"predicateType": "string",
@@ -17,20 +15,13 @@ const defaultAssetType:NewAssetQuery = {
};
let defaultThenCondition:RuleActionUnion = {
- action: "write-attribute",
- attributeName: 'profileName',
- value: 'profiel naam',
- target: { "useAssetsFromWhen": true}
-};
-
-let secondThenCondition:RuleActionUnion = {
action: "write-attribute",
attributeName: 'profileColor',
- value: 'orange',
+ value: {"%RULESET_ID%": {"profileName":"%RULESET_NAME%", "profileColor": "red"}},
target: { "useAssetsFromWhen": true}
};
-let defaultThen:RuleActionUnion[] = [defaultThenCondition, secondThenCondition];
+let defaultThen:RuleActionUnion[] = [defaultThenCondition];
@customElement('or-rule-then')
class OrRuleThen extends LitElement {
@@ -53,9 +44,7 @@ class OrRuleThen extends LitElement {
<span class="rule-additional">&</span>
`
}) : ``}
- ${hasAddThenCondition ? html`
- <a class="button-add" @click="${this.addThenCondition}">+</a>
- `: ``}
+ <a class="button-add" @click="${this.addThenCondition}">+</a>
</div>
</div>
`;
diff --git a/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts b/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts
index 82eeb7828..4fcfe2090 100644
--- a/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts
+++ b/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts
@@ -53,7 +53,6 @@ class OrSelectAssetAttribute extends LitElement {
super();
// TODO Should come from rules-config based on asset type?
-
this.attributeDescriptors = [
{ name: 'flightProfile', valueType: AttributeValueType.STRING },
{ name: 'profileName', valueType: AttributeValueType.STRING },