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 or-rule-text-viewer and various other minor styling updates

Rich Turnerb42633e5b472
diff --git a/package.json b/package.json
index 0c41cfac2..1ecad51c7 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"inherits": "2.0.3",
"samsam": "1.1.3",
"supports-color": "3.1.2",
- "type-detect": "1.0.0"
+ "type-detect": "1.0.0",
+ "serialize-javascript": "^2.1.1"
}
}
diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.json
index bfd3b9115..21e9f1f69 100644
--- a/ui/component/or-rules/package.json
+++ b/ui/component/or-rules/package.json
@@ -12,21 +12,22 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "moment": "^2.24.0",
"@openremote/core": "^1.1.0",
+ "@openremote/or-attribute-input": "^1.1.0",
+ "@openremote/or-icon": "^1.1.0",
"@openremote/or-input": "^1.1.0",
+ "@openremote/or-mwc-components": "^1.1.0",
+ "@openremote/or-panel": "^1.1.0",
"@openremote/or-select": "^1.1.0",
"@openremote/or-translate": "^1.1.0",
- "@openremote/or-icon": "^1.1.0",
- "@openremote/or-panel": "^1.1.0",
- "@openremote/or-attribute-input": "^1.1.0",
- "@openremote/or-mwc-components": "^1.1.0",
"@openremote/rest": "^1.1.0",
- "lit-element": "^2.2.1"
+ "@openremote/model": "^1.1.0",
+ "@openremote/or-asset-viewer": "^1.1.0",
+ "ace-builds": "^1.4.7",
+ "lit-element": "^2.2.1",
+ "moment": "^2.24.0"
},
"devDependencies": {
- "@openremote/or-asset-viewer": "^1.1.0",
- "@openremote/model": "^1.1.0",
"tslint": ">=5.11.0",
"typescript": ">=3.4.5",
"webpack": "^4.41.2",
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index af8c4818f..a8155a4e9 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -675,7 +675,9 @@ export class OrRules extends translate(i18next)(LitElement) {
protected _onRuleSaveEnd(event: OrRulesSaveEndEvent) {
this._rulesList.disabled = false;
this._ruleViewer.disabled = false;
-
+ this.selectedIds = [
+ this._ruleViewer.ruleset!.id!
+ ];
if (event.detail) {
this._rulesList.refresh();
}
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
index 684e2c93b..1b63a6985 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
@@ -49,6 +49,8 @@ const style = css`
:host {
display: flex;
width: 100%;
+ padding: 0px 10px;
+ margin-top: -10px;
}
:host > * {
@@ -83,6 +85,7 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
protected _ruleset!: RulesetUnion;
protected _rule!: JsonRule;
+ protected _unsupported = false;
protected _assetDescriptors?: AssetDescriptor[];
protected _whenAssetDescriptors?: AssetDescriptor[];
protected _actionAssetDescriptors?: AssetDescriptor[];
@@ -92,11 +95,20 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
this.addEventListener(OrRulesJsonRuleChangedEvent.NAME, this._onJsonRuleChanged);
}
+ connectedCallback(): void {
+ super.connectedCallback();
+
+ if (this._unsupported) {
+ this.dispatchEvent(new OrRulesRuleUnsupportedEvent());
+ }
+ }
+
public set ruleset(ruleset: RulesetUnion) {
if (this._ruleset === ruleset) {
return;
}
+ this._unsupported = false;
this._ruleset = ruleset;
if (!ruleset.rules) {
@@ -110,14 +122,22 @@ export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements
try {
const rules = JSON.parse(ruleset.rules) as JsonRulesetDefinition;
if (!rules.rules || rules.rules.length > 1) {
- this.dispatchEvent(new OrRulesRuleUnsupportedEvent());
+ if (this.isConnected) {
+ this.dispatchEvent(new OrRulesRuleUnsupportedEvent());
+ } else {
+ this._unsupported = true;
+ }
return;
}
this._rule = rules.rules[0];
this.requestUpdate();
} catch (e) {
console.error("Invalid JSON rules, failed to parse: " + e);
- this.dispatchEvent(new OrRulesRuleUnsupportedEvent());
+ if (this.isConnected) {
+ this.dispatchEvent(new OrRulesRuleUnsupportedEvent());
+ } else {
+ this._unsupported = true;
+ }
}
}
}
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.ts
index 76b3558c1..3bde2ebba 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
@@ -143,16 +143,21 @@ const style = css`
.add-button-wrapper {
display: flex;
align-items: center;
+ white-space: nowrap;
}
.add-button-wrapper > * {
margin-right: 6px;
}
+ .add-button-wrapper or-mwc-menu {
+ text-transform: capitalize;
+ }
+
#type {
white-space: nowrap;
- text-transform: capitalize;
margin-right: 6px;
+ text-transform: capitalize;
}
.rule-reset {
@@ -300,7 +305,7 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {
${!this.rule.then ? `` : this.rule.then.map((action: RuleActionUnion) => this.ruleActionTemplate(this.rule.then!, action))}
${this.thenAllowAdd ? html`
- <span class="add-button-wrapper" style="white-space: nowrap; text-transform: capitalize">
+ <span class="add-button-wrapper">
${getContentWithMenuTemplate(
html`<or-input class="plus-button" type="${InputType.BUTTON}" icon="plus"></or-input>`,
getActionTypesMenu(this.config, this.assetDescriptors),
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.ts
index 7f6116261..b5ed54fe0 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
@@ -80,12 +80,15 @@ const style = css`
display: flex;
align-items: center;
white-space: nowrap;
- text-transform: capitalize;
}
.add-button-wrapper > * {
margin-right: 6px;
}
+
+ .add-button-wrapper or-mwc-menu {
+ text-transform: capitalize;
+ }
`;
@customElement("or-rule-when")
diff --git a/ui/component/or-rules/src/or-rule-text-viewer.ts b/ui/component/or-rules/src/or-rule-text-viewer.ts
new file mode 100644
index 000000000..c86f69990
--- /dev/null
+++ b/ui/component/or-rules/src/or-rule-text-viewer.ts
@@ -0,0 +1,170 @@
+import {OrRulesRuleChangedEvent, RulesConfig, RuleView} from "./index";
+import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
+import {RulesetLang, RulesetUnion} from "@openremote/model";
+import ace, {Ace} from "ace-builds";
+import "ace-builds/src-noconflict/mode-javascript";
+import "ace-builds/src-noconflict/mode-json";
+import "ace-builds/src-noconflict/mode-groovy";
+import "ace-builds/webpack-resolver";
+
+const style = css`
+ :host {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ }
+
+ #ace-editor {
+ position: relative;
+ height: 100%;
+ width: 100%;
+ }
+
+ @media screen and (max-width: 1400px) {
+ :host > * {
+ flex-grow: 0;
+ }
+
+ :host {
+ flex-direction: column;
+ }
+ }
+`;
+
+@customElement("or-rule-text-viewer")
+export class OrRuleTextViewer extends LitElement implements RuleView {
+
+ static get styles() {
+ return style;
+ }
+
+ @property({attribute: false})
+ public readonly?: boolean;
+
+ @property({attribute: false})
+ public config?: RulesConfig;
+
+ @property({attribute: false})
+ protected _ruleset!: RulesetUnion;
+
+ @query("#ace-editor")
+ protected _aceElem?: HTMLElement;
+ protected _rules?: string;
+ protected _aceEditor?: Ace.Editor;
+ protected _changeTimer?: number;
+
+ disconnectedCallback(): void {
+ if (this._aceEditor) {
+ this._aceEditor.destroy();
+ this._aceEditor = undefined;
+ }
+ super.disconnectedCallback();
+ }
+
+ public set ruleset(ruleset: RulesetUnion) {
+ if (this._ruleset === ruleset) {
+ return;
+ }
+
+ this._ruleset = ruleset;
+
+ if (!ruleset.rules) {
+ // New ruleset so start a new rule
+ this._rules = this._createRules();
+ } else {
+ this._rules = ruleset.rules;
+ }
+ }
+
+ protected _createRules(): string {
+ return "";
+ }
+
+ protected render(): TemplateResult | void {
+
+ if (!this._rules) {
+ return html``;
+ }
+
+ return html`
+ <div id="ace-editor"></div>
+ `;
+ }
+
+ protected updated(_changedProperties: PropertyValues): void {
+ if (!this._aceElem) {
+ if (this._aceEditor) {
+ this._aceEditor.destroy();
+ this._aceEditor = undefined;
+ }
+ } else {
+ if (!this._aceEditor) {
+ this._aceEditor = ace.edit(this._aceElem, {
+ mode: this._getMode(),
+ value: this._getRulesString(),
+ useSoftTabs: true,
+ tabSize: 2,
+ readOnly: this.readonly,
+ showPrintMargin: false
+ });
+ this._aceEditor.on("change", () => this._onEditorChanged());
+ this._aceEditor.renderer.attachToShadowRoot();
+ }
+ }
+ }
+
+ protected _getMode() {
+ switch (this._ruleset.lang) {
+ case RulesetLang.JAVASCRIPT:
+ return "ace/mode/javascript";
+ case RulesetLang.GROOVY:
+ return "ace/mode/groovy";
+ case RulesetLang.JSON:
+ return "ace/mode/json";
+ }
+ }
+
+ protected _getRulesString() {
+ if (!this._rules) {
+ return "";
+ }
+
+ switch (this._ruleset.lang) {
+ case RulesetLang.JAVASCRIPT:
+ case RulesetLang.GROOVY:
+ return this._rules;
+ case RulesetLang.JSON:
+ return JSON.stringify(JSON.parse(this._rules), null, 2);
+ }
+ }
+
+ protected _onEditorChanged() {
+ if (this._changeTimer) {
+ window.clearTimeout(this._changeTimer);
+ }
+ this._changeTimer = window.setTimeout(() => this._onEdit(), 1000);
+ }
+
+ protected _onEdit() {
+ this.dispatchEvent(new OrRulesRuleChangedEvent(this.validate()));
+ this._changeTimer = undefined;
+ }
+
+ public beforeSave() {
+ if (!this._aceEditor) {
+ return;
+ }
+
+ this._ruleset.rules = this._aceEditor.getValue();
+ }
+
+ public validate(): boolean {
+
+ if (!this._aceEditor) {
+ return false;
+ }
+
+ const annotations = this._aceEditor.getSession().getAnnotations();
+ return !annotations || annotations.length === 0;
+ }
+}
diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.ts
index 5dac077ac..03f388fa4 100644
--- a/ui/component/or-rules/src/or-rule-viewer.ts
+++ b/ui/component/or-rules/src/or-rule-viewer.ts
@@ -1,18 +1,19 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult, unsafeCSS} from "lit-element";
+import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
import {
- OrRulesSaveStartEvent,
OrRulesRuleChangedEvent,
OrRulesRuleUnsupportedEvent,
OrRulesSaveEndEvent,
+ OrRulesSaveStartEvent,
RulesConfig,
RuleView
} from "./index";
-import {RulesetLang, RulesetUnion, ClientRole} from "@openremote/model";
-import manager, {DefaultBoxShadow} from "@openremote/core";
+import {ClientRole, RulesetLang, RulesetUnion} from "@openremote/model";
+import manager from "@openremote/core";
import "./json-viewer/or-rule-json-viewer";
+import "./or-rule-text-viewer";
import "@openremote/or-input";
import {translate} from "@openremote/or-translate";
-import {InputType, OrInputChangedEvent, OrInput} from "@openremote/or-input";
+import {InputType, OrInputChangedEvent} from "@openremote/or-input";
import i18next from "i18next";
// language=CSS
@@ -70,9 +71,7 @@ export const style = css`
#rule-view {
flex-grow: 1;
background-color: var(--internal-or-rules-background-color);
- padding: 0px 10px;
- width: calc(100% - 20px);
- margin-top: -10px;
+ width: 100%;
}
`;
@@ -142,18 +141,15 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {
}
let viewer: TemplateResult | string = ``;
- if (!this._supported) {
+ if (!this._supported || this.ruleset.lang === RulesetLang.GROOVY || this.ruleset.lang === RulesetLang.JAVASCRIPT) {
viewer = html`
- <div>TEXT EDITOR</div>
+ <or-rule-text-viewer id="rule-view" .ruleset="${this.ruleset}" .config="${this.config}" .readonly="${this.readonly}"></or-rule-text-viewer>
`;
} else {
switch (this.ruleset.lang!) {
case RulesetLang.JSON:
viewer = html`<or-rule-json-viewer id="rule-view" .ruleset="${this.ruleset}" .config="${this.config}" .readonly="${this.readonly}"></or-rule-json-viewer>`;
break;
- case RulesetLang.GROOVY:
- case RulesetLang.JAVASCRIPT:
- break;
default:
viewer = html`<div class="wrapper"><or-translate value="notSupported"></or-translate></div>`;
}
@@ -165,6 +161,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {
<div id="rule-header">
<or-input id="rule-name" outlined .type="${InputType.TEXT}" .label="${i18next.t("ruleName")}" ?focused="${this._focusName}" .value="${this.ruleset ? this.ruleset.name : null}" ?disabled="${this._isReadonly()}" required minlength="3" maxlength="255" @or-input-changed="${(e: OrInputChangedEvent) => this._changeName(e.detail.value)}"></or-input>
<div id="rule-header-controls">
+
<span id="active-wrapper">
<or-translate value="active"></or-translate>
diff --git a/yarn.lock b/yarn.lock
index 9fb9c72a9..3923f4944 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2246,6 +2246,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
mime-types "~2.1.24"
negotiator "0.6.2"
+ace-builds@^1.4.7:
+ version "1.4.7"
+ resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.7.tgz#56e5465270b6c48a48d30e70d6b8f6b92fbf2b08"
+ integrity sha512-gwQGVFewBopRLho08BfahyvRa9FlB43JUig5ItAKTYc9kJJsbA9QNz75p28QtQomoPQ9rJx82ymL21x4ZSZmdg==
+
acorn-es7-plugin@^1.1.7:
version "1.1.7"
resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b"