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: bring rules UI into line with asset UI and various other improvements
Rich Turner8fde9a46df87
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 8b6f196ed..c78cc465c 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -62,8 +62,11 @@"valueChanges": "Value changes","save": "Save","active": "Active",- "continueWithoutSaving": "If you continue, your changes will not be saved. Continue without saving?",- "confirmDelete": "Are you sure you want to delete?",+ "deleteRulesetsConfirm": "Remove ruleset(s)?",+ "deleteRulesetsFailed": "Failed to delete one or more requested rulesets(s)",+ "saveRulesetFailed": "Failed to save ruleset",+ "rulesetModified": "Ruleset modified",+ "confirmContinueRulesetModified": "Ruleset has been modified, discard changes?","when": "When","then": "Then","orWhen": "Or when",@@ -79,7 +82,7 @@"status": "Status","name": "Name","deleteAssetsConfirm": "Remove asset(s) and all descendant assets?",- "deleteFailed": "Failed to delete requested asset(s)",+ "deleteAssetsFailed": "Failed to delete requested asset(s)","ok": "OK","cancel": "Cancel","createdOn": "Created on",@@ -287,7 +290,7 @@"parent": "Parent","none": "None","properties": "Properties",- "metaItemType": {+ "metaItemTypes": {"urn:openremote:asset:meta:label": "Label","urn:openremote:asset:meta:description": "Description","urn:openremote:asset:meta:storeDataPoints": "Store data points",@@ -321,7 +324,14 @@"addMetaItems": "Add configuration items","assetModified": "Asset modified","confirmContinueAssetModified": "Asset has been modified, discard changes?",+ "saveAssetFailed": "Failed to save asset","noCommand": "No command","start": "Start",- "stop": "Stop"+ "stop": "Stop",+ "assetTypes": {+ "noDescription": "No description available",+ "urn:openremote:protocol:knx": {+ "description": "Protocol for connecting to a KNX"+ }+ }}diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.javaindex 0a473f8e5..f85692844 100644--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java@@ -19,10 +19,9 @@*/package org.openremote.model.asset;-import com.fasterxml.jackson.annotation.JsonFormat;-import com.fasterxml.jackson.annotation.JsonIgnore;-import com.fasterxml.jackson.annotation.JsonProperty;+import com.fasterxml.jackson.annotation.*;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;+import org.openremote.model.asset.agent.AgentDescriptorImpl;import org.openremote.model.attribute.AttributeDescriptor;import java.util.Arrays;diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.javaindex 5a06cf5d0..c5167e285 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java@@ -19,14 +19,23 @@*/package org.openremote.model.asset.agent;+import com.fasterxml.jackson.annotation.JsonFormat;+import com.fasterxml.jackson.annotation.JsonProperty;+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import org.openremote.model.asset.AssetDescriptor;+@JsonFormat(shape = JsonFormat.Shape.OBJECT)+@JsonDeserialize(as = AgentDescriptorImpl.class)public interface AgentDescriptor extends AssetDescriptor {+ @JsonPropertyboolean hasInstanceDiscovery();+ @JsonPropertyboolean hasAssetDiscovery();+ @JsonPropertyboolean hasInstanceImport();+ @JsonPropertyboolean hasAssetImport();}diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.javaindex c1539ea87..76348cca0 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.java@@ -19,6 +19,7 @@*/package org.openremote.model.asset.agent;+import com.fasterxml.jackson.annotation.JsonIgnore;import org.openremote.model.asset.AssetDescriptorImpl;import org.openremote.model.attribute.AttributeDescriptor;@@ -38,6 +39,7 @@ public class AgentDescriptorImpl extends AssetDescriptorImpl implements AgentDesreturn instanceDiscovery;}+ @JsonIgnorepublic AgentDescriptorImpl setInstanceDiscovery(boolean instanceDiscovery) {this.instanceDiscovery = instanceDiscovery;return this;@@ -48,6 +50,7 @@ public class AgentDescriptorImpl extends AssetDescriptorImpl implements AgentDesreturn false;}+ @JsonIgnorepublic AgentDescriptorImpl setInstanceImport(boolean instanceImport) {this.instanceImport = instanceImport;return this;@@ -58,6 +61,7 @@ public class AgentDescriptorImpl extends AssetDescriptorImpl implements AgentDesreturn false;}+ @JsonIgnorepublic AgentDescriptorImpl setAssetDiscovery(boolean assetDiscovery) {this.assetDiscovery = assetDiscovery;return this;@@ -68,6 +72,7 @@ public class AgentDescriptorImpl extends AssetDescriptorImpl implements AgentDesreturn false;}+ @JsonIgnorepublic AgentDescriptorImpl setAssetImport(boolean assetImport) {this.assetImport = assetImport;return this;diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.tsindex 1c88f9fb3..efeca5d46 100644--- a/ui/app/or-app/src/index.ts+++ b/ui/app/or-app/src/index.ts@@ -336,8 +336,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {deferred.resolve({cancel: false,username: u,- password: p,- closeCallback: () => { dialog.close(); }+ password: p});},content: html`<or-input .type=${InputType.BUTTON} .label="${i18next.t("submit")}" raised></or-input>`diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 98115e8ad..45b6ceeef 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -5,11 +5,14 @@ import {OrAssetViewer,OrAssetViewerEditToggleEvent,OrAssetViewerRequestEditToggleEvent,+ OrAssetViewerSaveEvent,ViewerConfig} from "@openremote/or-asset-viewer";import {AssetTreeConfig,OrAssetTree,+ OrAssetTreeAddEvent,+ OrAssetTreeAssetEvent,OrAssetTreeRequestSelectionEvent,OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";@@ -17,8 +20,9 @@ import {DefaultBoxShadow, Util} from "@openremote/core";import {AppStateKeyed} from "../app";import {Page, router} from "../types";import {EnhancedStore} from "@reduxjs/toolkit";-import {showDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import i18next from "i18next";+import {AssetEventCause} from "@openremote/model";export interface PageAssetsConfig {viewer?: ViewerConfig;@@ -106,16 +110,21 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {@query("#viewer")protected _viewer!: OrAssetViewer;+ protected _addedAssetId?: string;+get name(): string {return "assets";}constructor(store: EnhancedStore<S>) {super(store);- this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onTreeSelectionChanged);- this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onTreeSelectionRequested);- this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onViewerEditToggleRequested);+ this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onAssetSelectionRequested);+ this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onAssetSelectionChanged);+ this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onEditToggleRequested);this.addEventListener(OrAssetViewerEditToggleEvent.NAME, this._onEditToggle);+ this.addEventListener(OrAssetTreeAddEvent.NAME, this._onAssetAdd);+ this.addEventListener(OrAssetViewerSaveEvent.NAME, this._onAssetSave);+ this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);}protected render(): TemplateResult | void {@@ -131,9 +140,7 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {this._assetIds = state.app.params && state.app.params.id ? [state.app.params.id as string] : undefined;}- protected _onTreeSelectionRequested(event: OrAssetTreeRequestSelectionEvent) {-- // Block the navigation if current asset is modified then show dialog then navigate+ protected _onAssetSelectionRequested(event: OrAssetTreeRequestSelectionEvent) {const isModified = this._viewer.isModified();if (!isModified) {@@ -144,23 +151,32 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {event.detail.allow = false;this._confirmContinue(() => {- if (Util.objectsEqual(event.detail.detail.newNodes, event.detail.detail.oldNodes)) {+ const nodes = event.detail.detail.newNodes;++ if (Util.objectsEqual(nodes, event.detail.detail.oldNodes)) {// User has clicked the same node so let's force reload itthis._viewer.reloadAsset();} else {- this._assetIds = event.detail.detail.newNodes.map((node) => node.asset.id!);+ this._assetIds = nodes.map((node) => node.asset.id!);+ this._viewer.assetId = nodes.length === 1 ? nodes[0].asset!.id : undefined;+ this._updateRoute(true);}});}- protected _onTreeSelectionChanged(event: OrAssetTreeSelectionEvent) {+ protected _onAssetSelectionChanged(event: OrAssetTreeSelectionEvent) {const nodes = event.detail.newNodes;- this._assetIds = event.detail.newNodes.map((node) => node.asset.id!);+ const newIds = event.detail.newNodes.map((node) => node.asset.id!);+ if (Util.objectsEqual(newIds, this._assetIds)) {+ return;+ }++ this._assetIds = newIds;this._viewer.assetId = nodes.length === 1 ? nodes[0].asset!.id : undefined;this._updateRoute(true);}- protected _onViewerEditToggleRequested(event: OrAssetViewerRequestEditToggleEvent) {+ protected _onEditToggleRequested(event: OrAssetViewerRequestEditToggleEvent) {// Block the request if current asset is modified then show dialog then navigateconst isModified = this._viewer.isModified();@@ -182,29 +198,40 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {protected _confirmContinue(action: () => void) {if (this._viewer.isModified()) {- showDialog(- {- content: html`<p>${i18next.t("confirmContinueAssetModified")}</p>`,- actions: [- {- actionName: "ok",- content: "ok",- action: action- },- {- actionName: "cancel",- content: "cancel",- default: true- }- ],- title: "assetModified"- }- )+ showOkCancelDialog(i18next.t("assetModified"), i18next.t("confirmContinueAssetModified"))+ .then((ok) => {+ if (ok) {+ action();+ }+ });} else {action();}}+ protected _onAssetAdd(ev: OrAssetTreeAddEvent) {+ // Load the asset into the viewer and ensure we're in edit mode+ this._viewer.asset = ev.detail.asset;+ this._editMode = true;+ this._updateRoute(true);+ }++ protected _onAssetSave(ev: OrAssetViewerSaveEvent) {+ if (ev.detail.success && ev.detail.isNew) {+ this._addedAssetId = ev.detail.asset.id!;+ }+ }++ protected _onAssetTreeAssetEvent(ev: OrAssetTreeAssetEvent) {+ // Check if the new asset just saved has been created in the asset tree and if so select it+ if (ev.detail.cause === AssetEventCause.CREATE && this._addedAssetId) {+ if (this._addedAssetId === ev.detail.asset.id) {+ this._assetIds = [ev.detail.asset.id];+ this._addedAssetId = undefined;+ }+ }+ }+protected _updateRoute(silent: boolean = true) {if (silent) {router.pause();diff --git a/ui/component/core/src/asset-mixin.ts b/ui/component/core/src/asset-mixin.tsindex 357950f37..cf3e6c57b 100644--- a/ui/component/core/src/asset-mixin.ts+++ b/ui/component/core/src/asset-mixin.ts@@ -2,6 +2,7 @@import {EventProviderFactory, EventProviderStatus} from "./event";import {objectsEqual} from "./util";import {AttributeRef, SharedEvent, EventRequestResponseWrapper} from "@openremote/model";+import { Util } from ".";declare type Constructor<T = {}> = new (...args: any[]) => T;@@ -102,19 +103,23 @@ export const subscribe = (eventProviderFactory: EventProviderFactory) => <T extepublic async _addEventSubscriptions(): Promise<void> {const isAttributes = !!this._attributeRefs;const ids: string[] | AttributeRef[] | undefined = this._attributeRefs ? this._attributeRefs : this._assetIds;- this._subscriptionIds = [];if (ids && ids.length > 0) {+ this._subscriptionIds = [];+if (!isAttributes) {const assetSubscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAssetEvents(ids, true, (event) => this._onEvent(event));- if (!this._subscriptionIds) {+ // Check if the same IDs are in place+ const currentIds: string[] | AttributeRef[] | undefined = this._attributeRefs ? this._attributeRefs : this._assetIds;+ if (!this._subscriptionIds || !Util.objectsEqual(ids, currentIds)) {eventProviderFactory.getEventProvider()!.unsubscribe(assetSubscriptionId);return;}this._subscriptionIds.push(assetSubscriptionId);}const subscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAttributeEvents(ids, isAttributes, (event) => this._onEvent(event));- if (!this._subscriptionIds) {+ const currentIds: string[] | AttributeRef[] | undefined = this._attributeRefs ? this._attributeRefs : this._assetIds;+ if (!this._subscriptionIds || !Util.objectsEqual(ids, currentIds)) {eventProviderFactory.getEventProvider()!.unsubscribe(subscriptionId);} else {this._subscriptionIds.push(subscriptionId);diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 7aab062f4..9db034e51 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -16,7 +16,8 @@ import {Role,Attribute,ConsoleAppConfig,- AssetType+ AssetType,+ AgentDescriptor} from "@openremote/model";import * as Util from "./util";import orIconSet from "./or-icon-set";@@ -98,7 +99,6 @@ export interface BasicLoginResult {username: string;password: string;cancel: boolean;- closeCallback: undefined | ((authenticated: boolean) => void);}export enum MapType {@@ -172,15 +172,15 @@ export class ORIconSets {return undefined;}- let parts = (icon || "").split(":");- let iconName = parts.pop();- let iconSetName = parts.pop() || DEFAULT_ICONSET;+ const parts = (icon || "").split(":");+ const iconName = parts.pop();+ const iconSetName = parts.pop() || DEFAULT_ICONSET;if (!iconSetName || iconSetName === "" || !iconName || iconName === "") {return;}- let iconSet = IconSets.getIconSet(iconSetName);- //iconName = iconName.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });+ const iconSet = IconSets.getIconSet(iconSetName);+ // iconName = iconName.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });if (!iconSet || !iconSet.icons.hasOwnProperty(iconName)) {return;@@ -206,11 +206,16 @@ export class ORIconSets {export class AssetModelUtil {+ public static _agentDescriptors: AgentDescriptor[] = [];public static _assetDescriptors: AssetDescriptor[] = [];public static _attributeDescriptors: AttributeDescriptor[] = [];public static _attributeValueDescriptors: AttributeValueDescriptor[] = [];public static _metaItemDescriptors: MetaItemDescriptor[] = [];+ public static getAgentDescriptors(): AgentDescriptor[] {+ return [...this._agentDescriptors];+ }+public static getAssetDescriptors(): AssetDescriptor[] {return [...this._assetDescriptors];}@@ -711,7 +716,7 @@ export class Manager implements EventProviderFactory {fallbackNS: "or",ns: this.config.loadTranslations,interpolation: {- format: function(value, format, lng) {+ format: (value, format, lng) => {if (format === "uppercase") return value.toUpperCase();if (value instanceof Date) {return moment(value).format(format);@@ -761,6 +766,7 @@ export class Manager implements EventProviderFactory {const attributeValueDescriptorResponse = await rest.api.AssetModelResource.getAttributeValueDescriptors();const metaItemDescriptorResponse = await rest.api.AssetModelResource.getMetaItemDescriptors();+ AssetModelUtil._agentDescriptors = agentDescriptorResponse.data;AssetModelUtil._assetDescriptors = assetDescriptorResponse.data;AssetModelUtil._attributeDescriptors = attributeDescriptorResponse.data;AssetModelUtil._attributeValueDescriptors = attributeValueDescriptorResponse.data;@@ -855,7 +861,7 @@ export class Manager implements EventProviderFactory {protected async doConsoleInit(): Promise<boolean> {try {- let orConsole = new Console(this._config.realm, this._config.consoleAutoEnable!, () => {+ const orConsole = new Console(this._config.realm, this._config.consoleAutoEnable!, () => {this._emitEvent(OREvent.CONSOLE_READY);});@@ -945,8 +951,7 @@ export class Manager implements EventProviderFactory {let result: BasicLoginResult = {username: this._config.credentials ? this._config.credentials.username : "",password: this._config.credentials ? this._config.credentials.password : "",- cancel: false,- closeCallback: undefined+ cancel: false};let authenticated = false;@@ -961,9 +966,6 @@ export class Manager implements EventProviderFactory {if (result.cancel) {console.log("Basic authentication cancelled by user");- if (result.closeCallback) {- result.closeCallback(false);- }break;}@@ -997,10 +999,6 @@ export class Manager implements EventProviderFactory {}this._setAuthenticated(authenticated);-- if (result.closeCallback) {- result.closeCallback(authenticated);- }}public isSuperUser() {@@ -1014,7 +1012,7 @@ export class Manager implements EventProviderFactory {}public getAppName(): string {- let pathArr = location.pathname.split('/');+ const pathArr = location.pathname.split('/');return pathArr.length >= 1 ? pathArr[1] : "";}@@ -1191,7 +1189,7 @@ export class Manager implements EventProviderFactory {protected _emitEvent(event: OREvent) {window.setTimeout(() => {- let listeners = this._listeners.slice();+ const listeners = this._listeners.slice();for (const listener of listeners) {listener(event);}diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.tsindex b327268b7..aa9295cdb 100644--- a/ui/component/core/src/util.ts+++ b/ui/component/core/src/util.ts@@ -274,7 +274,7 @@ export function capitaliseFirstLetter(str: string | undefined) {if (!str) {return;}- if (str.length == 1) {+ if (str.length === 1) {return str.toUpperCase();}return str.charAt(0).toUpperCase() + str.slice(1);@@ -371,7 +371,7 @@ export function getAttributeLabel(attribute: Attribute | undefined, descriptor:}export function getMetaItemLabel(urn: string): string {- return i18next.t(["metaItemType." + urn, urn], {nsSeparator: "@"});+ return i18next.t(["metaItemTypes." + urn, urn], {nsSeparator: "@"});}export function getAssetTypeLabel(type: string | AssetDescriptor | undefined): string {@@ -381,7 +381,7 @@ export function getAssetTypeLabel(type: string | AssetDescriptor | undefined): sif (!type) {return "";}- return i18next.t("assetType." + type.type, {nsSeparator: "@", defaultValue: capitaliseFirstLetter(type.name!.toLowerCase())});+ return i18next.t("assetType." + type.type, {nsSeparator: "@", defaultValue: capitaliseFirstLetter(type.name!.replace(/_/g, " ").toLowerCase())});}export function getAttributeValueFormat(attribute: Attribute | undefined, descriptor: AttributeDescriptor | undefined, valueDescriptor: AttributeValueDescriptor | undefined): string | undefined {@@ -466,13 +466,17 @@ export function sortByString<T>(valueExtractor: (item: T) => string): (a: T, b:return (a,b) => {const v1 = valueExtractor(a);const v2 = valueExtractor(b);- if (v1 > v2) {++ if (!v1 && !v2) {+ return 0;+ }+ if (v1 && !v2) {return 1;}- if (v1 < v2) {+ if (!v1 && v2) {return -1;}- return 0;+ return v1.localeCompare(v2);};}@@ -481,13 +485,12 @@ export interface RequestEventDetail<T> {detail: T;}-export function dispatchCancellableEvent<T>(target: EventTarget, event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void, cancelledHandler?: () => void) {+export function dispatchCancellableEvent<T>(target: EventTarget, event: CustomEvent<RequestEventDetail<T>>) {+ const deferred = new Deferred<RequestEventDetail<T>>();target.dispatchEvent(event);window.setTimeout(() => {- if (event.detail.allow) {- handler(event.detail.detail);- } else if (cancelledHandler) {- cancelledHandler();- }+ deferred.resolve(event.detail);});++ return deferred.promise;}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 0e9c5e175..34b8ed163 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -1,21 +1,32 @@-import {customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";-import {styleMap} from "lit-html/directives/style-map";+import {customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";import "@openremote/or-input";import "@openremote/or-icon";-import {Asset, AssetQuery, AssetTreeNode, ClientRole, SharedEvent, AssetsEvent, AssetEvent, AssetEventCause, AssetDescriptor, AssetType} from "@openremote/model";+import {+ AgentDescriptor,+ Asset,+ AssetDescriptor,+ AssetEvent,+ AssetEventCause,+ AssetQuery,+ AssetsEvent,+ AssetTreeNode,+ ClientRole,+ SharedEvent+} from "@openremote/model";import "@openremote/or-translate";import {style} from "./style";-import manager, {AssetModelUtil, Util, OREvent, EventCallback, subscribe} from "@openremote/core";-import {InputType, OrInputChangedEvent} from "@openremote/or-input";+import manager, {AssetModelUtil, EventCallback, OREvent, subscribe, Util} from "@openremote/core";+import {InputType, OrInput} from "@openremote/or-input";import Qs from "qs";-import {getAssetDescriptorIconTemplate, OrIcon} from "@openremote/or-icon";+import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";import "@openremote/or-mwc-components/dist/or-mwc-menu";import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";import "@openremote/or-mwc-components/dist/or-mwc-list";-import {ListItem, OrMwcListChangedEvent} from "@openremote/or-mwc-components/dist/or-mwc-list";-import {i18next, OrTranslate} from "@openremote/or-translate";+import {i18next} from "@openremote/or-translate";import "@openremote/or-mwc-components/dist/or-mwc-dialog";-import {showDialog, showErrorDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {OrMwcDialog, showDialog, showErrorDialog, showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {OrAddAssetDialog, OrAddChangedEvent} from "./or-add-asset-dialog";+import "./or-add-asset-dialog";export interface AssetTreeTypeConfig {include?: string[];@@ -25,11 +36,10 @@ export interface AssetTreeTypeConfig {export interface AssetTreeConfig {select?: {multiSelect?: boolean;- interceptor?: (node: UiAssetTreeNode | null) => boolean;types?: string[];};add?: {- typesProvider?: (parent: UiAssetTreeNode | undefined) => AssetDescriptor[] | undefined;+ typesProvider?: (parent: UiAssetTreeNode | undefined) => [AgentDescriptor[], AssetDescriptor[]] | undefined;typesParent?: {default?: AssetTreeTypeConfig;none?: AssetTreeTypeConfig;@@ -46,7 +56,7 @@ export interface UiAssetTreeNode extends AssetTreeNode {children: UiAssetTreeNode[];}-interface NodeSelectEventDetail {+export interface NodeSelectEventDetail {oldNodes: UiAssetTreeNode[];newNodes: UiAssetTreeNode[];}@@ -55,7 +65,7 @@ export {style};export class OrAssetTreeRequestSelectionEvent extends CustomEvent<Util.RequestEventDetail<NodeSelectEventDetail>> {- public static readonly NAME = "or-asset-tree-request-select";+ public static readonly NAME = "or-asset-tree-request-selection";constructor(request: NodeSelectEventDetail) {super(OrAssetTreeRequestSelectionEvent.NAME, {@@ -71,7 +81,7 @@ export class OrAssetTreeRequestSelectionEvent extends CustomEvent<Util.RequestEvexport class OrAssetTreeSelectionEvent extends CustomEvent<NodeSelectEventDetail> {- public static readonly NAME = "or-asset-tree-selection-changed";+ public static readonly NAME = "or-asset-tree-selection";constructor(detail: NodeSelectEventDetail) {super(OrAssetTreeSelectionEvent.NAME, {@@ -83,24 +93,21 @@ export class OrAssetTreeSelectionEvent extends CustomEvent<NodeSelectEventDetail}export type AddEventDetail = {+ sourceAsset?: Asset;asset: Asset;- isCopy: boolean;}export class OrAssetTreeRequestAddEvent extends CustomEvent<Util.RequestEventDetail<AddEventDetail>> {public static readonly NAME = "or-asset-tree-request-add";- constructor(asset: Asset, isCopy: boolean = false) {+ constructor(detail: AddEventDetail) {super(OrAssetTreeRequestAddEvent.NAME, {bubbles: true,composed: true,detail: {allow: true,- detail: {- asset: asset,- isCopy: isCopy- }+ detail: detail}});}@@ -110,14 +117,11 @@ export class OrAssetTreeAddEvent extends CustomEvent<AddEventDetail> {public static readonly NAME = "or-asset-tree-add";- constructor(asset: Asset, isCopy: boolean = false) {- super(OrAssetTreeRequestAddEvent.NAME, {+ constructor(detail: AddEventDetail) {+ super(OrAssetTreeAddEvent.NAME, {bubbles: true,composed: true,- detail: {- asset: asset,- isCopy: isCopy- }+ detail: detail});}}@@ -138,30 +142,28 @@ export class OrAssetTreeRequestDeleteEvent extends CustomEvent<Util.RequestEvent}}-export class OrAssetTreeRequestCopyEvent extends CustomEvent<Util.RequestEventDetail<UiAssetTreeNode>> {+export class OrAssetTreeAssetEvent extends CustomEvent<AssetEvent> {- public static readonly NAME = "or-asset-tree-request-copy";+ public static readonly NAME = "or-asset-tree-asset-event";- constructor(request: UiAssetTreeNode) {- super(OrAssetTreeRequestCopyEvent.NAME, {+ constructor(assetEvent: AssetEvent) {+ super(OrAssetTreeAssetEvent.NAME, {bubbles: true,composed: true,- detail: {- allow: true,- detail: request- }+ detail: assetEvent});}}+declare global {export interface HTMLElementEventMap {[OrAssetTreeRequestSelectionEvent.NAME]: OrAssetTreeRequestSelectionEvent;+ [OrAssetTreeSelectionEvent.NAME]: OrAssetTreeSelectionEvent;[OrAssetTreeRequestAddEvent.NAME]: OrAssetTreeRequestAddEvent;[OrAssetTreeAddEvent.NAME]: OrAssetTreeAddEvent;[OrAssetTreeRequestDeleteEvent.NAME]: OrAssetTreeRequestDeleteEvent;- [OrAssetTreeRequestCopyEvent.NAME]: OrAssetTreeRequestCopyEvent;- [OrAssetTreeSelectionEvent.NAME]: OrAssetTreeSelectionEvent;+ [OrAssetTreeAssetEvent.NAME]: OrAssetTreeAssetEvent;}}@@ -184,6 +186,10 @@ export const getAssetTypes = async () => {}}+export function getDefaultAllowedAddAssetTypes(): [AgentDescriptor[], AssetDescriptor[]] {+ return [AssetModelUtil.getAgentDescriptors(), AssetModelUtil.getAssetDescriptors()];+}+@customElement("or-asset-tree")export class OrAssetTree extends subscribe(manager)(LitElement) {@@ -237,7 +243,6 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {protected _connected: boolean = false;protected _selectedNodes: UiAssetTreeNode[] = [];protected _initCallback?: EventCallback;- protected _addedAssetId?: string;public get selectedNodes(): UiAssetTreeNode[] {return this._selectedNodes ? [...this._selectedNodes] : [];@@ -265,6 +270,11 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {manager.removeListener(this.onManagerEvent);}+ public refresh() {+ // Clear nodes to re-fetch them+ this._nodes = undefined;+ }+protected onManagerEvent = (event: OREvent) => {switch (event) {case OREvent.DISPLAY_REALM_CHANGED:@@ -408,9 +418,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {} else {let canSelect = true;- if (this.config && this.config.select && this.config.select.interceptor) {- canSelect = this.config.select.interceptor(node);- } else if (node && this.config && this.config.select?.types) {+ if (node && this.config && this.config.select?.types) {canSelect = this.config.select.types.indexOf(node.asset!.type!) >= 0;}@@ -421,10 +429,9 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {let selectedNodes: UiAssetTreeNode[] = [];if (node) {- const index = this.selectedIds ? this.selectedIds.indexOf(node.asset!.id!) : -1;+ const index = this.selectedNodes.indexOf(node);let select = true;let deselectOthers = true;-const multiSelect = !this._isReadonly() && (!this.config || !this.config.select || !this.config.select.multiSelect);if (multiSelect && evt && (evt.ctrlKey || evt.metaKey)) {@@ -450,7 +457,11 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {Util.dispatchCancellableEvent(this, new OrAssetTreeRequestSelectionEvent({oldNodes: this.selectedNodes,newNodes: selectedNodes- }), (detail) => this.selectedNodes = detail.newNodes);+ })).then((detail) => {+ if (detail.allow) {+ this.selectedNodes = detail.detail.newNodes+ }+ });}}@@ -458,66 +469,70 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {this._onNodeClicked(null, null);}- protected _onCopyClicked() {- if (this._selectedNodes.length > 0) {- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestCopyEvent(this._selectedNodes[0]), () => this._doCopy());+ protected async _onCopyClicked() {+ if (this._selectedNodes.length !== 1) {+ return;}- }- protected _onDeleteClicked() {- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestDeleteEvent(this._selectedNodes), () => this._doDelete());+ try {+ // Need to fully load the source asset+ const response = await manager.rest.api.AssetResource.get(this._selectedNodes[0].asset!.id!);+ if (!response.data) {+ throw new Error("API returned an invalid response when retrieving the source asset");+ }+ const asset = JSON.parse(JSON.stringify(response.data)) as Asset;+ asset.name += " copy";+ delete asset.id;+ delete asset.path;+ delete asset.createdOn;+ delete asset.version;++ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestAddEvent(+ {+ sourceAsset: this._selectedNodes[0].asset!,+ asset: asset+ })).then((detail) => {+ if (detail.allow) {+ this.dispatchEvent(new OrAssetTreeAddEvent(detail.detail));+ }+ });+ } catch (e) {+ console.error("Failed to copy asset", e);+ showErrorDialog("Failed to copy asset");+ }}protected _onAddClicked() {- const listItems: ListItem[] = this._getAllowedChildTypes(this._selectedNodes[0])- .sort(Util.sortByString((descriptor) => descriptor.name!))- .map((descriptor) => {- return {- styleMap: {- "--or-icon-fill": descriptor.color ? "#" + descriptor.color : "unset"- },- icon: descriptor.icon,- text: i18next.t(descriptor.name!, {defaultValue: descriptor.name!.replace(/_/g, " ").toLowerCase()}),- value: descriptor.type!,- data: descriptor- }- });-- let descriptor: AssetDescriptor;+ const types = this._getAllowedChildTypes(this._selectedNodes[0]);+ let dialog: OrMwcDialog;+ const parent = this._selectedNodes && this._selectedNodes.length === 1 ? this._selectedNodes[0].asset : undefined;- const onAssetTypeChanged = (listItem: ListItem) => {- descriptor = listItem.data as AssetDescriptor;- const icon = dialog.shadowRoot!.getElementById("type-icon") as OrIcon;- const description = dialog.shadowRoot!.getElementById("type-description") as OrTranslate;- icon.icon = descriptor.icon;- description.value = listItem.text;+ const onAddChanged = (ev: OrAddChangedEvent) => {+ const addBtn = dialog.shadowRoot!.getElementById("add-btn") as OrInput;+ addBtn.disabled = !ev.detail.descriptor || !ev.detail.name;};- const dialog = showDialog(+ dialog = showDialog({title: i18next.t("addAsset"),content: html`- <form id="mdc-dialog-form-add">- <div id="type-list">- <or-mwc-list @or-mwc-list-changed="${(evt: OrMwcListChangedEvent) => onAssetTypeChanged(evt.detail[0] as ListItem)}" .listItems="${listItems}" id="menu"></or-mwc-list>- </div>- <div id="asset-type-option-container">- <or-icon id="type-icon" class="hidden"></or-icon>- <or-translate id="type-description" class="hidden"></or-translate>- </div>- </form>`,+ <or-add-asset-dialog id="add-panel" .config="${this.config}" .agentTypes="${types[0]}" .assetTypes="${types[1]}" .parent="${parent}" @or-add-asset-changed="${onAddChanged}"></or-add-asset-dialog>+ `,actions: [{actionName: "cancel",- content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("cancel")}"></or-input>`+ content: i18next.t("cancel")},{- actionName: "yes",+ actionName: "add",default: true,- content: html`<or-input class="button" .type="${InputType.BUTTON}" label="${i18next.t("add")}" data-mdc-dialog-action="yes"></or-input>`,+ content: html`<or-input id="add-btn" class="button" .type="${InputType.BUTTON}" label="${i18next.t("add")}" disabled></or-input>`,action: () => {- // TODO change this to open edit page++ const addAssetDialog = dialog.shadowRoot!.getElementById("add-panel") as OrAddAssetDialog;+ const descriptor = addAssetDialog.selectedType;+if (!descriptor) {return;}@@ -528,32 +543,24 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {realm: manager.getRealm()};if(this.selectedIds) {- asset['parentId'] = this.selectedIds[0];+ asset["parentId"] = this.selectedIds[0];}- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestAddEvent(asset), () => this._doAdd(asset));+ const detail: AddEventDetail = {+ asset: asset+ };+ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestAddEvent(detail))+ .then((detail) => {+ if (detail.allow) {+ this.dispatchEvent(new OrAssetTreeAddEvent(detail.detail));+ }+ });}}],styles: html`<style>- #mdc-dialog-form-add {- display: flex;- height:400px;- border-top: 1px solid var(--or-app-color2);- }- #asset-type-option-container {- background-color: var(--or-app-color2);- padding: 15px;- width: 260px;- max-width: 100%;- font-size: 16px;- }- #type-list {- overflow-y: scroll;- text-transform: capitalize;- }- .hidden {- visibility: hidden;+ .mdc-dialog__content {+ padding: 0 !important;}</style>`@@ -561,6 +568,17 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {)}+ protected _onDeleteClicked() {+ if (this._selectedNodes.length > 0) {+ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestDeleteEvent(this._selectedNodes))+ .then((detail) => {+ if (detail.allow) {+ this._doDelete();+ }+ });+ }+ }+protected _onSearchClicked() {}@@ -590,35 +608,26 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {paramsSerializer: params => Qs.stringify(params, {arrayFormat: 'repeat'})}).then((response) => {// Clear nodes to re-fetch them- this._nodes = undefined;+ this.refresh();this.disabled = false;if (response.status !== 204) {- showErrorDialog(i18next.t("deleteFailed"));+ showErrorDialog(i18next.t("deleteAssetsFailed"));}}).catch((reason) => {- // Clear nodes to re-fetch them- this._nodes = undefined;+ this.refresh();this.disabled = false;- showErrorDialog(i18next.t("deleteFailed"));+ showErrorDialog(i18next.t("deleteAssetsFailed"));});};// Confirm deletion request- showDialog({- content: html`<or-translate value="deleteAssetsConfirm"></or-translate>`,- actions: [- {- content: i18next.t("ok"),- actionName: "ok",- action: () => doDelete()- },- {- content: i18next.t("cancel"),- actionName: "cancel"+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteAssetsConfirm"))+ .then((ok) => {+ if (ok) {+ doDelete();}- ]- });+ });}protected _canAdd(): boolean {@@ -629,7 +638,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {return this._getAllowedChildTypes(selectedNode).length > 0;}- protected _getAllowedChildTypes(selectedNode: UiAssetTreeNode | undefined): AssetDescriptor[] {+ protected _getAllowedChildTypes(selectedNode: UiAssetTreeNode | undefined): [AgentDescriptor[], AssetDescriptor[]] {let includedAssetTypes: string[] | undefined;let excludedAssetTypes: string[];@@ -661,27 +670,19 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {}}- return AssetModelUtil.getAssetDescriptors()+ const descriptors = getDefaultAllowedAddAssetTypes();+ descriptors[0] = descriptors[0]+ .filter((descriptor) => (!includedAssetTypes || includedAssetTypes.some((inc) => Util.stringMatch(inc, descriptor.type!)))+ && (!excludedAssetTypes || !excludedAssetTypes.some((exc) => Util.stringMatch(exc, descriptor.type!))));+ descriptors[1] = descriptors[1].filter((descriptor) => (!includedAssetTypes || includedAssetTypes.some((inc) => Util.stringMatch(inc, descriptor.type!)))&& (!excludedAssetTypes || !excludedAssetTypes.some((exc) => Util.stringMatch(exc, descriptor.type!))));- }-- protected async _doAdd(asset: Asset) {- const response = await manager.rest.api.AssetResource.create(asset);- this._addedAssetId = response.data.id!;- this.dispatchEvent(new OrAssetTreeAddEvent(response.data));- }- protected _doCopy() {- const node = this.selectedNodes[0];- const newAsset = {...node.asset} as Asset;- newAsset.name += " copy";- delete newAsset.id;- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestAddEvent(newAsset), () => this._doAdd(newAsset));+ return descriptors;}protected _getSortFunction(): (a: UiAssetTreeNode, b: UiAssetTreeNode) => number {- return (a, b) => (a.asset as any)![this.sortBy!] < (b.asset as any)![this.sortBy!] ? -1 : (a.asset as any)![this.sortBy!] > (b.asset as any)![this.sortBy!] ? 1 : 0;+ return Util.sortByString((node: UiAssetTreeNode) => (node.asset as any)![this.sortBy!]);}protected _loadAssets() {@@ -747,6 +748,10 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {this._nodes = undefined;}+ public getNodes(): UiAssetTreeNode[] {+ return this._nodes || [];+ }+public _onEvent(event: SharedEvent) {if (event.eventType === "assets") {@@ -778,10 +783,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {}});this._buildTreeNodes(assets, this._getSortFunction());- if (this._addedAssetId) {- this.selectedIds = [this._addedAssetId];- this._addedAssetId = undefined;- }+ this.dispatchEvent(new OrAssetTreeAssetEvent(assetEvent));}}diff --git a/ui/component/or-asset-tree/src/or-add-asset-dialog.ts b/ui/component/or-asset-tree/src/or-add-asset-dialog.tsnew file mode 100644index 000000000..3cbf86248--- /dev/null+++ b/ui/component/or-asset-tree/src/or-add-asset-dialog.ts@@ -0,0 +1,180 @@+import {css, customElement, html, LitElement, property, query, unsafeCSS} from "lit-element";+import {AgentDescriptor, Asset, AssetDescriptor} from "@openremote/model";+import "@openremote/or-input";+import {AssetTreeConfig} from "./index";+import {+ createListGroup,+ ListGroupItem,+ ListItem,+ OrMwcList,+ OrMwcListChangedEvent+} from "@openremote/or-mwc-components/dist/or-mwc-list";+import {OrMwcDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {i18next} from "@openremote/or-translate";+import {Util, DefaultColor5, DefaultColor2} from "@openremote/core";+import { InputType, OrInputChangedEvent, OrInput } from "@openremote/or-input";++export type OrAddAssetDetail = {+ name: string | undefined;+ descriptor: AssetDescriptor | AgentDescriptor | undefined;+};++export class OrAddChangedEvent extends CustomEvent<OrAddAssetDetail> {++ public static readonly NAME = "or-add-asset-changed";++ constructor(addAssetDetail: OrAddAssetDetail) {+ super(OrAddChangedEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: addAssetDetail+ });+ }+}++declare global {+ export interface HTMLElementEventMap {+ [OrAddChangedEvent.NAME]: OrAddChangedEvent;+ }+}++@customElement("or-add-asset-dialog")+export class OrAddAssetDialog extends LitElement {++ @property({attribute: false})+ public config!: AssetTreeConfig;++ @property({attribute: false})+ public agentTypes!: AgentDescriptor[];++ @property({attribute: false})+ public assetTypes!: AssetDescriptor[];++ @property({attribute: false})+ public parent?: Asset;++ @property({attribute: false})+ public selectedType?: AgentDescriptor | AssetDescriptor;++ public name: string = "New Asset";++ @query("#name-input")+ protected nameInput!: OrInput;++ @query("#agent-list")+ protected agentList?: OrMwcList;++ @query("#asset-list")+ protected assetList?: OrMwcList;++ public static get styles() {+ // language=CSS+ return css`+ #name-input {+ margin: 10px;+ }+ #mdc-dialog-form-add {+ display: flex;+ height: 600px;+ width: 800px;+ border: 1px solid var(--or-app-color5, ${unsafeCSS(DefaultColor5)});+ }+ #asset-type-option-container {+ padding: 15px;+ flex: 1 1 auto;+ max-width: 100%;+ font-size: 16px;+ background-color: var(--or-app-color2, ${unsafeCSS(DefaultColor2)});+ }+ #type-list {+ padding-left: 10px;+ width: 260px;+ overflow: auto;+ text-transform: capitalize;+ border-right: 1px solid var(--or-app-color5, ${unsafeCSS(DefaultColor5)});+ }+ #name-input {+ width: 400px;+ }+ `;+ }++ protected render() {++ const mapDescriptors: (descriptors: (AssetDescriptor | AgentDescriptor)[]) => ListItem[] =+ (descriptors) =>+ descriptors.map((descriptor) => {+ return {+ styleMap: {+ "--or-icon-fill": descriptor.color ? "#" + descriptor.color : "unset"+ },+ icon: descriptor.icon,+ text: Util.getAssetTypeLabel(descriptor),+ value: descriptor.type!,+ data: descriptor+ }+ }).sort(Util.sortByString((listItem) => listItem.text));++ const agentItems = mapDescriptors(this.agentTypes);+ const assetItems = mapDescriptors(this.assetTypes);+ const lists: ListGroupItem[] = [];++ if (agentItems.length > 0) {+ lists.push(+ {+ heading: i18next.t("agents"),+ list: html`<or-mwc-list @or-mwc-list-changed="${(evt: OrMwcListChangedEvent) => {if (evt.detail.length === 1) this.onTypeChanged(true, evt.detail[0] as ListItem); }}" .listItems="${agentItems}" id="agent-list"></or-mwc-list>`+ }+ );+ }+ if (assetItems.length > 0) {+ lists.push(+ {+ heading: i18next.t("assets"),+ list: html`<or-mwc-list @or-mwc-list-changed="${(evt: OrMwcListChangedEvent) => {if (evt.detail.length === 1) this.onTypeChanged(false, evt.detail[0] as ListItem); }}" .listItems="${assetItems}" id="asset-list"></or-mwc-list>`+ }+ );+ }++ return html`+ <or-input id="name-input" .type="${InputType.TEXT}" min="1" max="1023" comfortable required outlined .label="${i18next.t("name")}" .value="${this.name}" @or-input-changed="${(e: OrInputChangedEvent) => this.onNameChanged(e.detail.value)}"></or-input>+ <form id="mdc-dialog-form-add">+ <div id="type-list">+ ${createListGroup(lists)}+ </div>+ <div id="asset-type-option-container">+ ${!this.selectedType+ ? html``+ : html`+ <or-icon id="type-icon" .icon="${this.selectedType.icon}"></or-icon>+ <or-translate id="type-description" .value="${Util.getAssetTypeLabel(this.selectedType)}"></or-translate>+ `}+ </div>+ </form>+ `;+ }++ protected onTypeChanged(isAgent: boolean, listItem: ListItem) {+ const descriptor = listItem.data as AssetDescriptor | AgentDescriptor;+ this.selectedType = descriptor;+ const otherList = isAgent ? this.assetList : this.agentList;+ if (otherList) {+ otherList.values = undefined;+ }+ this.onModified();+ };++ protected onNameChanged(name: string) {+ this.name = name;+ this.onModified();+ }++ protected onModified() {+ if (this.nameInput.valid && this.selectedType) {+ this.dispatchEvent(new OrAddChangedEvent({+ name: this.name,+ descriptor: this.selectedType+ }));+ }+ }+}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 22a9d7f6b..053a96c66 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -1,7 +1,7 @@// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)declare function require(name: string): any;-import {customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS, query} from "lit-element";+import {customElement, html, LitElement, property, PropertyValues, query, TemplateResult, unsafeCSS} from "lit-element";import "@openremote/or-icon";import "@openremote/or-input";import "@openremote/or-attribute-input";@@ -12,7 +12,7 @@ import "@openremote/or-survey-results";import "@openremote/or-table";import "@openremote/or-panel";import "@openremote/or-mwc-components/dist/or-mwc-dialog";-import {DialogAction, OrMwcDialog, showDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {showOkCancelDialog, showErrorDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import "@openremote/or-mwc-components/dist/or-mwc-list";import {OrTranslate, translate} from "@openremote/or-translate";import {InputType, OrInput, OrInputChangedEvent} from "@openremote/or-input";@@ -39,6 +39,7 @@ import {GenericAxiosResponse} from "axios";import {OrIcon} from "@openremote/or-icon";import "./or-edit-asset-panel";import {OrEditAssetModifiedEvent} from "./or-edit-asset-panel";+import { RestResponse } from "@openremote/rest";export interface PanelConfig {type?: "info" | "history" | "group" | "survey" | "survey-results";@@ -176,16 +177,33 @@ export class OrAssetViewerComputeGridEvent extends CustomEvent<void> {}export type SaveResult = {+ success: boolean,asset: Asset,- statusCode: number+ isNew: boolean};-export class OrAssetViewerSaveResultEvent extends CustomEvent<SaveResult> {+export class OrAssetViewerRequestSaveEvent extends CustomEvent<Util.RequestEventDetail<Asset>> {- public static readonly NAME = "or-asset-viewer-save-result-event";+ public static readonly NAME = "or-asset-viewer-request-save";- constructor(saveResult:SaveResult) {- super(OrAssetViewerComputeGridEvent.NAME, {+ constructor(asset: Asset) {+ super(OrAssetViewerRequestSaveEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ allow: true,+ detail: asset+ }+ });+ }+}++export class OrAssetViewerSaveEvent extends CustomEvent<SaveResult> {++ public static readonly NAME = "or-asset-viewer-save";++ constructor(saveResult: SaveResult) {+ super(OrAssetViewerSaveEvent.NAME, {bubbles: true,composed: true,detail: saveResult@@ -225,7 +243,8 @@ export class OrAssetViewerEditToggleEvent extends CustomEvent<boolean> {declare global {export interface HTMLElementEventMap {[OrAssetViewerComputeGridEvent.NAME]: OrAssetViewerComputeGridEvent;- [OrAssetViewerSaveResultEvent.NAME]: OrAssetViewerSaveResultEvent;+ [OrAssetViewerRequestSaveEvent.NAME]: OrAssetViewerRequestSaveEvent;+ [OrAssetViewerSaveEvent.NAME]: OrAssetViewerSaveEvent;[OrAssetViewerRequestEditToggleEvent.NAME]: OrAssetViewerRequestEditToggleEvent;[OrAssetViewerEditToggleEvent.NAME]: OrAssetViewerEditToggleEvent;}@@ -459,43 +478,25 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: Attconst attributePickerModalOpen = () => {const newlySelectedAttributes = [...selectedAttributes];- let dialog: OrMwcDialog | undefined;-- const attributePickerModalActions: DialogAction[] = [- {- actionName: "ok",- default: true,- content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("ok")}"></or-input>`,- action: () => {- selectedAttributes.length = 0;- selectedAttributes.push(...newlySelectedAttributes);- updateTable();- }- },- {- actionName: "cancel",- content: html`<or-input class="button" .type="${InputType.BUTTON}" .label="${i18next.t("cancel")}"></or-input>`,- action: () => {- // Nothing to do here- }- },- ];- showDialog(- {- title: "addRemoveAttributes",- actions: attributePickerModalActions,- content: html`- <div style="display: grid">- ${availableAttributes.sort().map((attribute) =>- html`<div style="grid-column: 1 / -1;">- <or-input .type="${InputType.CHECKBOX}" .label="${i18next.t(attribute)}" .value="${!!selectedAttributes.find((selected) => selected === attribute)}"- @or-input-changed="${(evt: OrInputChangedEvent) => evt.detail.value ? newlySelectedAttributes.push(attribute) : newlySelectedAttributes.splice(newlySelectedAttributes.findIndex((s) => s === attribute), 1)}"></or-input>- </div>`)}- </div>- `+ showOkCancelDialog(+ i18next.t("addRemoveAttributes"),+ html`+ <div style="display: grid">+ ${availableAttributes.sort().map((attribute) =>+ html`<div style="grid-column: 1 / -1;">+ <or-input .type="${InputType.CHECKBOX}" .label="${i18next.t(attribute)}" .value="${!!selectedAttributes.find((selected) => selected === attribute)}"+ @or-input-changed="${(evt: OrInputChangedEvent) => evt.detail.value ? newlySelectedAttributes.push(attribute) : newlySelectedAttributes.splice(newlySelectedAttributes.findIndex((s) => s === attribute), 1)}"></or-input>+ </div>`)}+ </div>+ `+ ).then((ok) => {+ if (ok) {+ selectedAttributes.length = 0;+ selectedAttributes.push(...newlySelectedAttributes);+ updateTable();}- );+ });};// Function to update the table and message when assets or config changes@@ -832,7 +833,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemif (this.asset) {this._viewerConfig = this._getPanelConfig(this.asset);this._attributes = Util.getAssetAttributes(this.asset);- this._assetModified = false;+ this._assetModified = !this.asset.id;}}@@ -907,8 +908,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem</span>`: ``}<div id="right-wrapper">- <or-translate id="created-time" class="mobileHidden" value="createdOnWithDate" .options="${{ date: new Date(this.asset!.createdOn!) } as i18next.TOptions<i18next.InitOptions>}"></or-translate>- ${editMode ? html`<or-input id="save-btn" .disabled="${!this.isModified()}" raised .type="${InputType.BUTTON}" .label="${i18next.t("save")}" @or-input-changed="${() => this._saveAsset()}"></or-input>` : ``}+ ${this.asset!.createdOn ? html`<or-translate id="created-time" class="mobileHidden" value="createdOnWithDate" .options="${{ date: new Date(this.asset!.createdOn!) } as i18next.TOptions<i18next.InitOptions>}"></or-translate>` : ``}+ ${editMode ? html`<or-input id="save-btn" .disabled="${!this.isModified()}" raised .type="${InputType.BUTTON}" .label="${i18next.t("save")}" @or-input-changed="${() => this._onSaveClicked()}"></or-input>` : ``}</div></div>${content}@@ -959,9 +960,14 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemprotected _onEditToggleClicked(edit: boolean) {Util.dispatchCancellableEvent(this,- new OrAssetViewerRequestEditToggleEvent(edit),- () => this._doEditToggle(edit),- () => this.editBtnElem.value = !edit);+ new OrAssetViewerRequestEditToggleEvent(edit)).then(+ (detail) => {+ if (detail.allow) {+ this._doEditToggle(edit);+ } else {+ this.editBtnElem.value = !edit;+ }+ });}protected _doEditToggle(edit: boolean) {@@ -969,24 +975,59 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemthis.dispatchEvent(new OrAssetViewerEditToggleEvent(edit));}- protected async _saveAsset() {+ protected _onSaveClicked() {if (!this.asset) {return;}+ Util.dispatchCancellableEvent(this, new OrAssetViewerRequestSaveEvent(this.asset))+ .then((detail) => {+ if (detail.allow) {+ this._doSave();+ }+ });+ }++ protected async _doSave() {+ let asset = this.asset;++ if (!asset) {+ return;+ }++ let fail = false;+ const isNew = !asset.id;this.saveBtnElem.disabled = true;this.wrapperElem.classList.add("saving");- const response = await manager.rest.api.AssetResource.update(this.asset.id!, this.asset);++ try {+ if (!isNew) {+ const response = await manager.rest.api.AssetResource.update(asset.id!, asset);+ fail = response.status !== 204;+ } else {+ const response = await manager.rest.api.AssetResource.create(asset);+ fail = response.status !== 200;+ if (!fail) {+ asset = response.data;+ }+ }+ } catch (e) {+ fail = true;+ console.error("Failed to save asset", e);+ }+this.wrapperElem.classList.remove("saving");this.saveBtnElem.disabled = false;- this.dispatchEvent(new OrAssetViewerSaveResultEvent({- asset: this.asset,- statusCode: response.status- }));- if (response.status === 204) {- this.reloadAsset();+ if (fail) {+ showErrorDialog(i18next.t("saveAssetFailed"));}++ this.dispatchEvent(new OrAssetViewerSaveEvent({+ asset: asset,+ isNew: isNew,+ success: !fail+ }));}protected _onAssetModified() {diff --git a/ui/component/or-mwc-components/src/or-mwc-dialog.ts b/ui/component/or-mwc-components/src/or-mwc-dialog.tsindex 27288706b..b3ab82f97 100644--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts@@ -4,6 +4,7 @@ import "@openremote/or-translate";import "@openremote/or-input";import {InputType} from "@openremote/or-input";import { i18next } from "@openremote/or-translate";+import { Util } from "@openremote/core";const dialogStyle = require("!!raw-loader!@material/dialog/dist/mdc.dialog.css");const listStyle = require("!!raw-loader!@material/list/dist/mdc.list.css");@@ -59,7 +60,9 @@ declare global {}}-export function showErrorDialog(errorMessage: string) {+export async function showErrorDialog(errorMessage: string) {+ const deferred = new Util.Deferred<boolean>();+showDialog({title: "error",content: html`@@ -77,9 +80,39 @@ export function showErrorDialog(errorMessage: string) {actions: [{actionName: "ok",content: i18next.t("ok"),- default: true+ default: true,+ action: () => deferred.resolve()}]});++ await deferred.promise;+}++export async function showOkCancelDialog(title: string, content: string | TemplateResult) {++ const deferred = new Util.Deferred<boolean>();++ showDialog(+ {+ content: typeof(content) === "string" ? html`<p>${content}</p>` : content,+ actions: [+ {+ actionName: "ok",+ content: "ok",+ action: () => deferred.resolve(true)+ },+ {+ actionName: "cancel",+ content: "cancel",+ default: true,+ action: () => deferred.resolve(false)+ }+ ],+ title: title+ }+ );++ return await deferred.promise;}export function showDialog(config: DialogConfig, hostElement?: HTMLElement): OrMwcDialog {diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.tsindex 51e59ce21..596f9fe25 100644--- a/ui/component/or-mwc-components/src/or-mwc-list.ts+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts@@ -12,7 +12,7 @@ import {import {styleMap} from "lit-html/directives/style-map";import {ifDefined} from "lit-html/directives/if-defined";import {MDCList, MDCListActionEvent} from "@material/list";-import { DefaultColor8, DefaultColor4 } from "@openremote/core";+import { DefaultColor8, DefaultColor4, Util } from "@openremote/core";import i18next from "i18next";const listStyle = require("!!raw-loader!@material/list/dist/mdc.list.css");const checkboxStyle = require("!!raw-loader!@material/checkbox/dist/mdc.checkbox.css");@@ -75,6 +75,24 @@ export enum ListType {CHECKBOX = "CHECKBOX"}+export type ListGroupItem = {+ heading: string;+ list: TemplateResult;+};++export function createListGroup(lists: ListGroupItem[]) {+ return html`+ <div class="mdc-list-group">+ ${lists.map((list) => {+ return html`+ <h3 class="mdc-list-group__subheader">${list.heading}</h3>+ ${list.list}+ `+ })}+ </div>+ `;+}+@customElement("or-mwc-list")export class OrMwcList extends LitElement {@@ -116,6 +134,18 @@ export class OrMwcList extends LitElement {}}+ protected shouldUpdate(_changedProperties: PropertyValues): boolean {++ if (this._mdcComponent && _changedProperties.has("values")) {+ if (!Util.objectsEqual(this.values, _changedProperties.get("values"))) {+ const vals = this.values ? Array.isArray(this.values) ? this.values : [this.values] : [];+ this.setSelectedItems(this.values && this.listItems ? this.listItems.filter((li) => li && vals?.includes(li.value)) as ListItem[] : undefined);+ }+ }++ return true;+ }+protected render() {if (!this.listItems || this.listItems.length === 0) {@@ -249,13 +279,13 @@ export class OrMwcList extends LitElement {}return html`- <li style="${listItem.styleMap ? styleMap(listItem.styleMap) : ""}" class="mdc-list-item${isSelected ? " mdc-menu-item--selected" : ""}" role="${ifDefined(role)}" tabindex="${ifDefined(tabIndex)}" aria-checked="${ifDefined(ariaChecked)}" aria-selected="${ifDefined(ariaSelected)}">- <span class="mdc-list-item__ripple"></span>- ${leftTemplate}- ${textTemplate}- ${rightTemplate}- </li>- `;+ <li style="${listItem.styleMap ? styleMap(listItem.styleMap) : ""}" class="mdc-list-item${isSelected ? " mdc-list-item--selected" : ""}" role="${ifDefined(role)}" tabindex="${ifDefined(tabIndex)}" aria-checked="${ifDefined(ariaChecked)}" aria-selected="${ifDefined(ariaSelected)}">+ <span class="mdc-list-item__ripple"></span>+ ${leftTemplate}+ ${textTemplate}+ ${rightTemplate}+ </li>+ `;}protected firstUpdated(_changedProperties: PropertyValues): void {@@ -274,11 +304,34 @@ export class OrMwcList extends LitElement {}const selectedIndexes = Array.isArray(this._mdcComponent.selectedIndex) ? this._mdcComponent.selectedIndex : [this._mdcComponent.selectedIndex];- const items = this.listItems?.filter((item) => item !== null) as ListItem[];+ const items = this.listItems ? this.listItems.filter((item) => item !== null) as ListItem[] : [];return selectedIndexes.map((index) => items![index]);}+ public setSelectedItems(items: ListItem | ListItem[] | string | string[] | undefined) {+ if (!this._mdcComponent || !this.listItems) {+ return;+ }+ if (!items) {+ this._mdcComponent.selectedIndex = -1;+ return;+ }++ const itemArr = (!Array.isArray(items) ? [items] : items).map((item) => typeof(item) === "string" ? item : item.value);+ const listItems = this.listItems.filter((item) => item !== null) as ListItem[];++ const indexes = listItems.reduce((indexes, listItem, index) => {+ if (listItem && itemArr.includes(listItem.value)) {+ indexes.push(index);+ }+ return indexes;+ }, [] as number[]);++ this._mdcComponent.selectedIndex = indexes.length === 1 ? indexes[0] : indexes.length > 1 ? indexes : -1;+ }+protected _onSelected(ev: MDCListActionEvent) {+ this.values = this.selectedItems.map((item) => item.value!);ev.stopPropagation();this.dispatchEvent(new OrMwcListChangedEvent(this.selectedItems));}diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex 945e4f3a9..b46e00566 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -1,4 +1,4 @@-import {css, customElement, html, LitElement, property, query, TemplateResult, unsafeCSS, PropertyValues} from "lit-element";+import {css, customElement, html, LitElement, property, query, unsafeCSS} from "lit-element";import manager, {AssetModelUtil,DefaultBoxShadow,@@ -17,20 +17,17 @@ import {AssetQuery,AttributeDescriptor,AttributeValueDescriptor,+ ClientRole,JsonRule,LogicGroup,MetaItemDescriptor,MetaItemType,+ NotificationTargetType,RuleActionUnion,RuleCondition,RulesetLang,RulesetUnion,- TenantRuleset,- ValueType,- ClientRole,- Asset,- NotificationTargetType,- Ruleset+ ValueType} from "@openremote/model";import "@openremote/or-translate";import "@openremote/or-mwc-components/dist/or-mwc-drawer";@@ -41,7 +38,8 @@ import "./flow-viewer/flow-viewer";import {OrRuleList} from "./or-rule-list";import {OrRuleViewer} from "./or-rule-viewer";import {RecurrenceOption} from "./json-viewer/or-rule-then-otherwise";-import { AttributeInputCustomProvider } from "@openremote/or-attribute-input";+import {AttributeInputCustomProvider} from "@openremote/or-attribute-input";+import {showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";export const enum ConditionType {ASSET_QUERY = "assetQuery",@@ -115,6 +113,7 @@ export interface RulesConfig {hideWhenAddCondition?: boolean;hideWhenAddAttribute?: boolean;hideWhenAddGroup?: boolean;+ multiSelect?: boolean;};inputProvider?: AttributeInputCustomProvider;descriptors?: {@@ -171,7 +170,7 @@ export interface RulesConfigAttributeValue {}export interface RulesetNode {- ruleset: TenantRuleset;+ ruleset: RulesetUnion;selected: boolean;}@@ -397,95 +396,134 @@ export class OrRulesRuleUnsupportedEvent extends CustomEvent<void> {}}-export class OrRulesRequestSelectEvent extends CustomEvent<RequestEventDetail<RulesetUnion[]>> {+export interface NodeSelectEventDetail {+ oldNodes: RulesetNode[];+ newNodes: RulesetNode[];+}++export class OrRulesRequestSelectionEvent extends CustomEvent<RequestEventDetail<NodeSelectEventDetail>> {- public static readonly NAME = "or-rules-request-select";+ public static readonly NAME = "or-rules-request-selection";- constructor(request: TenantRuleset[]) {- super(OrRulesRequestSelectEvent.NAME, {+ constructor(request: NodeSelectEventDetail) {+ super(OrRulesRequestSelectionEvent.NAME, {bubbles: true,composed: true,detail: {- allow: true,- detail: request+ detail: request,+ allow: true}});}}-export class OrRulesRequestAddEvent extends CustomEvent<RulesetUnion> {+export class OrRulesSelectionEvent extends CustomEvent<NodeSelectEventDetail> {++ public static readonly NAME = "or-rules-selection";++ constructor(nodes: NodeSelectEventDetail) {+ super(OrRulesSelectionEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: nodes+ });+ }+}++export type AddEventDetail = {+ ruleset: RulesetUnion;+ sourceRuleset?: RulesetUnion;+}++export class OrRulesRequestAddEvent extends CustomEvent<RequestEventDetail<AddEventDetail>> {public static readonly NAME = "or-rules-request-add";- constructor(lang: RulesetLang, type:any) {+ constructor(detail: AddEventDetail) {super(OrRulesRequestAddEvent.NAME, {bubbles: true,composed: true,- detail: {lang, type}+ detail: {+ detail: detail,+ allow: true+ }});}}-export class OrRulesRequestDeleteEvent extends CustomEvent<RulesetUnion[]> {+export class OrRulesAddEvent extends CustomEvent<AddEventDetail> {- public static readonly NAME = "or-rules-request-delete";+ public static readonly NAME = "or-rules-add";- constructor(request: TenantRuleset[]) {- super(OrRulesRequestDeleteEvent.NAME, {+ constructor(detail: AddEventDetail) {+ super(OrRulesAddEvent.NAME, {bubbles: true,composed: true,- detail: request+ detail: detail});}}-export class OrRulesRequestCopyEvent extends CustomEvent<RulesetUnion> {+export class OrRulesRequestDeleteEvent extends CustomEvent<RequestEventDetail<RulesetNode[]>> {- public static readonly NAME = "or-rules-request-copy";+ public static readonly NAME = "or-rules-request-delete";- constructor(request: TenantRuleset) {- super(OrRulesRequestCopyEvent.NAME, {+ constructor(request: RulesetNode[]) {+ super(OrRulesRequestDeleteEvent.NAME, {bubbles: true,composed: true,- detail: request+ detail: {+ detail: request,+ allow: true+ }});}}-export class OrRulesSaveStartEvent extends CustomEvent<void> {+export type SaveResult = {+ success: boolean,+ ruleset: RulesetUnion,+ isNew: boolean+};- public static readonly NAME = "or-rules-save-start";+export class OrRulesRequestSaveEvent extends CustomEvent<RequestEventDetail<RulesetUnion>> {- constructor() {- super(OrRulesSaveStartEvent.NAME, {+ public static readonly NAME = "or-rules-request-save";++ constructor(ruleset: RulesetUnion) {+ super(OrRulesRequestSaveEvent.NAME, {bubbles: true,- composed: true+ composed: true,+ detail: {+ allow: true,+ detail: ruleset+ }});}}-export class OrRulesSaveEndEvent extends CustomEvent<boolean> {+export class OrRulesSaveEvent extends CustomEvent<SaveResult> {- public static readonly NAME = "or-rules-save-end";+ public static readonly NAME = "or-rules-save";- constructor(success: boolean) {- super(OrRulesSaveEndEvent.NAME, {+ constructor(result: SaveResult) {+ super(OrRulesSaveEvent.NAME, {bubbles: true,composed: true,- detail: success+ detail: result});}}-export class OrRulesSelectionChangedEvent extends CustomEvent<RulesetUnion[]> {+export class OrRulesDeleteEvent extends CustomEvent<RulesetUnion[]> {- public static readonly NAME = "or-rules-selection-changed";+ public static readonly NAME = "or-rules-delete";- constructor(nodes: TenantRuleset[]) {- super(OrRulesSelectionChangedEvent.NAME, {+ constructor(rulesets: RulesetUnion[]) {+ super(OrRulesDeleteEvent.NAME, {bubbles: true,composed: true,- detail: nodes+ detail: rulesets});}}@@ -493,14 +531,15 @@ export class OrRulesSelectionChangedEvent extends CustomEvent<RulesetUnion[]> {declare global {export interface HTMLElementEventMap {[OrRulesRuleUnsupportedEvent.NAME]: OrRulesRuleUnsupportedEvent;- [OrRulesRequestSelectEvent.NAME]: OrRulesRequestSelectEvent;+ [OrRulesRuleChangedEvent.NAME]: OrRulesRuleChangedEvent;+ [OrRulesRequestSelectionEvent.NAME]: OrRulesRequestSelectionEvent;+ [OrRulesSelectionEvent.NAME]: OrRulesSelectionEvent;[OrRulesRequestAddEvent.NAME]: OrRulesRequestAddEvent;+ [OrRulesAddEvent.NAME]: OrRulesAddEvent;[OrRulesRequestDeleteEvent.NAME]: OrRulesRequestDeleteEvent;- [OrRulesRequestCopyEvent.NAME]: OrRulesRequestCopyEvent;- [OrRulesSaveStartEvent.NAME]: OrRulesSaveStartEvent;- [OrRulesSaveEndEvent.NAME]: OrRulesSaveEndEvent;- [OrRulesRuleChangedEvent.NAME]: OrRulesRuleChangedEvent;- [OrRulesSelectionChangedEvent.NAME]: OrRulesSelectionChangedEvent;+ [OrRulesRequestSaveEvent.NAME]: OrRulesRequestSaveEvent;+ [OrRulesSaveEvent.NAME]: OrRulesSaveEvent;+ [OrRulesDeleteEvent.NAME]: OrRulesDeleteEvent;}}@@ -581,39 +620,22 @@ export class OrRules extends translate(i18next)(LitElement) {private _rulesList!: OrRuleList;@query("#rule-viewer")- private _ruleViewer!: OrRuleViewer;-- @property({attribute: false})- private _activeRuleset?: RulesetUnion;+ private _viewer!: OrRuleViewer;constructor() {super();- this.addEventListener(OrRulesRequestSelectEvent.NAME, this._onRequestSelect);- this.addEventListener(OrRulesRequestAddEvent.NAME,this._onRequestAdd);- this.addEventListener(OrRulesRequestDeleteEvent.NAME, this._onRequestDelete);- this.addEventListener(OrRulesRequestCopyEvent.NAME, this._onRequestCopy);- this.addEventListener(OrRulesSelectionChangedEvent.NAME, this._onRuleSelectionChanged);- this.addEventListener(OrRulesSaveEndEvent.NAME, this._onRuleSaveEnd);- this.addEventListener(OrRulesSaveStartEvent.NAME, this._onRuleSaveStart);- }-- public shouldUpdate(_changedProperties: PropertyValues): boolean {- if (this._rulesList && _changedProperties.has("selectedIds")) {- this._rulesList.selectedIds = this.selectedIds;- if (_changedProperties.size === 1) {- return false;- }- }-- return super.shouldUpdate(_changedProperties);+ this.addEventListener(OrRulesRequestSelectionEvent.NAME, this._onRuleSelectionRequested);+ this.addEventListener(OrRulesSelectionEvent.NAME, this._onRuleSelectionChanged);+ this.addEventListener(OrRulesAddEvent.NAME, this._onRuleAdd);+ this.addEventListener(OrRulesSaveEvent.NAME, this._onRuleSave);}protected render() {return html`<or-rule-list id="rule-list" .config="${this.config}" .language="${this.language}" .selectedIds="${this.selectedIds}"></or-rule-list>- <or-rule-viewer id="rule-viewer" .ruleset="${this._activeRuleset}" .config="${this.config}" .readonly="${this.isReadonly()}"></or-rule-viewer>+ <or-rule-viewer id="rule-viewer" .config="${this.config}" .readonly="${this.isReadonly()}"></or-rule-viewer>`;}@@ -621,124 +643,56 @@ export class OrRules extends translate(i18next)(LitElement) {return this.readonly || !manager.hasRole(ClientRole.WRITE_RULES);}- protected _onRequestAdd(e: OrRulesRequestAddEvent) {- const lang = e.detail.lang;- const type = e.detail.type;- const shouldContinue = this._okToLeaveActiveRule();-- if (!shouldContinue) {- return;- }-- const realm = manager.isSuperUser() ? manager.displayRealm : manager.config.realm;- const ruleset: RulesetUnion = {- id: 0,- type: type,- name: OrRules.DEFAULT_RULESET_NAME,- lang: lang,- realm: realm,- rules: undefined // View needs to populate this on load- };-- if (this.config && this.config.rulesetAddHandler && !this.config.rulesetAddHandler(ruleset)) {- return;- }-- // Ensure config hasn't messed with the certain values- if (type === "tenant") {- (ruleset as TenantRuleset).realm = realm;+ protected _confirmContinue(action: () => void) {+ if (this._viewer.modified) {+ showOkCancelDialog(i18next.t("rulesetModified"), i18next.t("confirmContinueRulesetModified"))+ .then((ok) => {+ if (ok) {+ action();+ }+ });+ } else {+ action();}- this._activeRuleset = ruleset;- this.selectedIds = undefined;}- protected _onRequestCopy(e: OrRulesRequestCopyEvent) {- const shouldContinue = this._okToLeaveActiveRule();-- if (!shouldContinue) {- return;- }+ protected _onRuleSelectionRequested(event: OrRulesRequestSelectionEvent) {+ const isModified = this._viewer.modified;- const ruleset = JSON.parse(JSON.stringify(e.detail)) as RulesetUnion;- delete ruleset.lastModified;- delete ruleset.createdOn;- delete ruleset.status;- delete ruleset.error;- delete ruleset.id;- ruleset.name = ruleset.name + " copy";- if (this.config && this.config.rulesetCopyHandler && !this.config.rulesetCopyHandler(ruleset)) {+ if (!isModified) {return;}-- this._activeRuleset = ruleset;- }-- protected async _onRequestDelete(event: OrRulesRequestDeleteEvent) {- let confirmed = this._okToLeaveActiveRule();-- if (!confirmed) {- return;- }-- confirmed = !this._activeRuleset!.id || window.confirm(i18next.t("confirmDelete"));-- if (!confirmed) {- return;- }-- this._activeRuleset = undefined;-- const rulesetsToDelete = event.detail;-- // We need to call the backend so disable list until done- this._rulesList.disabled = true;- for (const ruleset of rulesetsToDelete) {-- if (this.config && this.config.rulesetDeleteHandler && !this.config.rulesetDeleteHandler(ruleset)) {- continue;- }-- try {- await manager.rest.api.RulesResource.deleteTenantRuleset(ruleset.id!);- } catch (e) {- console.error("Failed to delete ruleset '" + ruleset.id + "': " + e);+ // Prevent the request and check if user wants to lose changes+ event.detail.allow = false;++ this._confirmContinue(() => {+ const nodes = event.detail.detail.newNodes;+ if (Util.objectsEqual(nodes, event.detail.detail.oldNodes)) {+ // User has clicked the same node so let's force reload it+ this._viewer.ruleset = {...nodes[0].ruleset};+ } else {+ this.selectedIds = nodes.map((node) => node.ruleset.id!);+ this._viewer.ruleset = nodes.length === 1 ? nodes[0].ruleset : undefined;}- }- this._rulesList.refresh();- this._rulesList.disabled = false;+ });}- protected _onRequestSelect(event: OrRulesRequestSelectEvent) {- event.detail.allow = this._okToLeaveActiveRule();+ protected _onRuleSelectionChanged(event: OrRulesSelectionEvent) {+ const nodes = event.detail.newNodes;+ this.selectedIds = nodes.map((node) => node.ruleset.id!);+ this._viewer.ruleset = nodes.length === 1 ? {...nodes[0].ruleset} : undefined;}- protected _onRuleSelectionChanged(event: OrRulesSelectionChangedEvent) {- const isNewRule = this._activeRuleset && !this._activeRuleset.id;-- if (!isNewRule || event.detail.length !== 0) {- this._activeRuleset = event.detail.length === 1 ? {...event.detail[0]} : undefined;- }- this.selectedIds = event.detail.length === 1 && event.detail[0].id ? [event.detail[0].id!] : undefined;+ protected _onRuleAdd(event: OrRulesAddEvent) {+ // Load the ruleset into the viewer+ this._viewer.ruleset = event.detail.ruleset;}- protected _onRuleSaveStart(event: OrRulesSaveStartEvent) {- this._rulesList.disabled = true;- this._ruleViewer.disabled = true;- }-- protected _onRuleSaveEnd(event: OrRulesSaveEndEvent) {- this._rulesList.disabled = false;- this._ruleViewer.disabled = false;- this.selectedIds = [- this._ruleViewer.ruleset!.id!- ];- if (event.detail) {- this._rulesList.refresh();+ protected async _onRuleSave(event: OrRulesSaveEvent) {+ await this._rulesList.refresh();+ if (event.detail.success && event.detail.isNew) {+ this.selectedIds = [event.detail.ruleset.id!];}}-- protected _okToLeaveActiveRule() {- return !this._ruleViewer.modified || window.confirm(i18next.t("continueWithoutSaving"));- }}diff --git a/ui/component/or-rules/src/or-rule-list.ts b/ui/component/or-rules/src/or-rule-list.tsindex 4221f7813..378984c20 100644--- a/ui/component/or-rules/src/or-rule-list.ts+++ b/ui/component/or-rules/src/or-rule-list.ts@@ -1,17 +1,18 @@import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";-import {CalendarEvent, ClientRole, RulesetLang, TenantRuleset} from "@openremote/model";+import {CalendarEvent, ClientRole, RulesetLang, RulesetUnion, TenantRuleset} from "@openremote/model";import "@openremote/or-translate";-import manager, {EventCallback, OREvent} from "@openremote/core";+import manager, {OREvent, Util} from "@openremote/core";import "@openremote/or-input";import {InputType, OrInputChangedEvent} from "@openremote/or-input";import {style as OrAssetTreeStyle} from "@openremote/or-asset-tree";import {+ AddEventDetail,+ OrRules,+ OrRulesAddEvent,OrRulesRequestAddEvent,- OrRulesRequestCopyEvent,OrRulesRequestDeleteEvent,- OrRulesRequestSelectEvent,- OrRulesSelectionChangedEvent,- RequestEventDetail,+ OrRulesRequestSelectionEvent,+ OrRulesSelectionEvent,RulesConfig,RulesetNode} from "./index";@@ -20,6 +21,8 @@ import {MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";import {translate} from "@openremote/or-translate";import i18next from "i18next";import {getContentWithMenuTemplate} from "../../or-mwc-components/dist/or-mwc-menu";+import {showErrorDialog, showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";+import {GenericAxiosResponse} from "@openremote/rest";// language=CSSconst style = css`@@ -130,7 +133,6 @@ export class OrRuleList extends translate(i18next)(LitElement) {protected _globalRulesets: boolean = false;protected _selectedNodes: RulesetNode[] = [];- protected _initCallback?: EventCallback;protected _ready = false;static get styles() {@@ -140,8 +142,8 @@ export class OrRuleList extends translate(i18next)(LitElement) {];}- public refresh() {- this._nodes = undefined;+ public async refresh() {+ await this._loadRulesets();}public disconnectedCallback() {@@ -325,15 +327,15 @@ export class OrRuleList extends translate(i18next)(LitElement) {`;}- protected static _getNodeStatusClasses(ruleset: TenantRuleset): string {+ protected static _getNodeStatusClasses(ruleset: RulesetUnion): string {let status = ruleset.enabled ? "bg-green" : "bg-red";if (ruleset.enabled) {// Look at validity metaif (ruleset.meta && ruleset.meta.hasOwnProperty("urn:openremote:rule:meta:validity")) {- let calendarEvent = ruleset.meta["urn:openremote:rule:meta:validity"] as CalendarEvent;- let now = new Date().getTime();+ const calendarEvent = ruleset.meta["urn:openremote:rule:meta:validity"] as CalendarEvent;+ const now = new Date().getTime();if (calendarEvent.start) {if (now < calendarEvent.start) {@@ -368,8 +370,12 @@ export class OrRuleList extends translate(i18next)(LitElement) {}this.selectedIds = actuallySelectedIds;+ const oldSelection = this._selectedNodes;this._selectedNodes = selectedNodes;- this.dispatchEvent(new OrRulesSelectionChangedEvent(this._selectedNodes.map((node) => node.ruleset)));+ this.dispatchEvent(new OrRulesSelectionEvent({+ oldNodes: oldSelection,+ newNodes: selectedNodes+ }));}protected static _updateSort(nodes: RulesetNode[], sortFunction: (a: RulesetNode, b: RulesetNode) => number) {@@ -387,53 +393,171 @@ export class OrRuleList extends translate(i18next)(LitElement) {evt.preventDefault();- let selectRulesets = this._selectedNodes.map((node) => node.ruleset);- const index = selectRulesets.findIndex((ruleset) => ruleset.id === node.ruleset.id);+ let selectedNodes: RulesetNode[] = [];+ const index = this._selectedNodes.indexOf(node);let select = true;let deselectOthers = true;+ const multiSelect = !this._isReadonly() && this.multiSelect && (!this.config || !this.config.controls || !this.config.controls.multiSelect);- if (this.multiSelect) {- if (evt.ctrlKey || evt.metaKey) {- deselectOthers = false;- if (index >= 0 && selectRulesets.length > 1) {- select = false;- }+ if (multiSelect && (evt.ctrlKey || evt.metaKey)) {+ deselectOthers = false;+ if (index >= 0 && this._selectedNodes && this._selectedNodes.length > 1) {+ select = false;}}if (deselectOthers) {- selectRulesets = [node.ruleset];+ selectedNodes = [node];} else if (select) {if (index < 0) {- selectRulesets.push(node.ruleset);- }- } else {- if (index >= 0) {- selectRulesets.splice(index, 1);- selectRulesets = [...selectRulesets];+ selectedNodes = [...this._selectedNodes];+ selectedNodes.push(node);}+ } else if (index >= 0) {+ selectedNodes = [...this._selectedNodes];+ selectedNodes.splice(index, 1);}- this._doRequest(new OrRulesRequestSelectEvent(selectRulesets), (detail) => {- this.selectedIds = detail.map((ruleset) => ruleset.id!);+ Util.dispatchCancellableEvent(this, new OrRulesRequestSelectionEvent({+ oldNodes: this._selectedNodes,+ newNodes: selectedNodes+ })).then((detail) => {+ if (detail.allow) {+ this.selectedIds = detail.detail.newNodes.map((node) => node.ruleset.id!);+ }});}protected _onCopyClicked() {- if (this._selectedNodes.length == 1) {- this.dispatchEvent(new OrRulesRequestCopyEvent(this._selectedNodes[0].ruleset));+ if (this._selectedNodes.length !== 1) {+ return;+ }++ const node = this._selectedNodes[0];+ const ruleset = JSON.parse(JSON.stringify(node.ruleset)) as RulesetUnion;+ delete ruleset.lastModified;+ delete ruleset.createdOn;+ delete ruleset.status;+ delete ruleset.error;+ delete ruleset.id;+ ruleset.name = ruleset.name + " copy";++ if (this.config && this.config.rulesetCopyHandler && !this.config.rulesetCopyHandler(ruleset)) {+ return;+ }++ Util.dispatchCancellableEvent(this, new OrRulesRequestAddEvent({+ ruleset: ruleset,+ sourceRuleset: node.ruleset+ })).then((detail) => {+ if (detail.allow) {+ this.dispatchEvent(new OrRulesAddEvent(detail.detail));+ }+ });+ }++ protected _onAddClicked(lang: RulesetLang) {+ const type = this._globalRulesets ? "global": "tenant";+ const realm = manager.isSuperUser() ? manager.displayRealm : manager.config.realm;+ const ruleset: RulesetUnion = {+ id: 0,+ type: type,+ name: OrRules.DEFAULT_RULESET_NAME,+ lang: lang,+ realm: realm,+ rules: undefined+ };++ if (this.config && this.config.rulesetAddHandler && !this.config.rulesetAddHandler(ruleset)) {+ return;}++ // Ensure config hasn't messed with certain values+ if (type === "tenant") {+ (ruleset as TenantRuleset).realm = realm;+ }++ const detail = {+ ruleset: ruleset,+ isCopy: false+ };++ Util.dispatchCancellableEvent(this, new OrRulesRequestAddEvent(detail))+ .then((detail) => {+ if (detail.allow) {+ this.dispatchEvent(new OrRulesAddEvent(detail.detail));+ }+ });}protected _onDeleteClicked() {if (this._selectedNodes.length > 0) {- this.dispatchEvent(new OrRulesRequestDeleteEvent(this._selectedNodes.map((node) => node.ruleset)));+ Util.dispatchCancellableEvent(this, new OrRulesRequestDeleteEvent(this._selectedNodes))+ .then((detail) => {+ if (detail.allow) {+ this._doDelete();+ }+ });}}- protected _onAddClicked(lang: RulesetLang) {- const type = this._globalRulesets ? "global": "tenant";- this.dispatchEvent(new OrRulesRequestAddEvent(lang, type));+ protected _doDelete() {++ if (!this._selectedNodes || this._selectedNodes.length === 0) {+ return;+ }++ const doDelete = async () => {+ this.disabled = true;+ const rulesetsToDelete = this._selectedNodes.map((rulesetNode) => rulesetNode.ruleset);+ let fail = false;++ for (const ruleset of rulesetsToDelete) {++ if (this.config && this.config.rulesetDeleteHandler && !this.config.rulesetDeleteHandler(ruleset)) {+ continue;+ }++ try {+ let response: GenericAxiosResponse<void>;++ switch (ruleset.type) {+ case "asset":+ response = await manager.rest.api.RulesResource.deleteAssetRuleset(ruleset.id!);+ break;+ case "tenant":+ response = await manager.rest.api.RulesResource.deleteTenantRuleset(ruleset.id!);+ break;+ case "global":+ response = await manager.rest.api.RulesResource.deleteGlobalRuleset(ruleset.id!);+ break;+ }++ if (response.status !== 204) {+ console.error("Delete ruleset returned unexpected status '" + response.status + "': " + JSON.stringify(ruleset, null, 2));+ fail = true;+ }+ } catch (e) {+ console.error("Failed to delete ruleset: " + JSON.stringify(ruleset, null, 2), e);+ fail = true;+ }+ }++ if (fail) {+ showErrorDialog(i18next.t("deleteAssetsFailed"));+ }++ this.disabled = false;+ this.refresh();+ };++ // Confirm deletion request+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteRulesetsConfirm"))+ .then((ok) => {+ if (ok) {+ doDelete();+ }+ });}protected _onSearchClicked() {@@ -445,7 +569,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {}protected _getSortFunction(): (a: RulesetNode, b: RulesetNode) => number {- return (a, b) => { return (a.ruleset as any)![this.sortBy!] < (b.ruleset as any)![this.sortBy!] ? -1 : (a.ruleset as any)![this.sortBy!] > (b.ruleset as any)![this.sortBy!] ? 1 : 0 };+ return Util.sortByString((node: RulesetNode) => (node.ruleset as any)![this.sortBy!]);}protected _getRealm(): string | undefined {@@ -456,16 +580,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {return manager.getRealm();}- protected _doRequest<T>(event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void) {- this.dispatchEvent(event);- window.setTimeout(() => {- if (event.detail.allow) {- handler(event.detail.detail);- }- });- }-- protected _loadRulesets() {+ protected async _loadRulesets() {const sortFunction = this._getSortFunction();if(this._globalRulesets) {@@ -481,13 +596,14 @@ export class OrRuleList extends translate(i18next)(LitElement) {fullyPopulate: true,language: this._allowedLanguages}- manager.rest.api.RulesResource.getTenantRulesets(this._getRealm() || manager.config.realm, params).then((response: any) => {+ try {+ const response = await manager.rest.api.RulesResource.getTenantRulesets(this._getRealm() || manager.config.realm, params);if (response && response.data) {this._buildTreeNodes(response.data, sortFunction);}- }).catch((reason: any) => {- console.error("Error: " + reason);- });+ } catch (e) {+ console.error("Error: " + e);+ }}}@@ -503,7 +619,6 @@ export class OrRuleList extends translate(i18next)(LitElement) {});nodes.sort(sortFunction);-this._nodes = nodes;}if (this.selectedIds && this.selectedIds.length > 0) {diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex 4221eb429..112816e18 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -2,20 +2,22 @@ import {css, customElement, html, LitElement, property, PropertyValues, query, Timport {OrRulesRuleChangedEvent,OrRulesRuleUnsupportedEvent,- OrRulesSaveEndEvent,- OrRulesSaveStartEvent,+ OrRulesSaveEvent,+ OrRulesRequestSaveEvent,RulesConfig,- RuleView+ RuleView, AddEventDetail, OrRulesAddEvent} from "./index";import {ClientRole, RulesetLang, RulesetUnion} from "@openremote/model";-import manager from "@openremote/core";+import manager, { Util } from "@openremote/core";import "./json-viewer/or-rule-json-viewer";import "./or-rule-text-viewer";import "./flow-viewer/components/flow-editor";import "@openremote/or-input";import {translate} from "@openremote/or-translate";-import {InputType, OrInputChangedEvent} from "@openremote/or-input";+import {InputType, OrInputChangedEvent, OrInput} from "@openremote/or-input";import i18next from "i18next";+import { GenericAxiosResponse } from "@openremote/rest";+import { showErrorDialog } from "@openremote/or-mwc-components/dist/or-mwc-dialog";// language=CSSexport const style = css`@@ -33,6 +35,11 @@ export const style = css`align-items: center;height: 100%;}++ #main-wrapper.saving {+ opacity: 0.5;+ pointer-events: none;+ }#rule-name {max-width: 400px;@@ -110,6 +117,12 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {@query("#rule-view")public view?: RuleView;+ @query("#main-wrapper")+ protected wrapperElem!: HTMLDivElement;++ @query("#save-btn")+ protected saveBtnElem!: OrInput;+protected _focusName = false;constructor() {@@ -131,6 +144,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {if (this.ruleset) {this._focusName = true;+ this.modified = !this.ruleset.id;}}return super.shouldUpdate(_changedProperties);@@ -162,7 +176,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {// TODO: load the appropriate viewer depending on state and ruleset languagereturn html`- <div class="wrapper">+ <div id="main-wrapper" class="wrapper"><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">@@ -172,7 +186,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {<or-input .type="${InputType.SWITCH}" .value="${this.ruleset && this.ruleset.enabled}" ?disabled="${!this.ruleset.id}" @or-input-changed="${this._toggleEnabled}"></or-input></span>- <or-input .type="${InputType.BUTTON}" id="save-btn" .label="${i18next.t("save")}" raised ?disabled="${this._cannotSave()}" @or-input-changed="${this._doSave}"></or-input>+ <or-input .type="${InputType.BUTTON}" id="save-btn" .label="${i18next.t("save")}" raised ?disabled="${this._cannotSave()}" @or-input-changed="${this._onSaveClicked}"></or-input></div></div>@@ -210,7 +224,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {this._ruleValid = e.detail;}- protected _doSave() {+ protected _onSaveClicked() {if (!this.ruleset || !this.view) {return;}@@ -219,61 +233,78 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {return;}- this.disabled = true;+ Util.dispatchCancellableEvent(this, new OrRulesRequestSaveEvent(this.ruleset))+ .then((detail) => {+ if (detail.allow) {+ this._doSave();+ }+ });+ }++ protected async _doSave() {+ const ruleset = this.ruleset;++ if (!ruleset || !this.view) {+ return;+ }++ let fail = false;+ const isNew = !ruleset.id;+ this.saveBtnElem.disabled = true;+ this.wrapperElem.classList.add("saving");this.view.beforeSave();- this.dispatchEvent(new OrRulesSaveStartEvent());-- if (this.ruleset.type === "tenant") {- if (this.ruleset.id) {- manager.rest.api.RulesResource.updateTenantRuleset(this.ruleset.id!, this.ruleset).then((response) => {- this.disabled = false;- this.modified = false;- this.dispatchEvent(new OrRulesSaveEndEvent(true));- }).catch(reason => {- console.error("Failed to save ruleset: " + reason);- this.disabled = false;- this.dispatchEvent(new OrRulesSaveEndEvent(false));- });- } else {- manager.rest.api.RulesResource.createTenantRuleset(this.ruleset).then((response) => {- if (this.ruleset) {- this.ruleset.id = response.data;++ let response: GenericAxiosResponse<number | void>;++ try {+ switch (ruleset.type) {+ case "asset":+ if (isNew) {+ response = await manager.rest.api.RulesResource.createAssetRuleset(ruleset);+ } else {+ response = await manager.rest.api.RulesResource.updateAssetRuleset(ruleset.id!, ruleset);}- this.disabled = false;- this.modified = false;- this.dispatchEvent(new OrRulesSaveEndEvent(true));- }).catch(reason => {- console.error("Failed to save ruleset: " + reason);- this.disabled = false;- this.dispatchEvent(new OrRulesSaveEndEvent(false));- });- }- } else if (this.ruleset.type === "global") {- if (this.ruleset.id) {- manager.rest.api.RulesResource.updateGlobalRuleset(this.ruleset.id!, this.ruleset).then((response) => {- this.disabled = false;- this.modified = false;- this.dispatchEvent(new OrRulesSaveEndEvent(true));- }).catch(reason => {- console.error("Failed to save ruleset: " + reason);- this.disabled = false;- this.dispatchEvent(new OrRulesSaveEndEvent(false));- });- } else {- manager.rest.api.RulesResource.createGlobalRuleset(this.ruleset).then((response) => {- if (this.ruleset) {- this.ruleset.id = response.data;+ break;+ case "tenant":+ if (isNew) {+ response = await manager.rest.api.RulesResource.createTenantRuleset(ruleset);+ } else {+ response = await manager.rest.api.RulesResource.updateTenantRuleset(ruleset.id!, ruleset);+ }+ break;+ case "global":+ if (isNew) {+ response = await manager.rest.api.RulesResource.createGlobalRuleset(ruleset);+ } else {+ response = await manager.rest.api.RulesResource.updateGlobalRuleset(ruleset.id!, ruleset);}- this.disabled = false;- this.modified = false;- this.dispatchEvent(new OrRulesSaveEndEvent(true));- }).catch(reason => {- console.error("Failed to save ruleset: " + reason);- this.disabled = false;- this.dispatchEvent(new OrRulesSaveEndEvent(false));- });+ break;}++ if (response.status !== (isNew ? 200 : 204)) {+ fail = true;+ showErrorDialog("Create ruleset returned unexpected status: " + response.status);+ return;+ } else if (response.data) {+ ruleset.id = response.data;+ }+ } catch (e) {+ fail = true;+ console.error("Failed to save ruleset", e);}++ this.wrapperElem.classList.remove("saving");+ this.saveBtnElem.disabled = false;++ if (fail) {+ showErrorDialog(i18next.t("saveRulesetFailed"));+ }++ this.dispatchEvent(new OrRulesSaveEvent({+ ruleset: ruleset,+ isNew: isNew,+ success: !fail+ }));}protected _onRuleUnsupported() {diff --git a/ui/component/rest/src/index.ts b/ui/component/rest/src/index.tsindex 74d53d736..7aab9fddc 100644--- a/ui/component/rest/src/index.ts+++ b/ui/component/rest/src/index.ts@@ -1,7 +1,9 @@-import axios, {AxiosInstance, AxiosRequestConfig} from "axios";-import {ApiClient} from "./restclient";+import axios, {AxiosInstance, AxiosRequestConfig, GenericAxiosResponse} from "axios";+import {ApiClient, RestResponse} from "./restclient";import Qs from "qs";+export {RestResponse, GenericAxiosResponse};+export class RestApi {get api() {