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
Applied TSLint to or-rules-editor and updated extension mechanism
Rich Turnercbd52064e411
diff --git a/ui/component/or-rules-editor/src/index.ts b/ui/component/or-rules-editor/src/index.tsindex b1a9ecf3b..2975a49b8 100644--- a/ui/component/or-rules-editor/src/index.ts+++ b/ui/component/or-rules-editor/src/index.ts@@ -1,26 +1,26 @@-import {customElement, html, LitElement, property, TemplateResult} from 'lit-element';+import {customElement, html, LitElement, property, TemplateResult} from "lit-element";-import '@openremote/or-select';-import '@openremote/or-icon';-import {Rule, RuleActionWriteAttribute, RulesetLang, TenantRuleset} from '@openremote/model';+import "@openremote/or-select";+import "@openremote/or-icon";+import {Rule, RuleActionWriteAttribute, RulesetLang, TenantRuleset} from "@openremote/model";import openremote from "@openremote/core";import rest from "@openremote/rest";-import './or-rule-list';-import './or-rule-when';-import './or-rule-then';-import './or-rule-header';+import "./or-rule-list";+import "./or-rule-when";+import "./or-rule-then";+import "./or-rule-header";import {style} from "./style";-import findIndex from 'lodash-es/findIndex';+import findIndex from "lodash-es/findIndex";-const ruleModel:Rule = {+const ruleModel: Rule = {name: "",when: undefined,then: undefined};-const rulesetModel:TenantRuleset = {+const rulesetModel: TenantRuleset = {name: "New Rule",type: "tenant",lang: RulesetLang.JSON,@@ -29,57 +29,30 @@ const rulesetModel:TenantRuleset = {rules: JSON.stringify({rules: [ruleModel]})};-class InputHandlers {- handlers: ((condition:RuleActionWriteAttribute) => TemplateResult)[] = [];+ public handlers: Array<(condition: RuleActionWriteAttribute) => TemplateResult | undefined> = [];- public addInputHandler(callback:(condition:RuleActionWriteAttribute) => TemplateResult) {+ public addInputHandler(callback: (condition: RuleActionWriteAttribute) => TemplateResult | undefined) {this.handlers.push(callback);}- public removeInputHandler() {-+ public removeInputHandler(callback: (condition: RuleActionWriteAttribute) => TemplateResult | undefined) {+ const i = this.handlers.indexOf(callback);+ if (i <= 0) {+ this.handlers.splice(i, 1);+ }}}export default new InputHandlers();--@customElement('or-rules-editor')+@customElement("or-rules-editor")class OrRulesEditor extends LitElement {static get styles() {return [style- ]- }-- protected render() {-- return html`- <div class="rule-editor-container">- <side-menu class="bg-white shadow">- <or-rule-list .rulesets="${this.rulesets}" .ruleset="${this.ruleset}"></or-rule-list>- <div class="bottom-toolbar">- <icon class="small-icon" @click="${this.deleteRule}"><or-icon icon="delete"></or-icon></icon>- <icon class="small-icon" @click="${this.createRule}"><or-icon icon="plus"></or-icon></icon>- </div>- </side-menu>- ${this.ruleset ? html`- <or-body>- <or-rule-header class="bg-white shadow" .ruleset="${this.ruleset}"></or-rule-header>-- ${this.rule ? html`- <div class="content">- <or-rule-when .rule="${this.rule}"></or-rule-when>- <or-rule-then .rule="${this.rule}"></or-rule-then>- </div>- ` : ``}-- </or-body>- ` : html``}- </div>- `;+ ];}@property({type: Number})@@ -97,30 +70,28 @@ class OrRulesEditor extends LitElement {@property({type: Object})private rule?: Rule;-constructor() {super();this.readRules();- this.addEventListener('rules:set-active-rule', this.setActiveRule);- this.addEventListener('rules:create-rule', this.createRule);- this.addEventListener('rules:update-rule', this.updateRule);- this.addEventListener('rules:delete-rule', this.deleteRule);+ this.addEventListener("rules:set-active-rule", this.setActiveRule);+ this.addEventListener("rules:create-rule", this.createRule);+ this.addEventListener("rules:update-rule", this.updateRule);+ this.addEventListener("rules:delete-rule", this.deleteRule);}-- readRules() {+ public readRules() {rest.api.RulesResource.getTenantRulesets(openremote.config.realm, { language: RulesetLang.JSON, fullyPopulate: true }).then((response: any) => {if (response && response.data) {this.rulesets = response.data;- if(this.ruleset && this.rulesets) {- const index = findIndex(this.rulesets, ['id', this.ruleset.id]);+ if (this.ruleset && this.rulesets) {+ const index = findIndex(this.rulesets, ["id", this.ruleset.id]);let updatedRuleset;// ID is not found when a new ruleset is added- if(index > 0) {+ if (index > 0) {updatedRuleset = this.rulesets[index];} else {- updatedRuleset = this.rulesets[this.rulesets.length-1];+ updatedRuleset = this.rulesets[this.rulesets.length - 1];}this.ruleset = updatedRuleset;@@ -133,23 +104,23 @@ class OrRulesEditor extends LitElement {});}- createRule() {- if(this.rulesets) {+ public createRule() {+ if (this.rulesets) {const newRule = rulesetModel;this.rulesets = [...this.rulesets, rulesetModel];this.ruleset = newRule;this.computeRuleset();- rest.api.RulesResource.createTenantRuleset(newRule).then((response:any)=> {+ rest.api.RulesResource.createTenantRuleset(newRule).then((response: any) => {this.readRules();});}}- updateRule(e:any) {+ public updateRule(e: any) {this.ruleset = e.detail.ruleset;- if(this.ruleset && this.ruleset.id && this.rule){+ if (this.ruleset && this.ruleset.id && this.rule) {delete this.ruleset.lastModified;delete this.ruleset.createdOn;delete this.ruleset.status;@@ -157,22 +128,22 @@ class OrRulesEditor extends LitElement {// Parse rule to string of array of rulesthis.rule.name = this.ruleset.name;- this.ruleset.rules = JSON.stringify({"rules": [this.rule] });+ this.ruleset.rules = JSON.stringify({rules: [this.rule] });- //this.ruleset.rules = JSON.stringify(this.rules);- rest.api.RulesResource.updateTenantRuleset(this.ruleset.id, this.ruleset).then((response:any)=> {+ // this.ruleset.rules = JSON.stringify(this.rules);+ rest.api.RulesResource.updateTenantRuleset(this.ruleset.id, this.ruleset).then((response: any) => {this.readRules();});}}- deleteRule() {- if(this.ruleset && this.ruleset.id) {+ public deleteRule() {+ if (this.ruleset && this.ruleset.id) {rest.api.RulesResource.deleteTenantRuleset(this.ruleset.id).then((response: any) => {- if(this.rulesets && this.ruleset) {- const index = findIndex(this.rulesets, ['id', this.ruleset.id]);+ if (this.rulesets && this.ruleset) {+ const index = findIndex(this.rulesets, ["id", this.ruleset.id]);this.rulesets.splice(index, 1);this.rulesets = [...this.rulesets];this.ruleset = undefined;@@ -184,11 +155,10 @@ class OrRulesEditor extends LitElement {}}- computeRuleset () {- if(this.ruleset && this.ruleset.rules){+ public computeRuleset() {+ if (this.ruleset && this.ruleset.rules) {this.rule = JSON.parse(this.ruleset.rules).rules[0];- }- else if(this.ruleset && !this.ruleset.rules){+ } else if (this.ruleset && !this.ruleset.rules) {this.rule = ruleModel;this.rule.name = this.ruleset.name;}@@ -196,10 +166,38 @@ class OrRulesEditor extends LitElement {this.requestUpdate();}- setActiveRule(e:any) {+ public setActiveRule(e: any) {this.ruleset = e.detail.ruleset;this.computeRuleset();}++ protected render() {++ return html`+ <div class="rule-editor-container">+ <side-menu class="bg-white shadow">+ <or-rule-list .rulesets="${this.rulesets}" .ruleset="${this.ruleset}"></or-rule-list>+ <div class="bottom-toolbar">+ <icon class="small-icon" @click="${this.deleteRule}"><or-icon icon="delete"></or-icon></icon>+ <icon class="small-icon" @click="${this.createRule}"><or-icon icon="plus"></or-icon></icon>+ </div>+ </side-menu>+ ${this.ruleset ? html`+ <or-body>+ <or-rule-header class="bg-white shadow" .ruleset="${this.ruleset}"></or-rule-header>++ ${this.rule ? html`+ <div class="content">+ <or-rule-when .rule="${this.rule}"></or-rule-when>+ <or-rule-then .rule="${this.rule}"></or-rule-then>+ </div>+ ` : ``}++ </or-body>+ ` : html``}+ </div>+ `;+ }}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 85778958b..b3efbd27f 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,74 +1,70 @@-import {html, LitElement, property, customElement, TemplateResult} from 'lit-element';+import {html, LitElement, property, customElement, TemplateResult} from "lit-element";+import "../selects/or-select-operator";+import "../selects/or-select-asset-attribute";-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 "@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";-// TODO use create select option to-@customElement('or-rule-then-condition')+@customElement("or-rule-then-condition")class OrRuleThenCondition extends LitElement {static get styles() {return [style- ]- }-- protected render() {-- return html`- <div class="rule-container">- ${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>- ${this.createInputControl(this.condition)}- ` : ``}- </div>- `;+ ];}@property({type: Object})- condition?: RuleActionWriteAttribute;+ public condition?: RuleActionWriteAttribute;@property({type: Number})private value: number = 0;- protected createInputControl(condition:RuleActionWriteAttribute):TemplateResult {- for (let i=0; i< handler.handlers.length; i++) {- let h = handler.handlers[i];-- let result = h(condition);+ constructor() {+ super();- if(result) {- return result- }- }- return html`<or-input type="text" value="${condition.value}"></or-input>`;+ this.addEventListener("or-input:changed", this.setValue);}- setValue(e:any) {+ public setValue(e: any) {const value = e.detail.value;- if(this.condition && this.condition.value) {+ if (this.condition && this.condition.value) {this.condition.value = value;this.requestUpdate();}}- constructor() {- super();+ protected render() {- this.addEventListener('or-input:changed', this.setValue);+ return html`+ <div class="rule-container">+ ${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>+ ${this.createInputControl(this.condition!)}+ ` : ``}+ </div>+ `;}+ protected createInputControl(condition: RuleActionWriteAttribute): TemplateResult {+ for (const h of handler.handlers) {++ const result = h(this.condition!);+ if (result) {+ return html`${result}`;+ }+ }++ return html`<or-input type="text" value="${this.condition!.value}"></or-input>`;+ }}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.tsindex 4fcfe2090..59e49555d 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@@ -1,46 +1,52 @@-import {html, LitElement, customElement, property} from 'lit-element';-//import "@material/mwc-icon"-import {AttributeDescriptor, AttributeValueType} from "@openremote/model"--@customElement('or-select-asset-attribute')+import {html, LitElement, customElement, property} from "lit-element";+import {AttributeDescriptor, AttributeValueType, AttributeValueDescriptor, ValueType} from "@openremote/model";++const Test = {+ STRING: {name: "flightProfile", icon: "file-text-o", valueType: ValueType.STRING},+ NUMBER: {name: ""}+};+@customElement("or-select-asset-attribute")class OrSelectAssetAttribute extends LitElement {- @property({type: Function})- private changed: any;@property({type: String})- icon: string = '';+ public icon: string = "";@property({type: String})- assetType: string = '';+ public assetType: string = "";@property({type: Array})- attributeDescriptors?: AttributeDescriptor[];+ public attributeDescriptors?: AttributeDescriptor[];@property({type: String})- value: any;+ public value: any;@property({type: Boolean})- disabled: boolean = false;+ public disabled: boolean = false;+ @property({type: Function})+ private changed: any;- protected render() {+ constructor() {+ super();- // TODO types should be based on rules-config- return html`- <select ?disabled="${this.disabled}" id="or-select-asset-attribute" @change="${this.onChange}">- ${this.attributeDescriptors ? this.attributeDescriptors.map((attribute:AttributeDescriptor) => {- return html`- <option ?selected="${attribute.name === this.value}" value="${attribute.name}">${attribute.name}</option>- `- }) : ``}- </select>- `;+ // TODO Should come from rules-config based on asset type?+ this.attributeDescriptors = [+ { name: "flightProfile", valueDescriptor: { name: "NUMBER", valueType: ValueType.NUMBER } },+ { name: "profileName", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "profileColor", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "airportIata", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "airlineIata", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "originRegion", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "languageCodes", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } },+ { name: "passengerCapacity", valueDescriptor: { name: "NUMBER", valueType: ValueType.NUMBER } },+ { name: "countryCode", valueDescriptor: { name: "STRING", valueType: ValueType.STRING } }+ ];}- onChange() {- if(this.shadowRoot){- const value = (<HTMLInputElement>this.shadowRoot.getElementById('or-select-asset-attribute')).value;+ public onChange() {+ if (this.shadowRoot) {+ const value = (this.shadowRoot.getElementById("or-select-asset-attribute") as HTMLInputElement).value;- let event = new CustomEvent('asset-attribute:changed', {+ const event = new CustomEvent("asset-attribute:changed", {detail: { value: value },bubbles: true,composed: true });@@ -49,23 +55,17 @@ class OrSelectAssetAttribute extends LitElement {}}- constructor() {- super();+ protected render() {- // TODO Should come from rules-config based on asset type?- this.attributeDescriptors = [- { name: 'flightProfile', valueType: AttributeValueType.STRING },- { name: 'profileName', valueType: AttributeValueType.STRING },- { name: 'profileColor', valueType: AttributeValueType.STRING },- { name: 'airportIata', valueType: AttributeValueType.STRING },- { name: 'airlineIata', valueType: AttributeValueType.STRING },- { name: 'originRegion', valueType: AttributeValueType.STRING },- { name: 'languageCodes', valueType: AttributeValueType.STRING },- { name: 'passengerCapacity', valueType: AttributeValueType.NUMBER },- { name: 'countryCode', valueType: AttributeValueType.STRING }- ];+ // TODO types should be based on rules-config+ return html`+ <select ?disabled="${this.disabled}" id="or-select-asset-attribute" @change="${this.onChange}">+ ${this.attributeDescriptors ? this.attributeDescriptors.map((attribute: AttributeDescriptor) => {+ return html`+ <option ?selected="${attribute.name === this.value}" value="${attribute.name}">${attribute.name}</option>+ `;+ }) : ``}+ </select>+ `;}--}-