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
Improve responsiveness, Fix asset-tree collapse button
robindekkers28085b8f35b9
diff --git a/ui/component/or-asset-tree/src/style.ts b/ui/component/or-asset-tree/src/style.tsindex 16d40a3bc..4478f7884 100644--- a/ui/component/or-asset-tree/src/style.ts+++ b/ui/component/or-asset-tree/src/style.ts@@ -148,6 +148,9 @@ export const style = css`background-repeat: no-repeat;background-size: 18px;background-position: center;++ margin-left: -4px;+ border-left: 4px solid transparent;}.expander[data-expandable] {diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex 643155574..50f3a8961 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -153,7 +153,6 @@ const style = css`}#controls {- flex: 0;display: flex;flex-wrap: wrap;justify-content: space-between;diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.tsindex e602f8465..14149053f 100644--- a/ui/component/or-input/src/index.ts+++ b/ui/component/or-input/src/index.ts@@ -112,6 +112,7 @@ const style = css`}#component {+ flex: 1 1 0;max-width: 100%;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.tsindex adff855a2..3d13de011 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts@@ -23,10 +23,12 @@ const style = css`:host {display: flex;align-items: center;++ flex-wrap: wrap;}:host > * {- margin-right: 6px;+ margin: 0 3px 6px;}`;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.tsindex d02d803a2..051ecfed7 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts@@ -47,23 +47,11 @@ const style = css`flex-grow: 1;display: flex;flex-direction: row;+ flex-wrap: wrap;}- .attribute > * {- flex-grow: 0;- }-- .attribute, .attribute-editor {- display: flex;- flex-grow: 1;- }-- #idSelect {- margin-right: 3px;- }-- .attribute-editor > * {- margin: 0 3px;+ .attribute-group > * {+ margin: 0 3px 6px;}`;@@ -178,13 +166,11 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {const operators = this.getOperators(assetDescriptor, attribute, attributeName);return html`- <div class="attribute-editor">- <or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrSelectChangedEvent) => this.setAttributeName(attributePredicate, e.detail.value)}" ?readonly="${this.readonly}" .options="${attributes}" .value="${attributeName}" .label="${i18next.t("attribute")}"></or-input>-- ${attributeName ? html`<or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrSelectChangedEvent) => this.setOperator(assetDescriptor, attribute, attributeName, attributePredicate, e.detail.value)}" ?readonly="${this.readonly}" .options="${operators}" .value="${operator}" .label="${i18next.t("operator")}"></or-input>` : ``}-- ${attributePredicate ? this.attributePredicateValueEditorTemplate(assetDescriptor, attributePredicate) : ``}- </div>+ <or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrSelectChangedEvent) => this.setAttributeName(attributePredicate, e.detail.value)}" ?readonly="${this.readonly}" .options="${attributes}" .value="${attributeName}" .label="${i18next.t("attribute")}"></or-input>++ ${attributeName ? html`<or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrSelectChangedEvent) => this.setOperator(assetDescriptor, attribute, attributeName, attributePredicate, e.detail.value)}" ?readonly="${this.readonly}" .options="${operators}" .value="${operator}" .label="${i18next.t("operator")}"></or-input>` : ``}++ ${attributePredicate ? this.attributePredicateValueEditorTemplate(assetDescriptor, attributePredicate) : ``}`;}@@ -303,12 +289,10 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {${this.query.attributes && this.query.attributes.items ? this.query.attributes.items.map((attributePredicate) => {return html`- <div class="attribute">- ${this.attributePredicateEditorTemplate(assetDescriptor, idValue !== "*" ? this._assets!.find((asset) => asset.id === idValue) : undefined, attributePredicate)}- ${showRemoveAttribute ? html`- <button class="button-clear" @click="${() => this.removeAttributePredicate(this.query!.attributes!, attributePredicate)}"><or-icon icon="close-circle"></or-icon></input>- ` : ``}- </div>+ ${this.attributePredicateEditorTemplate(assetDescriptor, idValue !== "*" ? this._assets!.find((asset) => asset.id === idValue) : undefined, attributePredicate)}+ ${showRemoveAttribute ? html`+ <button class="button-clear" @click="${() => this.removeAttributePredicate(this.query!.attributes!, attributePredicate)}"><or-icon icon="close-circle"></or-icon></input>+ ` : ``}`;}) : ``}</div>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 a5a2e67ee..c29b1dcb2 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@@ -114,7 +114,6 @@ const style = css`:host {display: flex;flex-direction: row;- align-items: center;}or-rule-asset-query {@@ -124,7 +123,7 @@ const style = css`#type {white-space: nowrap;text-transform: capitalize;- margin-right: 6px;+ margin: 4px 3px auto 0;}`;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.tsindex 1b63a6985..af9e83963 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@@ -48,7 +48,7 @@ declare global {const style = css`:host {display: flex;- width: 100%;+ width: calc(100% - 20px);padding: 0px 10px;margin-top: -10px;}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 3bde2ebba..56926dcfe 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@@ -110,13 +110,12 @@ const style = css`.rule-action {display: flex;margin: 10px 0;- align-items: center;}.rule-action-wrapper {flex-grow: 1;display: flex;- align-items: center;+ align-items: baseline;}.rule-action > button {@@ -156,7 +155,7 @@ const style = css`#type {white-space: nowrap;- margin-right: 6px;+ margin: 4px 3px auto 0;text-transform: capitalize;}diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex 03f388fa4..6f5d6c4e5 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -34,7 +34,9 @@ export const style = css`}#rule-name {- width: 400px;+ max-width: 400px;+ flex: 1 1 0;+ display: flex;}#rule-header {@@ -71,7 +73,6 @@ export const style = css`#rule-view {flex-grow: 1;background-color: var(--internal-or-rules-background-color);- width: 100%;}`;