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 updates includes improved attribute support in JSON rules editor
Rich Turner5bc27b70a9cc
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 40c61221f..465e0805c 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -107,7 +107,7 @@ public enum AssetType implements AssetDescriptor {READ_ONLY)),- ENVIRONMENT_SENSOR(ASSET_NAMESPACE + ":enviroment", "periodic-table-co2", "f18546",+ ENVIRONMENT_SENSOR(ASSET_NAMESPACE + ":environment", "periodic-table-co2", "f18546",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),diff --git a/ui/app/main/package.json b/ui/app/main/package.jsonindex 0b27f12e3..98572481d 100644--- a/ui/app/main/package.json+++ b/ui/app/main/package.json@@ -10,7 +10,7 @@"modelBuild": "node ../../model-build.js","modelWatch": "node ../../model-watch.js","build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",- "serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack-dev-server --host 0.0.0.0 --port 8000 --mode development",+ "serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack-dev-server --mode development","watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex d6b045e0f..7e93728e7 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -15,7 +15,8 @@ import {User,Role,Attribute,- ConsoleAppConfig+ ConsoleAppConfig,+ AssetType} from "@openremote/model";import * as Util from "./util";import orIconSet from "./or-icon-set";@@ -236,58 +237,52 @@ export class AssetModelUtil {});}- public static getAssetAttributeDescriptor(assetDescriptor?: AssetDescriptor, attributeName?: string): AttributeDescriptor | undefined {- if (!attributeName || !assetDescriptor || !assetDescriptor.attributeDescriptors) {- return;- }-- return assetDescriptor.attributeDescriptors.find((attributeDescriptor) => attributeDescriptor.attributeName === attributeName);- }-- public static getAttributeDescriptor(attributeName?: string): AttributeDescriptor | undefined {+ public static getAttributeDescriptor(attributeName?: string, assetTypeOrDescriptor?: string | AssetDescriptor): AttributeDescriptor | undefined {if (!attributeName) {return;}- return this._attributeDescriptors.find((attributeDescriptor) => {+ let descriptor = this._attributeDescriptors.find((attributeDescriptor) => {return attributeDescriptor.attributeName === attributeName;});- }- public static getAttributeDescriptorFromAsset(attributeName: string, assetType?: string): AttributeDescriptor | undefined {- if (!attributeName) {- return;+ if (descriptor || !assetTypeOrDescriptor) {+ return descriptor;}- if (assetType) {- const assetDescriptor = this.getAssetDescriptor(assetType);- if (assetDescriptor && assetDescriptor.attributeDescriptors) {- const attributeDescriptor = assetDescriptor.attributeDescriptors.find((ad) => ad.attributeName === attributeName);- if (attributeDescriptor) {- return attributeDescriptor;- }- }+ let assetDescriptor: AssetDescriptor | undefined;+ if ((assetTypeOrDescriptor as AssetDescriptor).name) {+ assetDescriptor = assetTypeOrDescriptor as AssetDescriptor;+ } else {+ assetDescriptor = this.getAssetDescriptor(assetTypeOrDescriptor as string);+ }+ if (assetDescriptor && assetDescriptor.attributeDescriptors) {+ descriptor = assetDescriptor.attributeDescriptors.find((ad) => ad.attributeName === attributeName);}- return this.getAttributeDescriptor(attributeName);+ return descriptor;}- public static getAttributeValueDescriptor(name: string): AttributeValueDescriptor | undefined {- return this._attributeValueDescriptors.find((attributeValueDescriptor) => {+ public static getAttributeValueDescriptor(name?: string, attributeNameOrDescriptor?: string | AttributeDescriptor, assetTypeOrDescriptor?: string | AssetDescriptor): AttributeValueDescriptor | undefined {+ if (!name) {+ return;+ }++ const descriptor = this._attributeValueDescriptors.find((attributeValueDescriptor) => {return attributeValueDescriptor.name === name;});- }- public static getAttributeValueDescriptorFromAsset(name: string | undefined, assetType?: string, attributeName?: string): AttributeValueDescriptor | undefined {- if (name) {- return this.getAttributeValueDescriptor(name);+ if (descriptor || !attributeNameOrDescriptor) {+ return descriptor;}-- if (attributeName) {- const attributeDescriptor = this.getAttributeDescriptorFromAsset(attributeName, assetType);- if (attributeDescriptor) {- return attributeDescriptor.valueDescriptor;- }+ let attributeDescriptor: AttributeDescriptor | undefined;+ if ((attributeNameOrDescriptor as AttributeDescriptor).attributeName) {+ attributeDescriptor = attributeNameOrDescriptor as AttributeDescriptor;+ } else {+ attributeDescriptor = this.getAttributeDescriptor(attributeNameOrDescriptor as string, assetTypeOrDescriptor);+ }+ if (attributeDescriptor) {+ return attributeDescriptor.valueDescriptor;}}@@ -299,12 +294,12 @@ export class AssetModelUtil {if (typeof attributeOrNameOrDescriptor === "string") {attributeName = attributeOrNameOrDescriptor;- attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attributeOrNameOrDescriptor, assetType);+ attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attributeOrNameOrDescriptor, assetType);attributeTypeOrDescriptor = attributeDescriptor ? attributeDescriptor.valueDescriptor : undefined;} else if (attributeOrNameOrDescriptor) {if ((attributeOrNameOrDescriptor as Attribute).type) {attributeName = (attributeOrNameOrDescriptor as Attribute).name!;- attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attributeName, assetType);+ attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attributeName, assetType);attributeTypeOrDescriptor = (attributeOrNameOrDescriptor as Attribute).type;} else {attributeName = (attributeOrNameOrDescriptor as AttributeDescriptor).attributeName!;@@ -315,7 +310,7 @@ export class AssetModelUtil {if (attributeTypeOrDescriptor) {if (typeof attributeTypeOrDescriptor === "string") {- attributeValueDescriptor = AssetModelUtil.getAttributeValueDescriptorFromAsset(attributeTypeOrDescriptor, assetType, attributeName);+ attributeValueDescriptor = AssetModelUtil.getAttributeValueDescriptor(attributeTypeOrDescriptor, assetType, attributeName);} else {attributeValueDescriptor = attributeTypeOrDescriptor;}@@ -324,14 +319,30 @@ export class AssetModelUtil {return [attributeDescriptor, attributeValueDescriptor];}- public static getMetaItemDescriptor(urn?: string): MetaItemDescriptor | undefined {+ public static getMetaItemDescriptor(urn?: string, attributeNameOrDescriptor?: string | AttributeDescriptor, assetTypeOrDescriptor?: string | AssetDescriptor): MetaItemDescriptor | undefined {if (!urn) {return;}- return this._metaItemDescriptors.find((metaItemDescriptor) => {+ let descriptor = this._metaItemDescriptors.find((metaItemDescriptor) => {return metaItemDescriptor.urn === urn;});++ if (descriptor || !attributeNameOrDescriptor) {+ return descriptor;+ }++ let attributeDescriptor: AttributeDescriptor | undefined;+ if ((attributeNameOrDescriptor as AttributeDescriptor).attributeName) {+ attributeDescriptor = attributeNameOrDescriptor as AttributeDescriptor;+ } else {+ attributeDescriptor = this.getAttributeDescriptor(attributeNameOrDescriptor as string, assetTypeOrDescriptor);+ }+ if (attributeDescriptor && attributeDescriptor.metaItemDescriptors) {+ descriptor = attributeDescriptor.metaItemDescriptors.find((mid) => mid.urn === urn);+ }++ return descriptor;}public static attributeValueDescriptorsMatch(attributeValueDescriptor1: AttributeValueDescriptor, attributeValueDescriptor2: AttributeValueDescriptor) {diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex f72d11032..bec4c232f 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -467,7 +467,7 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: AttattributeTable.hidden = false;const headers = [...selectedAttributes].sort();attributeTable.headers = headers.map((attrName) => {- const attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attrName, childAssetType);+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attrName, childAssetType);return Util.getAttributeLabel(undefined, attributeDescriptor, undefined, false);});attributeTable.headers.unshift(i18next.t("groupAssetName"));diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex 01d2be888..d9d9e4fc0 100644--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts@@ -140,7 +140,7 @@ export class OrEditAssetPanel extends LitElement {const updatePublicRead = (publicRead: boolean) => {this.asset.accessPublicRead = publicRead;- this.onUpdated();+ this.onModified();};// Properties panel fields@@ -207,7 +207,7 @@ export class OrEditAssetPanel extends LitElement {const deleteAttribute = () => {this.attrs!.splice(this.attrs!.indexOf(attribute), 1);- this.onUpdated();+ this.onModified();};return html`@@ -222,7 +222,7 @@ export class OrEditAssetPanel extends LitElement {<div><div class="meta-item-container"><div>- ${!attribute.meta ? `` : attribute.meta.sort(Util.sortByString((metaItem) => metaItem.name!)).map((metaItem) => this._getEditMetaItemTemplate(attribute, metaItem))}+ ${!attribute.meta ? `` : attribute.meta.sort(Util.sortByString((metaItem) => metaItem.name!)).map((metaItem) => this._getMetaItemTemplate(attribute, metaItem))}</div><div class="item-add"><or-input .type="${InputType.BUTTON}" .label="${i18next.t("addMetaItems")}" icon="plus" @click="${() => this._addMetaItems(attribute)}"></or-input>@@ -234,20 +234,20 @@ export class OrEditAssetPanel extends LitElement {`;};- protected onUpdated() {+ protected onModified() {this.dispatchEvent(new OrEditAssetChangedEvent());this.requestUpdate();}- protected _getEditMetaItemTemplate(attribute: Attribute, metaItem: MetaItem): TemplateResult {+ protected _getMetaItemTemplate(attribute: Attribute, metaItem: MetaItem): TemplateResult {const removeMetaItem = () => {attribute.meta!.splice(attribute.meta!.indexOf(metaItem), 1);- this.onUpdated();+ this.onModified();};const descriptor = AssetModelUtil.getMetaItemDescriptor(metaItem.name);- let valueType = descriptor ? descriptor.valueType : undefined;+ let valueType = descriptor ? descriptor .valueType : undefined;let inputType = InputType.TEXT;if (!valueType && metaItem.value !== undefined && metaItem.value !== null) {switch (typeof metaItem.value) {@@ -333,7 +333,7 @@ export class OrEditAssetPanel extends LitElement {actionName: "add",action: () => {this.attrs!.push(attr);- this.onUpdated();+ this.onModified();},content: html`<or-input id="add-btn" .type="${InputType.BUTTON}" disabled .label="${i18next.t("add")}"></or-input>`},@@ -404,7 +404,7 @@ export class OrEditAssetPanel extends LitElement {value: descriptor.initialValue});- this.onUpdated();+ this.onModified();}});}@@ -439,13 +439,13 @@ export class OrEditAssetPanel extends LitElement {parentNode = parentNode.parent;}this.asset.path = path;- this.onUpdated();+ this.onModified();};const clearParent = () => {this.asset.parentId = undefined;this.asset.path = [this.asset.id!];- this.onUpdated();+ this.onModified();};const blockEvent = (ev: Event) => {diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex 7fe7a60bd..d3e787ed4 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -766,7 +766,7 @@ export class OrAttributeCard extends LitElement {const attr = this.asset.attributes![this.attributeName!];const roundedVal = +value.toFixed(this.mainValueDecimals); // + operator prevents str return- const attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(this.attributeName!);+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(this.attributeName!);const unitKey = Util.getMetaValue(MetaItemType.UNIT_TYPE, attr, attributeDescriptor);const unit = i18next.t("units." + unitKey);diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex 82b857ca3..2792aeebd 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -681,7 +681,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {if (attr) {const attributeType = attr.type as string;- const attrDescriptor = AssetModelUtil.getAttributeValueDescriptorFromAsset(attributeType, this.assetType, attributeName);+ const attrDescriptor = AssetModelUtil.getAttributeValueDescriptor(attributeType, this.assetType, attributeName);if (attrDescriptor && attrDescriptor.valueType) {this._type = attrDescriptor.valueType;diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex a17a1ecfa..6b539c45a 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -480,7 +480,7 @@ export class OrChart extends translate(i18next)(LitElement) {<div id="attribute-list">${this.assetAttributes && this.assetAttributes.map((attr, index) => {- const attributeDescriptor = AssetModelUtil.getAttributeDescriptorFromAsset(attr.name!);+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attr.name!);const descriptors = AssetModelUtil.getAttributeAndValueDescriptors(this.assets[index]!.type, attr);const label = Util.getAttributeLabel(attr, descriptors[0], descriptors[1], true);const bgColor = Util.getMetaValue('color', attr, undefined) ? Util.getMetaValue('color', attr, undefined) : "";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 6832216ff..94490b434 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@@ -107,8 +107,8 @@ export class OrRuleActionAttribute extends translate(i18next)(LitElement) {const asset = idValue && idValue !== "*" ? this._assets.find(a => a.id === idValue) : undefined;const showUpdateOptions = !this.config || !this.config.controls || !this.config.controls.hideActionUpdateOptions;- const attributeDescriptor = AssetModelUtil.getAssetAttributeDescriptor(assetDescriptor, this.action.attributeName);- let attribute: Attribute | undefined = asset && this.action.attributeName ? Util.getAssetAttribute(asset, this.action.attributeName) : undefined;+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(this.action.attributeName, assetDescriptor);+ const attribute: Attribute | undefined = asset && this.action.attributeName ? Util.getAssetAttribute(asset, this.action.attributeName) : undefined;const attributeValueDescriptor = attributeDescriptor && attributeDescriptor.valueDescriptor ? typeof attributeDescriptor.valueDescriptor === "string" ? AssetModelUtil.getAttributeValueDescriptor(attributeDescriptor.valueDescriptor as string) : attributeDescriptor.valueDescriptor : attribute ? AssetModelUtil.getAttributeValueDescriptor(attribute.type as string) : undefined;// Only RW attributes can be used in actionsdiff --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 c17e9ec1f..18a46fd40 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@@ -52,7 +52,7 @@ const style = css`}.attribute-group > * {- margin: 0 3px 6px;+ margin: 10px 3px 6px 0;}`;@@ -173,11 +173,11 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {${attributeName ? html`<or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrInputChangedEvent) => this.setOperator(assetDescriptor, attribute, attributeName, attributePredicate, e.detail.value)}" .readonly="${this.readonly || false}" .options="${operators}" .value="${operator}" .label="${i18next.t("operator")}"></or-input>` : ``}- ${attributePredicate ? this.attributePredicateValueEditorTemplate(assetDescriptor, attributePredicate) : ``}+ ${attributePredicate ? this.attributePredicateValueEditorTemplate(assetDescriptor, asset, attributePredicate) : ``}`;}- protected attributePredicateValueEditorTemplate(assetDescriptor: AssetDescriptor, attributePredicate: AttributePredicate) {+ protected attributePredicateValueEditorTemplate(assetDescriptor: AssetDescriptor, asset: Asset | undefined, attributePredicate: AttributePredicate) {const valuePredicate = attributePredicate.value;@@ -187,15 +187,17 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {const attributeName = this.getAttributeName(attributePredicate);const assetType = getAssetTypeFromQuery(this.query);- const attributeDescriptor = AssetModelUtil.getAssetAttributeDescriptor(assetDescriptor, attributeName);- const attributeValueDescriptor = attributeDescriptor && attributeDescriptor.valueDescriptor ? typeof attributeDescriptor.valueDescriptor === "string" ? AssetModelUtil.getAttributeValueDescriptor(attributeDescriptor.valueDescriptor as string) : attributeDescriptor.valueDescriptor : undefined;+ const attribute = asset && attributeName ? Util.getAssetAttribute(asset, attributeName) : undefined;+ const attributeDescriptor = AssetModelUtil.getAttributeDescriptor(attributeName, assetDescriptor);+ // TODO: Fix once asset model working correctly+ const attributeValueDescriptor = attributeDescriptor && attributeDescriptor.valueDescriptor ? typeof attributeDescriptor.valueDescriptor === "string" ? AssetModelUtil.getAttributeValueDescriptor(attributeDescriptor.valueDescriptor as string) : attributeDescriptor.valueDescriptor : attribute ? AssetModelUtil.getAttributeValueDescriptor(attribute.type as string) : undefined;// @ts-ignoreconst value = valuePredicate ? valuePredicate.value : undefined;switch (valuePredicate.predicateType) {case "string":- return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("string")}" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;+ return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;case "boolean":return html ``; // Handled by the operator IS_TRUE or IS_FALSEcase "datetime":@@ -208,7 +210,7 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {<or-attribute-input .inputType="${InputType.NUMBER}" @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "rangeValue", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("and")}" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${valuePredicate.rangeValue}" .readonly="${this.readonly || false}"></or-attribute-input>`;}- return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("number")}" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;+ return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;case "string-array":return html `<span>NOT IMPLEMENTED</span>`;case "radial":@@ -224,7 +226,7 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {case "array":// TODO: Update once we can determine inner type of array// Assume string array- return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("array")}" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;+ return html`<or-attribute-input @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="" .assetType="${assetType}" .attributeDescriptor="${attributeDescriptor}" .attributeValueDescriptor="${attributeValueDescriptor}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;default:return html `<span>NOT IMPLEMENTED</span>`;}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 9e863f64f..84f77175f 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@@ -96,7 +96,7 @@ const style = css`#type {white-space: nowrap;text-transform: capitalize;- margin: 4px 3px auto 0;+ margin: 14px 3px auto 0;}`;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 c68a6116d..0a03aafb7 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@@ -47,7 +47,7 @@ const style = css`}or-rule-condition {- margin: 10px 0;+ margin-bottom: 10px;}.rule-group-item > or-icon {