100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
WIP Rules editor
robindekkersd3420ccdc519
diff --git a/ui/component/or-rules-editor/src/index.ts b/ui/component/or-rules-editor/src/index.tsindex a8e63457a..17b5621d1 100644--- a/ui/component/or-rules-editor/src/index.ts+++ b/ui/component/or-rules-editor/src/index.ts@@ -1,8 +1,8 @@-import {html, LitElement, property, customElement} from 'lit-element';+import {html, LitElement, property, customElement, TemplateResult} from 'lit-element';import '@openremote/or-select';import '@openremote/or-icon';-import {Rule, JsonRulesetDefinition, Ruleset, RulesetLang, TenantRuleset} from '@openremote/model';+import {Rule, JsonRulesetDefinition, Ruleset, RulesetLang, TenantRuleset, RuleActionWriteAttribute} from '@openremote/model';import openremote from "@openremote/core";import rest from "@openremote/rest";@@ -29,6 +29,22 @@ const rulesetModel:TenantRuleset = {rules: JSON.stringify({rules: [ruleModel]})};++class InputHandlers {+ handlers: ((condition:RuleActionWriteAttribute) => TemplateResult)[] = [];++ public addInputHandler(callback:(condition:RuleActionWriteAttribute) => TemplateResult) {+ this.handlers.push(callback);+ }++ public removeInputHandler() {++ }+}++export default new InputHandlers();++@customElement('or-rules-editor')class OrRulesEditor extends LitElement {diff --git a/ui/component/or-rules-editor/src/or-rule-then-condition/index.ts b/ui/component/or-rules-editor/src/or-rule-then-condition/index.tsindex 6f542db6e..b648c8530 100644--- a/ui/component/or-rules-editor/src/or-rule-then-condition/index.ts+++ b/ui/component/or-rules-editor/src/or-rule-then-condition/index.ts@@ -1,11 +1,12 @@-import {html, LitElement, property, customElement} from 'lit-element';+import {html, LitElement, property, customElement, TemplateResult} from 'lit-element';+import '../selects/or-select-operator';import '../selects/or-select-asset-attribute';import '@openremote/or-input';import '@openremote/or-select';import '@openremote/or-icon';-+import handler from '../index';import {style} from './style';import {RuleActionUnion, RuleActionWriteAttribute} from "@openremote/model";@@ -28,8 +29,7 @@ class OrRuleThenCondition extends LitElement {${this.condition ? html`<or-select-asset-attribute disabled type="${this.condition}" value="${this.condition.attributeName}"></or-select-asset-attribute><or-select-operator disabled type="${this.condition}" value="EQUAL"></or-select-operator>-- <or-input type="text" value="${this.condition.value}"></or-input>+ ${this.createInputControl(this.condition)}` : ``}</div>`;@@ -41,6 +41,19 @@ class OrRuleThenCondition extends LitElement {@property({type: Number})private value: number = 0;+ protected createInputControl(condition:RuleActionWriteAttribute) {+ for (let i=0; i< handler.handlers.length; i++) {+ let h = handler.handlers[i];++ let result = h(condition);++ if(result) {+ return result+ }+ }+ return html`<or-input type="text" value="${condition.value}"></or-input>`;+ }+setValue(e:any) {const value = e.detail.value;@@ -50,7 +63,6 @@ class OrRuleThenCondition extends LitElement {}}-constructor() {super();