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: asset-tree multiselect and various other minor cleanups/improvements
Rich Turner80e76bfd1dcf
diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 67b495443..98115e8ad 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -1,13 +1,23 @@-import {css, customElement, html, property, TemplateResult, unsafeCSS, query} from "lit-element";+import {css, customElement, html, property, query, TemplateResult, unsafeCSS} from "lit-element";import "@openremote/or-asset-tree";import "@openremote/or-asset-viewer";-import {ViewerConfig, OrAssetViewer, OrAssetViewerRequestEditToggleEvent} from "@openremote/or-asset-viewer";-import {AssetTreeConfig, OrAssetTreeSelectionChangedEvent, OrAssetTreeRequestSelectEvent, OrAssetTreeEditChangedEvent} from "@openremote/or-asset-tree";-import {DefaultBoxShadow} from "@openremote/core";+import {+ OrAssetViewer,+ OrAssetViewerEditToggleEvent,+ OrAssetViewerRequestEditToggleEvent,+ ViewerConfig+} from "@openremote/or-asset-viewer";+import {+ AssetTreeConfig,+ OrAssetTree,+ OrAssetTreeRequestSelectionEvent,+ OrAssetTreeSelectionEvent+} from "@openremote/or-asset-tree";+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 {showDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import i18next from "i18next";export interface PageAssetsConfig {@@ -85,10 +95,13 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {public config?: PageAssetsConfig;@property()- protected _editMode: boolean;+ protected _editMode: boolean = false;@property()- protected _assetId;+ protected _assetIds?: string[];++ @query("#tree")+ protected _tree!: OrAssetTree;@query("#viewer")protected _viewer!: OrAssetViewer;@@ -99,78 +112,75 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {constructor(store: EnhancedStore<S>) {super(store);- }-- connectedCallback() {- super.connectedCallback();- this.addEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);- this.addEventListener(OrAssetTreeRequestSelectEvent.NAME, this._onTreeSelectionRequested);- this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onTreeEditToggleRequested);- this.addEventListener(OrAssetTreeEditChangedEvent.NAME, this._onTreeEditChanged);- }-- disconnectedCallback() {- super.disconnectedCallback();- this.removeEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);- this.removeEventListener(OrAssetTreeRequestSelectEvent.NAME, this._onTreeSelectionRequested);+ this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onTreeSelectionChanged);+ this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onTreeSelectionRequested);+ this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onViewerEditToggleRequested);+ this.addEventListener(OrAssetViewerEditToggleEvent.NAME, this._onEditToggle);}protected render(): TemplateResult | void {- const selectedIds = this._assetId ? [this._assetId] : undefined;return html`- <or-asset-tree id="tree" .config="${this.config && this.config.tree ? this.config.tree : null}" class="${this._assetId ? "hideMobile" : ""}" .selectedIds="${selectedIds}"></or-asset-tree>- <or-asset-viewer id="viewer" .editMode="${!!this._editMode}" class="${!this._assetId ? "hideMobile" : ""}" .config="${this.config && this.config.viewer ? this.config.viewer : undefined}"></or-asset-viewer>+ <or-asset-tree id="tree" .config="${this.config && this.config.tree ? this.config.tree : null}" class="${this._assetIds && this._assetIds.length === 1 ? "hideMobile" : ""}" .selectedIds="${this._assetIds}"></or-asset-tree>+ <or-asset-viewer id="viewer" .config="${this.config && this.config.viewer ? this.config.viewer : undefined}" class="${!this._assetIds || this._assetIds.length !== 1 ? "hideMobile" : ""}" .editMode="${this._editMode}"></or-asset-viewer>`;}stateChanged(state: S) {- const editMode = state.app.params && state.app.params.editMode === "true";- const id = state.app.params && state.app.params.id ? state.app.params.id : undefined;- this._assetId = id;- this._editMode = editMode;+ // State is only utilised for initial loading+ this._editMode = !!(state.app.params && state.app.params.editMode === "true");+ this._assetIds = state.app.params && state.app.params.id ? [state.app.params.id as string] : undefined;}- protected _onTreeSelectionRequested(event: OrAssetTreeRequestSelectEvent) {- // Block the navigation and show dialog then navigate+ protected _onTreeSelectionRequested(event: OrAssetTreeRequestSelectionEvent) {++ // Block the navigation if current asset is modified then show dialog then navigate+ const isModified = this._viewer.isModified();++ if (!isModified) {+ return;+ }++ // Prevent the request and check if user wants to lose changesevent.detail.allow = false;- const assetId = event.detail.detail.node.asset.id;- const action = () => {- if (this._assetId === assetId && this._viewer.isModified()) {- // User has selected the same asset so reload it to discard changes++ this._confirmContinue(() => {+ if (Util.objectsEqual(event.detail.detail.newNodes, event.detail.detail.oldNodes)) {+ // User has clicked the same node so let's force reload itthis._viewer.reloadAsset();} else {- this._assetId = assetId;- this._updateRoute(false);+ this._assetIds = event.detail.detail.newNodes.map((node) => node.asset.id!);}- };- this._checkIfModified(action);+ });}- protected _onTreeSelectionChanged(event: OrAssetTreeSelectionChangedEvent) {- const nodes = event.detail;- const assetId = nodes[0] ? nodes[0].asset.id : undefined;- this._assetId = assetId;- this._viewer.assetId = assetId;- this._updateRoute();+ protected _onTreeSelectionChanged(event: OrAssetTreeSelectionEvent) {+ const nodes = event.detail.newNodes;+ this._assetIds = event.detail.newNodes.map((node) => node.asset.id!);+ this._viewer.assetId = nodes.length === 1 ? nodes[0].asset!.id : undefined;+ this._updateRoute(true);}- protected _onTreeEditToggleRequested(event: OrAssetViewerRequestEditToggleEvent) {- // Block the request and show dialog then toggle+ protected _onViewerEditToggleRequested(event: OrAssetViewerRequestEditToggleEvent) {+ // Block the request if current asset is modified then show dialog then navigate+ const isModified = this._viewer.isModified();++ if (!isModified) {+ return;+ }+event.detail.allow = false;- const editMode = event.detail.detail;- const action = () => {- this._editMode = editMode;- this._updateRoute(false);- };- this._checkIfModified(action);++ this._confirmContinue(() => {+ this._editMode = event.detail.detail;+ });}- protected _onTreeEditChanged(event: OrAssetTreeEditChangedEvent) {+ protected _onEditToggle(event: OrAssetViewerEditToggleEvent) {this._editMode = event.detail;- this._updateRoute();+ this._updateRoute(true);}- protected _checkIfModified(action: () => void) {+ protected _confirmContinue(action: () => void) {if (this._viewer.isModified()) {showDialog({@@ -199,9 +209,12 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {if (silent) {router.pause();}- router.navigate(getAssetsRoute(this._editMode, this._assetId));+ const assetId = this._assetIds && this._assetIds.length === 1 ? this._assetIds[0] : undefined;+ router.navigate(getAssetsRoute(this._editMode, assetId));if (silent) {- router.resume();+ window.setTimeout(() => {+ router.resume();+ }, 0);}}}diff --git a/ui/app/or-app/src/pages/page-mobile-geofences.ts b/ui/app/or-app/src/pages/page-mobile-geofences.tsindex 62d4b2249..5a259e049 100644--- a/ui/app/or-app/src/pages/page-mobile-geofences.ts+++ b/ui/app/or-app/src/pages/page-mobile-geofences.ts@@ -196,20 +196,10 @@ class PageMobileGeofences<S extends AppStateKeyed> extends Page<S> {constructor(store: EnhancedStore<S>) {super(store);this.getGeoNotifications();- }-- public connectedCallback() {- super.connectedCallback();this.addEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);this.addEventListener(OrMapClickedEvent.NAME, this.onMapClick);}- public disconnectedCallback() {- super.disconnectedCallback();- this.removeEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);- this.removeEventListener(OrMapClickedEvent.NAME, this.onMapClick);- }-protected onMapMarkerClick(evt: OrMapMarkerClickedEvent) {const marker:any = evt.detail.marker;this.activeItem = marker.marker;diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.tsindex 48aa23966..21765a66c 100644--- a/ui/component/core/src/util.ts+++ b/ui/component/core/src/util.ts@@ -460,11 +460,13 @@ export interface RequestEventDetail<T> {detail: T;}-export function dispatchCancellableEvent<T>(target: EventTarget, event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void) {+export function dispatchCancellableEvent<T>(target: EventTarget, event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void, cancelledHandler?: () => void) {target.dispatchEvent(event);window.setTimeout(() => {if (event.detail.allow) {handler(event.detail.detail);+ } else if (cancelledHandler) {+ cancelledHandler();}});}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 33aded2e5..0e9c5e175 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -23,7 +23,12 @@ export interface AssetTreeTypeConfig {}export interface AssetTreeConfig {- addAsset?: {+ select?: {+ multiSelect?: boolean;+ interceptor?: (node: UiAssetTreeNode | null) => boolean;+ types?: string[];+ };+ add?: {typesProvider?: (parent: UiAssetTreeNode | undefined) => AssetDescriptor[] | undefined;typesParent?: {default?: AssetTreeTypeConfig;@@ -41,19 +46,19 @@ export interface UiAssetTreeNode extends AssetTreeNode {children: UiAssetTreeNode[];}-interface NodeClickEventDetail {- node: UiAssetTreeNode;- clickEvent: MouseEvent;+interface NodeSelectEventDetail {+ oldNodes: UiAssetTreeNode[];+ newNodes: UiAssetTreeNode[];}export {style};-export class OrAssetTreeRequestSelectEvent extends CustomEvent<Util.RequestEventDetail<NodeClickEventDetail>> {+export class OrAssetTreeRequestSelectionEvent extends CustomEvent<Util.RequestEventDetail<NodeSelectEventDetail>> {public static readonly NAME = "or-asset-tree-request-select";- constructor(request: NodeClickEventDetail) {- super(OrAssetTreeRequestSelectEvent.NAME, {+ constructor(request: NodeSelectEventDetail) {+ super(OrAssetTreeRequestSelectionEvent.NAME, {bubbles: true,composed: true,detail: {@@ -64,44 +69,55 @@ export class OrAssetTreeRequestSelectEvent extends CustomEvent<Util.RequestEvent}}-export class OrAssetTreeEditChangedEvent extends CustomEvent<boolean> {+export class OrAssetTreeSelectionEvent extends CustomEvent<NodeSelectEventDetail> {- public static readonly NAME = "or-asset-tree-edit-changed";+ public static readonly NAME = "or-asset-tree-selection-changed";- constructor(edit: boolean) {- super(OrAssetTreeEditChangedEvent.NAME, {+ constructor(detail: NodeSelectEventDetail) {+ super(OrAssetTreeSelectionEvent.NAME, {bubbles: true,composed: true,- detail: edit+ detail: detail});}}-export class OrAssetTreeRequestAddEvent extends CustomEvent<Util.RequestEventDetail<Asset>> {+export type AddEventDetail = {+ asset: Asset;+ isCopy: boolean;+}++export class OrAssetTreeRequestAddEvent extends CustomEvent<Util.RequestEventDetail<AddEventDetail>> {public static readonly NAME = "or-asset-tree-request-add";- constructor(asset: Asset) {+ constructor(asset: Asset, isCopy: boolean = false) {super(OrAssetTreeRequestAddEvent.NAME, {bubbles: true,composed: true,detail: {allow: true,- detail: asset+ detail: {+ asset: asset,+ isCopy: isCopy+ }}});}}-export class OrAssetTreeAssetAddedEvent extends CustomEvent<Asset> {+export class OrAssetTreeAddEvent extends CustomEvent<AddEventDetail> {- public static readonly NAME = "or-asset-tree-asset-added";+ public static readonly NAME = "or-asset-tree-add";- constructor(asset: Asset) {+ constructor(asset: Asset, isCopy: boolean = false) {super(OrAssetTreeRequestAddEvent.NAME, {bubbles: true,composed: true,- detail: asset+ detail: {+ asset: asset,+ isCopy: isCopy+ }});}}@@ -138,27 +154,14 @@ export class OrAssetTreeRequestCopyEvent extends CustomEvent<Util.RequestEventDe}}-export class OrAssetTreeSelectionChangedEvent extends CustomEvent<UiAssetTreeNode[]> {-- public static readonly NAME = "or-asset-tree-selection-changed";-- constructor(nodes: UiAssetTreeNode[]) {- super(OrAssetTreeSelectionChangedEvent.NAME, {- bubbles: true,- composed: true,- detail: nodes- });- }-}-declare global {export interface HTMLElementEventMap {- [OrAssetTreeRequestSelectEvent.NAME]: OrAssetTreeRequestSelectEvent;+ [OrAssetTreeRequestSelectionEvent.NAME]: OrAssetTreeRequestSelectionEvent;[OrAssetTreeRequestAddEvent.NAME]: OrAssetTreeRequestAddEvent;+ [OrAssetTreeAddEvent.NAME]: OrAssetTreeAddEvent;[OrAssetTreeRequestDeleteEvent.NAME]: OrAssetTreeRequestDeleteEvent;[OrAssetTreeRequestCopyEvent.NAME]: OrAssetTreeRequestCopyEvent;- [OrAssetTreeSelectionChangedEvent.NAME]: OrAssetTreeSelectionChangedEvent;- [OrAssetTreeEditChangedEvent.NAME]: OrAssetTreeEditChangedEvent;+ [OrAssetTreeSelectionEvent.NAME]: OrAssetTreeSelectionEvent;}}@@ -181,8 +184,6 @@ export const getAssetTypes = async () => {}}-// TODO: Add websocket support-// TODO: Make modal a standalone component@customElement("or-asset-tree")export class OrAssetTree extends subscribe(manager)(LitElement) {@@ -222,15 +223,6 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {@property({type: Boolean})public disableSubscribe: boolean = false;- @property({type: Boolean})- public multiSelect?: boolean = true;-- @property({type: Function, noAccessor: true, attribute: false})- public selector?: (node: UiAssetTreeNode) => boolean;-- @property({type: Array, noAccessor: true})- public selectTypes?: string[];-@property({type: Array})public selectedIds?: string[];@@ -251,6 +243,10 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {return this._selectedNodes ? [...this._selectedNodes] : [];}+ public set selectedNodes(nodes: UiAssetTreeNode[]) {+ this.selectedIds = nodes.map((node) => node.asset!.id!);+ }+/*** Override subscribe mixin behaviour to get re-render*/@@ -287,7 +283,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {<div id="header-btns"><or-input ?hidden="${!this.selectedIds || this.selectedIds.length === 0}" type="${InputType.BUTTON}" icon="close" @click="${() => this._onDeselectClicked()}"></or-input>- <or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length === 0}" type="${InputType.BUTTON}" icon="content-copy" @click="${() => this._onCopyClicked()}"></or-input>+ <or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length !== 1}" type="${InputType.BUTTON}" icon="content-copy" @click="${() => this._onCopyClicked()}"></or-input><or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length === 0}" type="${InputType.BUTTON}" icon="delete" @click="${() => this._onDeleteClicked()}"></or-input><or-input ?hidden="${this._isReadonly() || !this._canAdd()}" type="${InputType.BUTTON}" icon="plus" @click="${() => this._onAddClicked()}"></or-input><or-input hidden type="${InputType.BUTTON}" icon="magnify" @click="${() => this._onSearchClicked()}"></or-input>@@ -375,8 +371,12 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {});this.selectedIds = actuallySelectedIds;+ const oldSelection = this._selectedNodes;this._selectedNodes = selectedNodes;- this.dispatchEvent(new OrAssetTreeSelectionChangedEvent(this._selectedNodes));+ this.dispatchEvent(new OrAssetTreeSelectionEvent({+ oldNodes: oldSelection,+ newNodes: selectedNodes+ }));}protected _updateSort(nodes: UiAssetTreeNode[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {@@ -388,51 +388,84 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {nodes.forEach((node) => this._updateSort(node.children, sortFunction));}- protected _onNodeClicked(evt: MouseEvent, node: UiAssetTreeNode) {- if (evt.defaultPrevented) {+ protected _onNodeClicked(evt: MouseEvent | null, node: UiAssetTreeNode | null) {+ if (evt && evt.defaultPrevented) {return;}- evt.preventDefault();+ if (evt) {+ evt.preventDefault();+ }- const isExpander = (evt.target as HTMLElement).className.indexOf("expander") >= 0;+ const isExpander = evt && (evt.target as HTMLElement).className.indexOf("expander") >= 0;if (isExpander) {- if (node.expandable) {+ if (node && node.expandable) {node.expanded = !node.expanded;- const elem = (evt.target as HTMLElement).parentElement!.parentElement!.parentElement!;+ const elem = (evt!.target as HTMLElement).parentElement!.parentElement!.parentElement!;elem.toggleAttribute("data-expanded");}} else {let canSelect = true;- if (this.selector) {- canSelect = this.selector(node);- } else if (this.selectTypes) {- canSelect = this.selectTypes.indexOf(node.asset!.type!) >= 0;+ 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) {+ canSelect = this.config.select.types.indexOf(node.asset!.type!) >= 0;}- if (canSelect) {- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestSelectEvent({- node: node,- clickEvent: evt- }), (detail) => this._doSelect(detail));+ if (!canSelect) {+ return;}++ let selectedNodes: UiAssetTreeNode[] = [];++ if (node) {+ const index = this.selectedIds ? this.selectedIds.indexOf(node.asset!.id!) : -1;+ 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)) {+ deselectOthers = false;+ if (index >= 0 && this.selectedIds && this.selectedIds.length > 1) {+ select = false;+ }+ }++ if (deselectOthers) {+ selectedNodes = [node];+ } else if (select) {+ if (index < 0) {+ selectedNodes = [...this.selectedNodes];+ selectedNodes.push(node);+ }+ } else if (index >= 0) {+ selectedNodes = [...this.selectedNodes];+ selectedNodes.splice(index, 1);+ }+ }++ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestSelectionEvent({+ oldNodes: this.selectedNodes,+ newNodes: selectedNodes+ }), (detail) => this.selectedNodes = detail.newNodes);}}protected _onDeselectClicked() {- this.selectedIds = [];+ this._onNodeClicked(null, null);}protected _onCopyClicked() {if (this._selectedNodes.length > 0) {- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestCopyEvent(this._selectedNodes[0]), (node) => this._doCopy(node));+ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestCopyEvent(this._selectedNodes[0]), () => this._doCopy());}}protected _onDeleteClicked() {- Util.dispatchCancellableEvent(this, new OrAssetTreeRequestDeleteEvent(this._selectedNodes), (nodes) => this._doDelete());+ Util.dispatchCancellableEvent(this, new OrAssetTreeRequestDeleteEvent(this._selectedNodes), () => this._doDelete());}protected _onAddClicked() {@@ -536,41 +569,6 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {this.sortBy = sortBy;}- protected _doSelect(detail: NodeClickEventDetail) {- const node = detail.node;- const evt = detail.clickEvent;-- let selectedIds = this.selectedIds ? this.selectedIds : [];- const index = selectedIds.indexOf(node.asset!.id!);- let select = true;- let deselectOthers = true;-- if (this.multiSelect) {- if (evt.ctrlKey || evt.metaKey) {- deselectOthers = false;- if (index >= 0 && selectedIds.length > 1) {- select = false;- }- }- }-- if (deselectOthers) {- selectedIds = [node.asset!.id!];- } else if (select) {- if (index < 0) {- selectedIds = [...selectedIds];- selectedIds.push(node.asset!.id!);- }- } else {- if (index >= 0) {- selectedIds.splice(index, 1);- selectedIds = [...selectedIds];- }- }-- this.selectedIds = selectedIds;- }-protected _doDelete() {if (!this._selectedNodes || this._selectedNodes.length === 0) {@@ -635,25 +633,25 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {let includedAssetTypes: string[] | undefined;let excludedAssetTypes: string[];- if (this.config && this.config.addAsset) {- if (this.config.addAsset.typesProvider) {- const allowedTypes = this.config.addAsset.typesProvider(selectedNode);+ if (this.config && this.config.add) {+ if (this.config.add.typesProvider) {+ const allowedTypes = this.config.add.typesProvider(selectedNode);if (allowedTypes) {return allowedTypes;}}- if (this.config.addAsset.typesParent) {+ if (this.config.add.typesParent) {let config: AssetTreeTypeConfig | undefined;- if (!selectedNode && this.config.addAsset.typesParent.none) {- config = this.config.addAsset.typesParent.none;- } else if (selectedNode && this.config.addAsset.typesParent.assetTypes) {- config = this.config.addAsset.typesParent.assetTypes[selectedNode.asset!.type!];+ if (!selectedNode && this.config.add.typesParent.none) {+ config = this.config.add.typesParent.none;+ } else if (selectedNode && this.config.add.typesParent.assetTypes) {+ config = this.config.add.typesParent.assetTypes[selectedNode.asset!.type!];}if (!config) {- config = this.config.addAsset.typesParent.default;+ config = this.config.add.typesParent.default;}if (config) {@@ -671,11 +669,15 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {protected async _doAdd(asset: Asset) {const response = await manager.rest.api.AssetResource.create(asset);this._addedAssetId = response.data.id!;- this.dispatchEvent(new OrAssetTreeAssetAddedEvent(response.data));+ this.dispatchEvent(new OrAssetTreeAddEvent(response.data));}- protected _doCopy(node: UiAssetTreeNode) {-+ 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));}protected _getSortFunction(): (a: UiAssetTreeNode, b: UiAssetTreeNode) => number {diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex ae3a3020b..22a9d7f6b 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -209,11 +209,25 @@ export class OrAssetViewerRequestEditToggleEvent extends CustomEvent<Util.Reques}}+export class OrAssetViewerEditToggleEvent extends CustomEvent<boolean> {++ public static readonly NAME = "or-asset-viewer-edit-toggle";++ constructor(edit: boolean) {+ super(OrAssetViewerEditToggleEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: edit+ });+ }+}+declare global {export interface HTMLElementEventMap {[OrAssetViewerComputeGridEvent.NAME]: OrAssetViewerComputeGridEvent;[OrAssetViewerSaveResultEvent.NAME]: OrAssetViewerSaveResultEvent;[OrAssetViewerRequestEditToggleEvent.NAME]: OrAssetViewerRequestEditToggleEvent;+ [OrAssetViewerEditToggleEvent.NAME]: OrAssetViewerEditToggleEvent;}}@@ -780,6 +794,9 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem@query("#save-btn")protected saveBtnElem!: OrInput;+ @query("#edit-btn")+ protected editBtnElem!: OrInput;+constructor() {super();this.addEventListener(OrAssetViewerComputeGridEvent.NAME, () => OrAssetViewer.generateGrid(this.shadowRoot));@@ -789,7 +806,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}public isModified() {- return this.editMode && this._assetModified;+ return !!this.editMode && this._assetModified;}connectedCallback() {@@ -886,7 +903,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem${!this._isReadonly() ? html`<span id="edit-wrapper"><or-translate value="editAsset"></or-translate>- <or-input .type="${InputType.SWITCH}" .value="${this.editMode}" @or-input-changed="${(ev: OrInputChangedEvent) => this._onEditToggled(ev.detail.value)}"></or-input>+ <or-input id="edit-btn" .type="${InputType.SWITCH}" .value="${this.editMode}" @or-input-changed="${(ev: OrInputChangedEvent) => this._onEditToggleClicked(ev.detail.value)}"></or-input></span>`: ``}<div id="right-wrapper">@@ -939,8 +956,17 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemawait this.updateComplete;}- protected _onEditToggled(edit: boolean) {- Util.dispatchCancellableEvent(this, new OrAssetViewerRequestEditToggleEvent(edit), () => this.editMode = edit);+ protected _onEditToggleClicked(edit: boolean) {+ Util.dispatchCancellableEvent(+ this,+ new OrAssetViewerRequestEditToggleEvent(edit),+ () => this._doEditToggle(edit),+ () => this.editBtnElem.value = !edit);+ }++ protected _doEditToggle(edit: boolean) {+ this.editMode = edit;+ this.dispatchEvent(new OrAssetViewerEditToggleEvent(edit));}protected async _saveAsset() {diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex f8b6ae43b..2cbcbb1e3 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@@ -189,7 +189,7 @@ export class OrEditAssetPanel extends LitElement {</tr></thead><tbody class="mdc-data-table__content">- ${Object.entries(this.asset.attributes!).sort(Util.sortByString(([name, attribute]) => name.toUpperCase())).map(([name, attribute]) => {attribute.name = name; return this._getEditAttributeTemplate(this.asset.type!, attribute as Attribute);})}+ ${!this.asset.attributes ? `` : Object.entries(this.asset.attributes!).sort(Util.sortByString(([name, attribute]) => name.toUpperCase())).map(([name, attribute]) => {attribute.name = name; return this._getEditAttributeTemplate(this.asset.type!, attribute as Attribute);})}<tr><td colspan="4"><div class="item-add">diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex d3e787ed4..1f1d86456 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -8,7 +8,7 @@ import {InputType, OrInputChangedEvent} from "@openremote/or-input";import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";import "@openremote/or-mwc-components/dist/or-mwc-dialog";import moment from "moment";-import {OrAssetTreeSelectionChangedEvent} from "@openremote/or-asset-tree";+import {OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";import {OrMwcDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";@@ -231,12 +231,12 @@ export class OrAttributeCard extends LitElement {constructor() {super();- this.addEventListener(OrAttributeCardAddAttributeEvent.NAME, this._setAttribute)+ this.addEventListener(OrAttributeCardAddAttributeEvent.NAME, this._setAttribute);+ this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onTreeSelectionChanged);}connectedCallback() {super.connectedCallback();- this.addEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);this._style = window.getComputedStyle(this);this.getData();}@@ -244,7 +244,6 @@ export class OrAttributeCard extends LitElement {disconnectedCallback(): void {super.disconnectedCallback();this._cleanup();- this.removeEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);}updated(changedProperties: PropertyValues) {@@ -444,13 +443,13 @@ export class OrAttributeCard extends LitElement {}}- protected _onTreeSelectionChanged(event: OrAssetTreeSelectionChangedEvent) {+ protected _onTreeSelectionChanged(event: OrAssetTreeSelectionEvent) {// Need to fully load the assetif (!manager.events) {return;}- const selectedNode = event.detail && event.detail.length > 0 ? event.detail[0] : undefined;+ const selectedNode = event.detail && event.detail.newNodes.length > 0 ? event.detail.newNodes[0] : undefined;if (!selectedNode) {this.asset = undefined;diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex 6b539c45a..92657304c 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -28,7 +28,7 @@ import "@openremote/or-translate";import Chart, {ChartDataSets, ChartOptions} from "chart.js";import {InputType, OrInputChangedEvent} from "@openremote/or-input";import moment from "moment";-import {OrAssetTreeSelectionChangedEvent} from "@openremote/or-asset-tree";+import {OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";import * as ChartAnnotation from "chartjs-plugin-annotation";@@ -389,13 +389,13 @@ export class OrChart extends translate(i18next)(LitElement) {}}- protected _onTreeSelectionChanged(event: OrAssetTreeSelectionChangedEvent) {+ protected _onTreeSelectionChanged(event: OrAssetTreeSelectionEvent) {// Need to fully load the assetif (!manager.events) {return;}- const selectedNode = event.detail && event.detail.length > 0 ? event.detail[0] : undefined;+ const selectedNode = event.detail && event.detail.newNodes.length > 0 ? event.detail.newNodes[0] : undefined;if (!selectedNode) {this.activeAsset = undefined;@@ -415,13 +415,13 @@ export class OrChart extends translate(i18next)(LitElement) {connectedCallback() {super.connectedCallback();this._style = window.getComputedStyle(this);- this.addEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);+ this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onTreeSelectionChanged);}disconnectedCallback(): void {super.disconnectedCallback();this._cleanup();- this.removeEventListener(OrAssetTreeSelectionChangedEvent.NAME, this._onTreeSelectionChanged);+ this.removeEventListener(OrAssetTreeSelectionEvent.NAME, this._onTreeSelectionChanged);}render() {diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.tsindex 06a98f454..7f148c63d 100644--- a/ui/component/or-data-viewer/src/index.ts+++ b/ui/component/or-data-viewer/src/index.ts@@ -162,12 +162,25 @@ export class OrDataViewer extends translate(i18next)(LitElement) {@property()protected _loading: boolean = false;+ protected _resizeHandler = () => {+ OrDataViewer.generateGrid(this.shadowRoot)+ };+constructor() {super();- window.addEventListener("resize", () => OrDataViewer.generateGrid(this.shadowRoot));this.addEventListener(OrChartEvent.NAME, () => OrDataViewer.generateGrid(this.shadowRoot));}+ connectedCallback() {+ super.connectedCallback();+ window.addEventListener("resize", this._resizeHandler);+ }++ disconnectedCallback() {+ super.disconnectedCallback();+ window.removeEventListener("resize", this._resizeHandler);+ }+public async onCompleted() {await this.updateComplete;}diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.tsindex 355248c00..114b977b5 100644--- a/ui/component/or-input/src/index.ts+++ b/ui/component/or-input/src/index.ts@@ -846,15 +846,18 @@ export class OrInput extends LitElement {}}} else {+ // some components need to be kept in sync with the DOMif (this.type === InputType.SELECT && this._mdcComponent) {(this._mdcComponent as MDCSelect).selectedIndex = this._selectedIndex;- }- if (this.type === InputType.RANGE && this._mdcComponent) {+ } else if (this.type === InputType.RANGE && this._mdcComponent) {const slider = this._mdcComponent as MDCSlider;slider.disabled = this.disabled || this.readonly;slider.min = this.min;slider.max = this.max;slider.value = this.value;+ } else if (this.type === InputType.SWITCH && this._mdcComponent) {+ const swtch = this._mdcComponent as MDCSwitch;+ swtch.checked = this.value;}}}diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex a29ab6e45..b044c0ea8 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -126,7 +126,6 @@ export class OrMap extends LitElement {protected firstUpdated(_changedProperties: PropertyValues): void {super.firstUpdated(_changedProperties);- manager.addListener(this.onManagerEvent);if (manager.ready) {this.loadMap();}@@ -155,6 +154,10 @@ export class OrMap extends LitElement {return this._markers;}+ public connectedCallback() {+ super.connectedCallback();+ manager.addListener(this.onManagerEvent);+ }public disconnectedCallback() {super.disconnectedCallback();diff --git a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts b/ui/component/or-rules/src/flow-viewer/components/internal-picker.tsindex 1dede1e4c..201712a09 100644--- a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts+++ b/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts@@ -4,7 +4,7 @@ import { nodeConverter } from "../converters/node-converter";import { OrInputChangedEvent } from "@openremote/or-input";import rest from "@openremote/rest";import "@openremote/or-asset-tree";-import { OrAssetTreeRequestSelectEvent } from "@openremote/or-asset-tree";+import { OrAssetTreeRequestSelectionEvent } from "@openremote/or-asset-tree";import { ResizeObserver } from "resize-observer";import { project, modal } from "./flow-editor";import { NodeUtilities } from "../node-structure";@@ -83,9 +83,13 @@ export class InternalPicker extends translate(i18next)(LitElement) {}private get assetTreeTemplate() {- return html`<or-asset-tree @or-asset-tree-request-select="${(e: OrAssetTreeRequestSelectEvent) => {+ return html`<or-asset-tree @or-asset-tree-request-select="${(e: OrAssetTreeRequestSelectionEvent) => {+ if (!e.detail.detail || e.detail.detail.newNodes.length !== 1) {+ e.detail.allow = false;+ return;+ }const value: AssetAttributeInternalValue = {- assetId: e.detail.detail.node.asset!.id,+ assetId: e.detail.detail.newNodes[0].asset!.id,attributeName: "nothing yet"};this.setValue(value);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.tsindex 0e6097697..e8c8cdb1a 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@@ -17,8 +17,6 @@ import {translate} from "@openremote/or-translate";import {DialogAction, OrMwcDialog, OrMwcDialogOpenedEvent} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import {OrMap, OrMapClickedEvent} from '@openremote/or-map';import '@openremote/or-map/dist/markers/or-map-marker';--import {LatLngLike} from "mapbox.js";import {LngLatLike} from "mapbox-gl";@customElement("or-rule-radial-modal")@@ -41,14 +39,14 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {initRadialMap() {const modal = this.shadowRoot!.getElementById('radial-modal');- if(!modal) return;+ if (!modal) return;const map = modal.shadowRoot!.querySelector('.or-map') as OrMap;- if(map){+ if (map) {map.addEventListener(OrMapClickedEvent.NAME, (evt: CustomEvent) => {const lngLat:any = evt.detail.lngLat;- const latElement = (<HTMLInputElement>modal.shadowRoot!.querySelector('.location-lat'));- const lngElement = (<HTMLInputElement>modal.shadowRoot!.querySelector('.location-lng'));+ const latElement = modal.shadowRoot!.querySelector('.location-lat') as HTMLInputElement;+ const lngElement = modal.shadowRoot!.querySelector('.location-lng') as HTMLInputElement;latElement.value = lngLat.lat;lngElement.value = lngLat.lng;@@ -58,15 +56,14 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {this.setValuePredicateProperty('lat', lngLat.lat);this.setValuePredicateProperty('lng', lngLat.lng);});- if(map){- const latElement = (<HTMLInputElement>modal.shadowRoot!.querySelector('.location-lat'));- const lngElement = (<HTMLInputElement>modal.shadowRoot!.querySelector('.location-lng'));- if(lngElement.value && latElement.value) {- const LngLat:LngLatLike = [parseFloat(lngElement.value), parseFloat(latElement.value)];- map.flyTo(LngLat, 15)- } else {- map.flyTo();- }++ const latElement = modal.shadowRoot!.querySelector('.location-lat') as HTMLInputElement;+ const lngElement = modal.shadowRoot!.querySelector('.location-lng') as HTMLInputElement;+ if (lngElement.value && latElement.value) {+ const LngLat:LngLatLike = [parseFloat(lngElement.value), parseFloat(latElement.value)];+ map.flyTo(LngLat, 15)+ } else {+ map.flyTo();}}}@@ -88,26 +85,24 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {}renderDialogHTML(value:RadialGeofencePredicate) {- const dialog: OrMwcDialog = this.shadowRoot!.getElementById("radial-modal") as OrMwcDialog;--- if (dialog) {+ const dialog: OrMwcDialog = this.shadowRoot!.getElementById("radial-modal") as OrMwcDialog;++ 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-marker active color="#FF0000" icon="information" lat="${value.lat}" lng="${value.lng}" radius="${value.radius}"></or-map-marker>- </or-map>-- <div class="layout horizontal">- <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>-+ <div style="display:grid">+ <or-map class="or-map" type="VECTOR" style="border: 1px solid #d5d5d5; height: 400px; min-width: 300px;">+ <or-map-marker active color="#FF0000" icon="information" lat="${value.lat}" lng="${value.lng}" radius="${value.radius}"></or-map-marker>+ </or-map>- <label>Straal (minimaal 100m)</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>`;-+ <div class="layout horizontal">+ <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>+ <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>`;}}@@ -159,4 +154,4 @@ export class OrRuleRadialModal extends translate(i18next)(LitElement) {<or-mwc-dialog id="radial-modal" dialogTitle="area" .dialogActions="${radiusPickerModalActions}"></or-mwc-dialog>`}-}\ No newline at end of file+}diff --git a/ui/component/or-table/src/index.ts b/ui/component/or-table/src/index.tsindex 14a23638b..45d83b7ee 100644--- a/ui/component/or-table/src/index.ts+++ b/ui/component/or-table/src/index.ts@@ -86,7 +86,7 @@ export class OrTable extends LitElement {public headers?: string[];@property({type: Array})- public rows!: string[][];+ public rows?: string[][];@property({type: Array})public options?: TableOptions = {@@ -111,7 +111,7 @@ export class OrTable extends LitElement {<table class="mdc-data-table__table" aria-label="Dessert calories">${headerTemplate}<tbody class="mdc-data-table__content">- ${this.rows.map(item => html`+ ${!this.rows ? `` : this.rows.map(item => html`<tr class="mdc-data-table__row">${item.map((cell: string|number) => {return html`<td class="mdc-data-table__cell ${classMap({"mdc-data-table__cell--numeric": typeof cell === "number"})}" title="${cell}">${cell}</td>`;