Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Add dismissAction to dialogs, update rules styling, change history graph to line

Doncfe1e0c2549f
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index e5becb56f..3ac8f711b 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -50,6 +50,7 @@
"notContainsKey": "Does not contain key",
"true": "Is true",
"false": "Is false",
+ "radiusMin": "Radius (min. 100m)",
"withinRadius": "Inside circle",
"outsideRadius": "Outside circle",
"withinRectangle": "Inside rectangle",
@@ -189,7 +190,7 @@
"openInBrowser": "Open in browser (for external websites)",
"buttonTextConfirm": "Text for action button",
"buttonTextDecline": "Text for decline button",
- "custom": "Manual input",
+ "custom": "Custom attribute",
"tenant": "Tenant",
"tenant_plural": "Tenants",
"displayName":"Friendly name",
@@ -401,5 +402,6 @@
"createAssetFailed": "Failed to create asset",
"logCategory": {},
"readPermissions": "Read permissions",
- "writePermissions": "Write permissions"
+ "writePermissions": "Write permissions",
+ "valueType": "Value type"
}
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index 755577310..4677fcd25 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -49,6 +49,7 @@
"notContainsKey": "Bevat geen keys",
"true": "Waar",
"false": "Niet waar",
+ "radiusMin": "Straal (min. 100m)",
"withinRadius": "Binnen cirkel",
"outsideRadius": "Buiten cirkel",
"withinRectangle": "Binnen rechthoek",
@@ -189,7 +190,7 @@
"openInBrowser": "Openen in browser (voor externe websites)",
"buttonTextConfirm": "Tekst voor actie knop",
"buttonTextDecline": "Tekst voor negeerknop",
- "custom": "Handmatig input",
+ "custom": "Nieuw attribuut",
"tenant": "Tenant",
"tenant_plural": "Tenants",
"displayName":"Friendly name",
@@ -356,5 +357,6 @@
"fromTo": "Van {{start}} tot {{end}}",
"fromToDays": "van {{start}} tot {{days}} dagen later {{end}}",
"readPermissions": "Leesrechten",
- "writePermissions": "Schrijfrechten"
+ "writePermissions": "Schrijfrechten",
+ "valueType": "Value type"
}
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index 77332fbc3..3cf9d0fa9 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -407,7 +407,8 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
return {
title: title,
- actions: actions
+ actions: actions,
+ dismissAction: null
};
}
}
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 2d27efafd..4bca03cf0 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -597,7 +597,8 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
padding: 0 !important;
}
</style>
- `
+ `,
+ dismissAction: null
}
)
}
diff --git a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
index 92679a6b2..9b13b7d85 100644
--- a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
+++ b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
@@ -61,7 +61,7 @@ export class OrAddAttributePanel extends LitElement {
attributeTypes = [["@custom", i18next.t("custom")], ...attributeTypes];
const attributeValueTypes: [string, string][] = (AssetModelUtil.getAssetTypeInfo(this.asset.type!)?.valueDescriptors || [])
- .sort()
+ .sort(Util.sortByString((descriptor) => descriptor[0]))
.map((descriptor) => {
return [
descriptor,
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.ts
index 052ebe19e..2e0272a40 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
@@ -352,6 +352,10 @@ export class OrEditAssetPanel extends LitElement {
`,
title: i18next.t("addAttribute"),
actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
{
default: true,
actionName: "add",
@@ -360,10 +364,6 @@ export class OrEditAssetPanel extends LitElement {
this._onModified();
},
content: html`<or-input id="add-btn" .type="${InputType.BUTTON}" disabled .label="${i18next.t("add")}"></or-input>`
- },
- {
- actionName: "cancel",
- content: i18next.t("cancel")
}
],
dismissAction: null
@@ -416,6 +416,10 @@ export class OrEditAssetPanel extends LitElement {
`,
title: i18next.t("addMetaItems"),
actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
{
default: true,
actionName: "add",
@@ -436,10 +440,6 @@ export class OrEditAssetPanel extends LitElement {
}
},
content: i18next.t("add")
- },
- {
- actionName: "cancel",
- content: i18next.t("cancel")
}
],
dismissAction: null
@@ -521,7 +521,8 @@ export class OrEditAssetPanel extends LitElement {
height: 100%;
}
</style>
- `
+ `,
+ dismissAction: null
}
);
};
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.ts
index 25bea10eb..9d2c42222 100644
--- a/ui/component/or-attribute-card/src/index.ts
+++ b/ui/component/or-attribute-card/src/index.ts
@@ -341,7 +341,7 @@ export class OrAttributeCard extends LitElement {
["absolute", "Absolute"]
];
- this._dialog.dialogTitle= i18next.t("editDelta");
+ this._dialog.dialogTitle = i18next.t("editDelta");
this._dialog.dialogActions = [
{
@@ -364,10 +364,12 @@ export class OrAttributeCard extends LitElement {
this._dialog.dialogContent = html`
<or-input id="delta-mode-picker" value="${this.deltaFormat}" @or-input-changed="${(evt: OrInputChangedEvent) => {this.deltaFormat = evt.detail.value;this.saveSettings();}}" .type="${InputType.LIST}" .options="${options}"></or-input>
`;
+
+ this._dialog.dismissAction = null;
}
else if (dialogContent === "editCurrentValue") {
- this._dialog.dialogTitle= i18next.t("editCurrentValue");
+ this._dialog.dialogTitle = i18next.t("editCurrentValue");
this._dialog.dialogActions = [
{
@@ -399,10 +401,12 @@ export class OrAttributeCard extends LitElement {
this._dialog.dialogContent = html`
<or-input id="current-value-decimals" .label="${i18next.t("decimals")}" value="${this.mainValueDecimals}" .type="${InputType.TEXT}"></or-input>
`;
+
+ this._dialog.dismissAction = null;
}
else {
- this._dialog.dialogTitle= i18next.t("addAttribute");
+ this._dialog.dialogTitle = i18next.t("addAttribute");
this._dialog.dialogActions = [
{
@@ -438,6 +442,8 @@ export class OrAttributeCard extends LitElement {
.value="${this.attributeName}"></or-input>
` : ``}
`;
+
+ this._dialog.dismissAction = null;
}
}
}
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index 4eea7a7f9..b969438e1 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -109,13 +109,13 @@ const style = css`
--internal-or-attribute-history-graph-fill-color: var(--or-attribute-history-graph-fill-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
--internal-or-attribute-history-graph-fill-opacity: var(--or-attribute-history-graph-fill-opacity, 1);
--internal-or-attribute-history-graph-line-color: var(--or-attribute-history-graph-line-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
- --internal-or-attribute-history-graph-point-color: var(--or-attribute-history-graph-point-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
- --internal-or-attribute-history-graph-point-border-color: var(--or-attribute-history-graph-point-border-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));
- --internal-or-attribute-history-graph-point-radius: var(--or-attribute-history-graph-point-radius, 4);
+ --internal-or-attribute-history-graph-point-color: var(--or-attribute-history-graph-point-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
+ --internal-or-attribute-history-graph-point-border-color: var(--or-attribute-history-graph-point-border-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
+ --internal-or-attribute-history-graph-point-radius: var(--or-attribute-history-graph-point-radius, 2);
--internal-or-attribute-history-graph-point-hit-radius: var(--or-attribute-history-graph-point-hit-radius, 20);
--internal-or-attribute-history-graph-point-border-width: var(--or-attribute-history-graph-point-border-width, 2);
- --internal-or-attribute-history-graph-point-hover-color: var(--or-attribute-history-graph-point-hover-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));
- --internal-or-attribute-history-graph-point-hover-border-color: var(--or-attribute-history-graph-point-hover-border-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
+ --internal-or-attribute-history-graph-point-hover-color: var(--or-attribute-history-graph-point-hover-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
+ --internal-or-attribute-history-graph-point-hover-border-color: var(--or-attribute-history-graph-point-hover-border-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
--internal-or-attribute-history-graph-point-hover-radius: var(--or-attribute-history-graph-point-hover-radius, 4);
--internal-or-attribute-history-graph-point-hover-border-width: var(--or-attribute-history-graph-point-hover-border-width, 2);
@@ -362,7 +362,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
}
this._chart = new Chart(this._chartElem, {
- type: "bar",
+ type: "line",
data: {
datasets: [
{
@@ -377,7 +377,8 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
pointHoverBorderColor: this._style.getPropertyValue("--internal-or-attribute-history-graph-point-hover-border-color"),
pointHoverRadius: Number(this._style.getPropertyValue("--internal-or-attribute-history-graph-point-hover-radius")),
pointHoverBorderWidth: Number(this._style.getPropertyValue("--internal-or-attribute-history-graph-point-hover-border-width")),
- pointHitRadius: Number(this._style.getPropertyValue("--internal-or-attribute-history-graph-point-hit-radius"))
+ pointHitRadius: Number(this._style.getPropertyValue("--internal-or-attribute-history-graph-point-hit-radius")),
+ fill: false
}
]
},
@@ -390,14 +391,9 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
},
tooltips: {
displayColors: false,
- callbacks: {
- label: (tooltipItem, data) => {
- return tooltipItem.yLabel; // Removes the colon before the label
- },
- footer: () => {
- return " "; // Hack the broken vertical alignment of body with footerFontSize: 0
- }
- } as ChartTooltipCallback
+ xPadding: 10,
+ yPadding: 10,
+ titleMarginBottom: 10
},
scales: {
yAxes: [{
@@ -411,6 +407,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
xAxes: [{
type: "time",
time: {
+ tooltipFormat: 'MMM D, YYYY, HH:mm:ss',
displayFormats: {
millisecond: 'HH:mm:ss.SSS',
second: 'HH:mm:ss',
diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.ts
index ad2073634..d34a42e8a 100644
--- a/ui/component/or-attribute-input/src/index.ts
+++ b/ui/component/or-attribute-input/src/index.ts
@@ -54,7 +54,7 @@ declare global {
}
}
-export function getAttributeInputWrapper(content: TemplateResult, value: any, loading: boolean, disabled: boolean, helperText: string | undefined, label: string | undefined, buttonIcon?: string, sendValue?: () => void): TemplateResult {
+export function getAttributeInputWrapper(content: TemplateResult, value: any, loading: boolean, disabled: boolean, helperText: string | undefined, label: string | undefined, buttonIcon?: string, sendValue?: () => void, fullWidth?: boolean): TemplateResult {
if (helperText) {
content = html`
@@ -79,7 +79,7 @@ export function getAttributeInputWrapper(content: TemplateResult, value: any, lo
}
return html`
- <div id="wrapper" class="${buttonIcon === undefined || buttonIcon ? "no-padding" : "right-padding"}">
+ <div id="wrapper" class="${(buttonIcon === undefined || buttonIcon || fullWidth) ? "no-padding" : "right-padding"}">
${content}
<div id="scrim" class="${ifDefined(loading ? undefined : "hidden")}"><progress class="pure-material-progress-circular"></progress></div>
</div>
@@ -345,6 +345,9 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitE
@property({type: Boolean})
public compact: boolean = false;
+ @property({type: Boolean})
+ public fullWidth?: boolean;
+
@property()
protected _attributeEvent?: AttributeEvent;
@@ -563,7 +566,7 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitE
content = html`<or-translate .value="attributeUnsupported"></or-translate>`;
}
- content = getAttributeInputWrapper(content, value, loading, !!this.disabled, this._templateProvider.supportsHelperText ? undefined : helperText, this._templateProvider.supportsLabel ? undefined : this.getLabel(), this._templateProvider.supportsSendButton ? buttonIcon : undefined, () => this._updateValue());
+ content = getAttributeInputWrapper(content, value, loading, !!this.disabled, this._templateProvider.supportsHelperText ? undefined : helperText, this._templateProvider.supportsLabel ? undefined : this.getLabel(), this._templateProvider.supportsSendButton ? buttonIcon : undefined, () => this._updateValue(), this.fullWidth);
return content;
}
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index c34051401..6f26a7b3c 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -650,7 +650,10 @@ export class OrChart extends translate(i18next)(LitElement) {
},
tooltips: {
mode: 'x',
- intersect: false
+ intersect: false,
+ xPadding: 10,
+ yPadding: 10,
+ titleMarginBottom: 10
},
hover: {
mode: 'x',
@@ -668,6 +671,7 @@ export class OrChart extends translate(i18next)(LitElement) {
xAxes: [{
type: "time",
time: {
+ tooltipFormat: 'MMM D, YYYY, HH:mm:ss',
displayFormats: {
quarter: 'MMM YYYY',
minute: "HH:mm",
diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
index e27f1b080..fe3bb60a6 100644
--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
@@ -71,6 +71,7 @@ export class OrRuleNotificationModal extends translate(i18next)(LitElement) {
}
});
dialog.dialogContent = html`${container}`;
+ dialog.dismissAction = null;
this.requestUpdate();
}
}
diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
index e8c8cdb1a..9a9fa870d 100644
--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
@@ -90,7 +90,7 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {
if (dialog) {
dialog.dialogContent = html`
<div style="display:grid">
- <or-map class="or-map" type="VECTOR" style="border: 1px solid #d5d5d5; height: 400px; min-width: 300px;">
+ <or-map class="or-map" type="VECTOR" style="border: 1px solid #d5d5d5; height: 400px; min-width: 300px; margin-bottom: 20px;">
<or-map-marker active color="#FF0000" icon="information" lat="${value.lat}" lng="${value.lng}" radius="${value.radius}"></or-map-marker>
</or-map>
@@ -98,9 +98,8 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {
<input hidden class="location-lng" required placeholder=" " type="text" .value="${value && value.lng ? value.lng : null}" />
<input hidden class="location-lat" required placeholder=" " type="text" .value="${value && value.lat ? value.lat : null}" />
</div>
-
-
- <label>Straal (minimaal 100m)</label>
+
+ <label>${i18next.t("radiusMin")}</label>
<input @change="${(e:any) => this.setValuePredicateProperty("radius", parseInt(e.target.value))}" style="max-width: calc(50% - 30px);" required placeholder=" " min="100" type="number" .value="${value && value.radius ? value.radius : 100}" />
</div>`;
}
@@ -121,13 +120,6 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {
const value:RadialGeofencePredicate = valuePredicate ? valuePredicate : undefined;
const radiusPickerModalActions: DialogAction[] = [
- {
- actionName: "ok",
- default: true,
- content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("ok")}"></or-input>`,
- action: () => {
- }
- },
{
actionName: "cancel",
content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("cancel")}"></or-input>`,
@@ -135,12 +127,20 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {
// Nothing to do here
}
},
+ {
+ actionName: "ok",
+ default: true,
+ content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("ok")}"></or-input>`,
+ action: () => {
+ }
+ }
];
const radialPickerModalOpen = () => {
const dialog: OrMwcDialog = this.shadowRoot!.getElementById("radial-modal") as OrMwcDialog;
if (dialog) {
+ dialog.dismissAction = null;
dialog.open();
this.renderDialogHTML(value);
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.ts
index 182c54288..f9495e808 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
@@ -42,12 +42,17 @@ const style = css`
.attribute-group {
flex-grow: 1;
display: flex;
+ align-items: center;
flex-direction: row;
flex-wrap: wrap;
}
+
+ .min-width {
+ min-width: 140px;
+ }
.attribute-group > * {
- margin: 10px 3px 6px 0;
+ margin: 10px 3px 6px 3px;
}
`;
@@ -169,9 +174,9 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {
const operators = attributeName ? this.getOperators(assetDescriptor, descriptors ? descriptors[0] : undefined, descriptors ? descriptors[1] : undefined, attribute, attributeName) : [];
return html`
- <or-input type="${InputType.SELECT}" @or-input-changed="${(e: OrInputChangedEvent) => this.setAttributeName(attributePredicate, e.detail.value)}" .readonly="${this.readonly || false}" .options="${attributes}" .value="${attributeName}" .label="${i18next.t("attribute")}"></or-input>
+ <or-input type="${InputType.SELECT}" class="min-width" @or-input-changed="${(e: OrInputChangedEvent) => this.setAttributeName(attributePredicate, e.detail.value)}" .readonly="${this.readonly || false}" .options="${attributes}" .value="${attributeName}" .label="${i18next.t("attribute")}"></or-input>
- ${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>` : ``}
+ ${attributeName ? html`<or-input type="${InputType.SELECT}" class="min-width" @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, asset, attributePredicate) : ``}
`;
@@ -196,7 +201,7 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {
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="" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .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="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}" .fullWidth="${true}"></or-attribute-input>`;
case "boolean":
return html ``; // Handled by the operator IS_TRUE or IS_FALSE
case "datetime":
@@ -204,14 +209,14 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {
case "number":
if (valuePredicate.operator === AQO.BETWEEN) {
return html`
- <or-attribute-input .inputType="${InputType.NUMBER}" @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("between")}" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>
+ <or-attribute-input .inputType="${InputType.NUMBER}" @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="${i18next.t("between")}" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}" .fullWidth="${true}"></or-attribute-input>
<span style="display: inline-flex; align-items: center;">&</span>
- <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="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${valuePredicate.rangeValue}" .readonly="${this.readonly || false}"></or-attribute-input>
+ <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="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${valuePredicate.rangeValue}" .readonly="${this.readonly || false}" .fullWidth="${true}"></or-attribute-input>
`;
}
let inputType;
if(descriptors[0]?.format?.asSlider) inputType = InputType.NUMBER;
- return html`<or-attribute-input .inputType="${ifDefined(inputType)}" @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}"></or-attribute-input>`;
+ return html`<or-attribute-input .inputType="${ifDefined(inputType)}" @or-attribute-input-changed="${(ev: OrAttributeInputChangedEvent) => this.setValuePredicateProperty(valuePredicate, "value", ev.detail.value)}" .customProvider="${this.config?.inputProvider}" .label="" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}" .fullWidth="${true}"></or-attribute-input>`;
case "radial":
return html`<or-rule-radial-modal .query="${this.query}" .assetDescriptor="${assetDescriptor}" .attributePredicate="${attributePredicate}"></or-rule-radial-modal>`;
case "rect":
@@ -223,7 +228,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="" .assetType="${assetType}" .attributeDescriptor="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .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="${descriptors[0]}" .attributeValueDescriptor="${descriptors[1]}" .value="${value}" .readonly="${this.readonly || false}" .fullWidth="${true}></or-attribute-input>`;
default:
return html `<span>NOT IMPLEMENTED</span>`;
}
diff --git a/ui/component/or-rules/src/or-rule-validity.ts b/ui/component/or-rules/src/or-rule-validity.ts
index dee278513..5d7c0c646 100644
--- a/ui/component/or-rules/src/or-rule-validity.ts
+++ b/ui/component/or-rules/src/or-rule-validity.ts
@@ -253,7 +253,8 @@ export class OrRuleValidity extends translate(i18next)(LitElement) {
}
},
],
- content: this.getDialogContent()
+ content: this.getDialogContent(),
+ dismissAction: null
});
}