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
UI updates: Minor code styling and bug fixes
Rich Turner44a1e45ff4df
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 87dfacefc..1d3a4a51b 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -125,7 +125,7 @@"subCategory": "Sub category","message": "Message","warn": "Warning",- "error": "Error"+ "error": "Error","frequency": "Frequency","everyTime": "Every time","onlyOnce": "Only once",diff --git a/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java b/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.javaindex 2fe47c0a9..981148b0a 100644--- a/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java+++ b/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java@@ -19,6 +19,7 @@*/package org.openremote.test.protocol.http;+import org.openremote.model.Constants;import org.openremote.model.asset.Asset;import javax.annotation.security.RolesAllowed;diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.tsindex 3523991bd..b6ee4eb10 100644--- a/ui/component/or-log-viewer/src/index.ts+++ b/ui/component/or-log-viewer/src/index.ts@@ -248,6 +248,14 @@ export class OrLogViewer extends translate(i18next)(LitElement) {}}+ if (this.config && this.config.initialFilter) {+ this.filter = this.config.initialFilter;+ }++ if (this.config && this.config.initialLevel) {+ this.level = this.config.initialLevel;+ }+if (!this.live && !this.timestamp) {this.timestamp = new Date();}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.tsindex c5495d03e..a5a2e67ee 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts@@ -121,10 +121,6 @@ const style = css`flex-grow: 1;}- #type-selector {- margin-top: 10px;- }-#type {white-space: nowrap;text-transform: capitalize;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.tsindex fd5146d06..76b3558c1 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts@@ -74,11 +74,11 @@ function getActionTypesMenu(config?: RulesConfig, assetDescriptors?: AssetDescrireturn menu;}-type resetOptions = {- [key: string]: string+interface ResetOptions {+ [key: string]: string;}-const resetOptions:resetOptions = {+const resetOptions: ResetOptions = {"everyTime": "everyTime","onlyOnce": "onlyOnce","1h": "oncePerHour",@@ -89,16 +89,12 @@ const resetOptions:resetOptions = {function getResetMenu(config?: RulesConfig): MenuItem[] {- const menu: MenuItem[] = [];-- menu.push(...Object.entries(resetOptions).map(([key, value]) => {- const content = html`- <span style="white-space: nowrap;">${i18next.t(value)}</span>- `;- return {content: content, value: key} as MenuItem- }));-- return menu;+ return Object.entries(resetOptions).map(([key, value]) => {+ return {+ text: i18next.t(value),+ value: key+ };+ });}// language=CSSconst style = css`@@ -189,25 +185,27 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {protected ruleResetTemplate(reset: RuleConditionReset) {let resetTemplate: TemplateResult | string = ``;-- let buttonIcon = undefined;- let buttonColor = "inherit";+ const buttonColor = "inherit";let value;- if (!reset) value = "onlyOnce";- else if (reset.valueChanges && reset.timestampChanges) value = "everyTime";- else if (reset.timer) value = reset.timer;- else if (this.config && this.config.json && this.config.json.rule && this.config.json.rule.reset) value = this.config.json.rule.reset.timer;-+ if (!reset) {+ value = "onlyOnce";+ } else if (reset.valueChanges && reset.timestampChanges) {+ value = "everyTime";+ } else if (reset.timer) {+ value = reset.timer;+ } else if (this.config && this.config.json && this.config.json.rule && this.config.json.rule.reset) {+ value = this.config.json.rule.reset.timer;+ }resetTemplate = html`<div style="color: #${buttonColor}; margin-right: 6px;">${getContentWithMenuTemplate(- html`<or-input type="${InputType.BUTTON}" label="${value ? i18next.t(resetOptions[value]) : i18next.t('frequency') }"></or-input>`,- getResetMenu(this.config),- value,- (value: string) => this.setResetOption(value))}+ html`<or-input type="${InputType.BUTTON}" label="${value ? i18next.t(resetOptions[value]) : i18next.t("frequency") }"></or-input>`,+ getResetMenu(this.config),+ value,+ (values: string | string[]) => this.setResetOption(values as string))}</div>`;@@ -346,7 +344,9 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {delete this.rule.reset;break;case "everyTime":- if (this.rule.reset) delete this.rule.reset.timer;+ if (this.rule.reset) {+ delete this.rule.reset.timer;+ }this.rule.reset = {valueChanges: true,timestampChanges: true@@ -354,8 +354,12 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {break;default:if (this.rule.reset) {- if (this.rule.reset.valueChanges) delete this.rule.reset.valueChanges;- if (this.rule.reset.timestampChanges) delete this.rule.reset.timestampChanges;+ if (this.rule.reset.valueChanges) {+ delete this.rule.reset.valueChanges;+ }+ if (this.rule.reset.timestampChanges) {+ delete this.rule.reset.timestampChanges;+ }this.rule.reset.timer = value;} else {this.rule.reset = {timer: value};@@ -405,7 +409,7 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {}]}- }+ };}const index = actions.indexOf(action);diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.tsindex 6e8edf2de..7f6116261 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts@@ -79,6 +79,8 @@ const style = css`.add-button-wrapper {display: flex;align-items: center;+ white-space: nowrap;+ text-transform: capitalize;}.add-button-wrapper > * {