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
667 multi select assets and move them in tree (#743)
Jérôme Vervier33944311e2e6
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 9da2ba0eb..9c932e041 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -602,4 +602,38 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourreturn new AttributeWriteResult(ref, failure);}++ @Override+ public void updateParent(RequestParams requestParams, String parentId, List<String> assetIds) {+ AssetQuery query = new AssetQuery();+ query.ids = assetIds.stream().toArray(String[]::new);++ List<Asset<?>> assets = this.assetStorageService.findAll(query);+ LOG.info("Get " + assets.size() + " assets from query");++ for (Asset asset : assets) {+ asset.setParentId(parentId);++ LOG.info("Set asset " + asset.getId() + " new parent " + parentId);++ assetStorageService.merge(asset);+ }+ }++ @Override+ public void updateNoneParent(RequestParams requestParams, List<String> assetIds) {+ AssetQuery query = new AssetQuery();+ query.ids = assetIds.stream().toArray(String[]::new);++ List<Asset<?>> assets = this.assetStorageService.findAll(query);+ LOG.info("Get " + assets.size() + " assets from query");++ for (Asset asset : assets) {+ asset.setParentId(null);++ LOG.info("Set asset " + asset.getId() + " with no parent");++ assetStorageService.merge(asset);+ }+ }}diff --git a/manager/src/web/shared/locales/ar/or.json b/manager/src/web/shared/locales/ar/or.jsonindex 5ff986f48..1e62901af 100644--- a/manager/src/web/shared/locales/ar/or.json+++ b/manager/src/web/shared/locales/ar/or.json@@ -96,6 +96,8 @@"path": "المسار","showOnMap": "إظهار على الخريطة","noAssetSelected": "الرجاء إختيار مكون من اليسار",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","loading": "جاري التحميل","noAssetsFound": "No assets found","location": "الموقع",@@ -384,6 +386,7 @@"daysOfTheWeek": "أيام الأسبوع","dismiss": "رفض","createAssetFailed": " فشل في إنشاء المكون ",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "صلاحيات القراءة",diff --git a/manager/src/web/shared/locales/cn/or.json b/manager/src/web/shared/locales/cn/or.jsonindex 1463a377a..fc987125d 100644--- a/manager/src/web/shared/locales/cn/or.json+++ b/manager/src/web/shared/locales/cn/or.json@@ -96,6 +96,8 @@"path": "路径","showOnMap": "在地图显示","noAssetSelected": "请选择左列资源",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","loading": "加载中...","noAssetsFound": "No assets found","location": "位置",@@ -406,6 +408,7 @@"daysOfTheWeek": "天每周","dismiss": "忽略","createAssetFailed": "创建资源失败",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "读权限",diff --git a/manager/src/web/shared/locales/de/or.json b/manager/src/web/shared/locales/de/or.jsonindex 34a59cce0..8a000f3d8 100644--- a/manager/src/web/shared/locales/de/or.json+++ b/manager/src/web/shared/locales/de/or.json@@ -105,6 +105,8 @@"path": "Pfad","showOnMap": "Auf Karte anzeigen","noAssetSelected": "Bitte wählen Sie links ein Asset aus",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","noAssetTypeSelected": "Bitte wählen Sie links ein Asset Type aus","loading": "Wird geladen...","noAssetsFound": "No assets found",@@ -417,6 +419,7 @@"daysOfTheWeek": "Wochentage","dismiss": "entlassen","createAssetFailed": "Objekt konnte nicht erstellt werden",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Leseberechtigungen","writePermissions": "Schreibberechtigungen",diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.jsonindex ca904caf6..7bceed2d0 100644--- a/manager/src/web/shared/locales/en/or.json+++ b/manager/src/web/shared/locales/en/or.json@@ -105,6 +105,8 @@"path": "Path","showOnMap": "Show on map","noAssetSelected": "Please select an asset on the left",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","noAssetTypeSelected": "Please select an asset type on the left","loading": "Loading...","noAssetsFound": "No assets found",@@ -420,6 +422,7 @@"daysOfTheWeek": "days of the week","dismiss": "dismiss","createAssetFailed": "Failed to create asset",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Read permissions","writePermissions": "Write permissions",diff --git a/manager/src/web/shared/locales/es/or.json b/manager/src/web/shared/locales/es/or.jsonindex 82eb064fc..1b1849b9c 100644--- a/manager/src/web/shared/locales/es/or.json+++ b/manager/src/web/shared/locales/es/or.json@@ -96,6 +96,8 @@"path": "Ruta","showOnMap": "Mostrar en el mapa","noAssetSelected": "Seleccione un activo a la izquierda",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","loading": "Cargando...","noAssetsFound": "No assets found","location": "Posición",@@ -406,6 +408,7 @@"daysOfTheWeek": "Días de la semana","dismiss": "despedir","createAssetFailed": "No se pudo crear el activo",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Leer permisos",diff --git a/manager/src/web/shared/locales/fr/or.json b/manager/src/web/shared/locales/fr/or.jsonindex d0d0513c6..778ee1529 100644--- a/manager/src/web/shared/locales/fr/or.json+++ b/manager/src/web/shared/locales/fr/or.json@@ -96,6 +96,8 @@"path": "Chemin","showOnMap": "Montrer sur la carte","noAssetSelected": "Veuillez sélectionner une ressource à gauche",+ "multiAssetSelected": "{{assetNbr}} ressources sélectionnées",+ "changeParent": "Change Parent","loading": "Chargement...","noAssetsFound": "Aucune ressource trouvée","location": "Position",@@ -406,6 +408,7 @@"daysOfTheWeek": "jours de la semaine","dismiss": "rejeter","createAssetFailed": "Impossible de créer la ressource",+ "moveAssetFailed": "Impossible de déplacer la ressource","logCategory": {},"readPermissions": "Autorisations de lire",diff --git a/manager/src/web/shared/locales/it/or.json b/manager/src/web/shared/locales/it/or.jsonindex 4d12db268..332ac95a2 100644--- a/manager/src/web/shared/locales/it/or.json+++ b/manager/src/web/shared/locales/it/or.json@@ -96,6 +96,8 @@"path": "Percorso","showOnMap": "Mostra sulla mappa","noAssetSelected": "Seleziona un asset sulla sinistra",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","loading": "In caricamento...","noAssetsFound": "No assets found","location": "Posizione",@@ -406,6 +408,7 @@"daysOfTheWeek": "Giorni della settimana","dismiss": "dismiss","createAssetFailed": "Fallita la creazione del asset",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Leggi permessi",diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.jsonindex ca3e1e39a..8abab0984 100644--- a/manager/src/web/shared/locales/nl/or.json+++ b/manager/src/web/shared/locales/nl/or.json@@ -105,6 +105,8 @@"path": "Pad","showOnMap": "Tonen op kaart","noAssetSelected": "Kies een asset uit de lijst aan de linkerkant",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","noAssetTypeSelected": "Kies een asset type uit de lijst aan de linkerkant","loading": "Aan het laden...","noAssetsFound": "Geen assets gevonden",@@ -419,6 +421,7 @@"daysOfTheWeek": "dagen van de week","dismiss": "sluiten","createAssetFailed": "Asset aanmaken is niet gelukt",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Leesrechten",diff --git a/manager/src/web/shared/locales/pt/or.json b/manager/src/web/shared/locales/pt/or.jsonindex 11c461cff..bd096c9c7 100644--- a/manager/src/web/shared/locales/pt/or.json+++ b/manager/src/web/shared/locales/pt/or.json@@ -96,6 +96,8 @@"path": "Trajeto","showOnMap": "Mostrar no mapa","noAssetSelected": "Selecione um ativo à esquerda",+ "multiAssetSelected": "{{assetNbr}} assets selected",+ "changeParent": "Change Parent","loading": "Carregando ...","noAssetsFound": "No assets found","location": "Posição",@@ -395,6 +397,7 @@"daysOfTheWeek": "Dias da semana","dismiss": "dispensar","createAssetFailed": "Falha ao criar ativo",+ "moveAssetFailed": "Failed to move asset","logCategory": {},"readPermissions": "Permissões de leitura","writePermissions": "Permissões de escrita",diff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.javaindex 735d81ac9..ab077aa29 100644--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java@@ -35,6 +35,8 @@ import org.openremote.model.value.MetaItemType;import javax.annotation.security.RolesAllowed;import javax.validation.Valid;+import javax.validation.constraints.NotNull;+import javax.validation.constraints.Size;import javax.ws.rs.*;import javax.ws.rs.core.Response;import java.util.List;@@ -277,4 +279,21 @@ public interface AssetResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)Asset<?>[] queryAssets(@BeanParam RequestParams requestParams, AssetQuery query);++ /**+ * Change parent for a set of asset+ */+ @PUT+ @Path("{parentAssetId}/child")+ @Consumes(APPLICATION_JSON)+ @Produces(APPLICATION_JSON)+ void updateParent(@BeanParam RequestParams requestParams, @PathParam("parentAssetId") @NotNull(message = "Parent reference required") String parentId, @QueryParam("assetIds") @Size(min = 1, message = "At least one child to update parent reference") List<String> assetIds);++ /**+ * Remove parent reference from each asset referenced in the query parameter assetIds+ */+ @DELETE+ @Path("/parent")+ @Produces(APPLICATION_JSON)+ void updateNoneParent(@BeanParam RequestParams requestParams, @QueryParam("assetIds") @Size(min = 1, message = "At least one child to update parent reference") List<String> assetIds);}diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.tsindex ced48a368..0a57f0bfe 100644--- a/ui/app/manager/src/pages/page-assets.ts+++ b/ui/app/manager/src/pages/page-assets.ts@@ -1,9 +1,9 @@import {css, html, TemplateResult, unsafeCSS} from "lit";import {customElement, property, query} from "lit/decorators.js";-import "@openremote/or-asset-tree";import "@openremote/or-asset-viewer";import {OrAssetViewer,+ OrAssetViewerChangeParentEvent,OrAssetViewerEditToggleEvent,OrAssetViewerRequestEditToggleEvent,OrAssetViewerSaveEvent,@@ -16,6 +16,7 @@ import {OrAssetTree,OrAssetTreeAddEvent,OrAssetTreeAssetEvent,+ OrAssetTreeChangeParentEvent,OrAssetTreeRequestSelectionEvent,OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";@@ -27,6 +28,7 @@ import i18next from "i18next";import {AssetEventCause, WellknownAssets} from "@openremote/model";import "@openremote/or-json-forms";import {getAssetsRoute} from "../routes";+import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";export interface PageAssetsConfig {viewer?: ViewerConfig;@@ -135,7 +137,7 @@ export class PageAssets extends Page<AppStateKeyed> {[this._realmSelector],async (realm: string) => {this._assetIds = undefined;- if (this._viewer && this._viewer.assetId) this._viewer.assetId = undefined;+ if (this._viewer && this._viewer.ids) this._viewer.ids = undefined;if (this._tree) this._tree.refresh();this._updateRoute(true);}@@ -150,6 +152,8 @@ export class PageAssets extends Page<AppStateKeyed> {this.addEventListener(OrAssetTreeAddEvent.NAME, this._onAssetAdd);this.addEventListener(OrAssetViewerSaveEvent.NAME, (ev) => this._onAssetSave(ev.detail));this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);+ this.addEventListener(OrAssetViewerChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));+ this.addEventListener(OrAssetTreeChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));}protected render(): TemplateResult | void {@@ -178,27 +182,22 @@ export class PageAssets extends Page<AppStateKeyed> {this._confirmContinue(() => {const nodes = event.detail.detail.newNodes;- const assetId = nodes.length === 1 ? nodes[0].asset!.id : undefined;- if (!Util.objectsEqual(nodes, event.detail.detail.oldNodes)) {- this._assetIds = nodes.map((node) => node.asset.id!);- }-- if (assetId === this._viewer.assetId) {+ if (Util.objectsEqual(nodes, event.detail.detail.oldNodes)) {// User has clicked the same node so let's force reload it- this._viewer.assetId = undefined;- this._viewer.assetId = assetId;+ this._viewer.ids = undefined;+ this._viewer.ids = nodes.map((node) => node.asset.id!);} else {- this._viewer.assetId = assetId;+ this._assetIds = nodes.map((node) => node.asset.id!);+ this._viewer.ids = this._assetIds;this._updateRoute(true);}});}protected _onAssetSelectionChanged(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._viewer.ids = this._assetIds;this._updateRoute(true);}@@ -259,13 +258,33 @@ export class PageAssets extends Page<AppStateKeyed> {}}+ protected async _onAssetParentChange(newParentId: any) {+ let parentId: string | undefined = newParentId.parentId;+ let assetsIds: string[] = newParentId.assetsIds;++ try {+ if (parentId) {+ if ( !assetsIds.includes(parentId) ) {+ await manager.rest.api.AssetResource.updateParent(parentId, { assetIds : assetsIds });+ } else {+ showSnackbar(undefined, i18next.t("moveAssetFailed"), i18next.t("dismiss"));+ }+ } else {+ //So need to remove parent from all the selected assets+ await manager.rest.api.AssetResource.updateNoneParent({ assetIds : assetsIds });+ }+ } catch (e) {+ showSnackbar(undefined, i18next.t("moveAssetFailed"), i18next.t("dismiss"));+ }+ }+protected _onAssetTreeAssetEvent(ev: OrAssetTreeAssetEvent) {// Check if the new asset just saved has been created in the asset tree and if so select itif (ev.detail.cause === AssetEventCause.CREATE && this._addedAssetId) {if (this._addedAssetId === ev.detail.asset.id) {this._assetIds = [ev.detail.asset.id];this._addedAssetId = undefined;- this._viewer.assetId = ev.detail.asset.id;+ this._viewer.ids = this._assetIds;this._updateRoute(true);}}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 67c133e08..d63e0f6dd 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -116,6 +116,22 @@ export class OrAssetTreeSelectionEvent extends CustomEvent<NodeSelectEventDetail}}+export class OrAssetTreeChangeParentEvent extends CustomEvent<any> {++ public static readonly NAME = "or-asset-tree-change-parent";++ constructor(parent: string | undefined, assetsIds: string[]) {+ super(OrAssetTreeChangeParentEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ parentId: parent,+ assetsIds: assetsIds+ }+ });+ }+}+enum FilterElementType {SEARCH_FILTER, ASSET_TYPE,ATTRIBUTE_NAME, ATTRIBUTE_VALUE}@@ -205,6 +221,7 @@ declare global {[OrAssetTreeAddEvent.NAME]: OrAssetTreeAddEvent;[OrAssetTreeRequestDeleteEvent.NAME]: OrAssetTreeRequestDeleteEvent;[OrAssetTreeAssetEvent.NAME]: OrAssetTreeAssetEvent;+ [OrAssetTreeChangeParentEvent.NAME]: OrAssetTreeChangeParentEvent;}}@@ -312,6 +329,10 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {protected _assetTypeFilter!: string;protected _uniqueAssetTypes: string[] = [];+ private _dragDropParentId: string | null = null;+ protected _expandTimer?: number = undefined;+ private _latestSelected: UiAssetTreeNode | undefined = undefined;+public get selectedNodes(): UiAssetTreeNode[] {return this._selectedNodes ? [...this._selectedNodes] : [];}@@ -531,6 +552,9 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {<div id="list-container"><ol id="list">${this._nodes.map((treeNode) => this._treeNodeTemplate(treeNode, 0)).filter(t => !!t)}+ <li class="asset-list-element">+ <div class="end-element" node-asset-id="${''}" @dragleave=${(ev: DragEvent) => { this._onDragLeave(ev) }} @dragenter="${(ev: DragEvent) => this._onDragEnter(ev)}" @dragend="${(ev: DragEvent) => this._onDragEnd(ev)}" @dragover="${(ev: DragEvent) => this._onDragOver(ev)}"></div>+ </li></ol></div>`)@@ -651,6 +675,63 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {}}+ private _buildPaths(node: UiAssetTreeNode): string[] {+ let paths: string[] = [];++ if (node.asset) {+ if (node.asset.id) {+ paths.push(node.asset.id);++ if (node.children.length > 0 && node.expanded) {+ node.children.forEach((child: UiAssetTreeNode) => {+ paths = paths.concat(this._buildPaths(child));+ });+ }++ return paths;+ }++ return [];+ }++ return [];+ }++ private _findNode(n: UiAssetTreeNode, assetId: string): UiAssetTreeNode | undefined {+ if (n.asset && n.asset.id) {+ if (n.asset.id === assetId) {+ return n;+ } else if (n.children.length > 0 && n.expanded) {+ let foundNode: UiAssetTreeNode | undefined = undefined;+ n.children.forEach((n: UiAssetTreeNode) => {+ if (!foundNode) {+ foundNode = this._findNode(n, assetId);+ }+ });+ return foundNode;+ }++ return undefined;+ }+ }++ private _findNodeFromAssetId(assetId: string) : UiAssetTreeNode | undefined {+ if (this._nodes) {+ let foundNode: UiAssetTreeNode | undefined = undefined;++ this._nodes.forEach((n: UiAssetTreeNode) => {+ if (!foundNode) {+ foundNode = this._findNode(n, assetId);+ }+ });++ return foundNode;+ } else {+ return undefined;+ }++ }+protected _onNodeClicked(evt: MouseEvent | null, node: UiAssetTreeNode | null) {if (evt && evt.defaultPrevented) {return;@@ -685,7 +766,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {const multiSelect = !this._isReadonly() && (!this.config || !this.config.select || !this.config.select.multiSelect);// determine if node was already selected- if (this.checkboxes || (multiSelect && evt && (evt.ctrlKey || evt.metaKey))) {+ if (this.checkboxes || (multiSelect && evt && (evt.ctrlKey || evt.shiftKey || evt.metaKey))) {deselectOthers = false;if (index >= 0 && this.selectedIds && this.selectedIds.length > 1) {select = false;@@ -707,14 +788,61 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {: selectedNodes.filter(n => !childNodes.map(cn => cn.asset!.id).includes(n.asset!.id));} else if (deselectOthers) {+ this._latestSelected = Object.assign({}, node);selectedNodes = [node];} else if (select) {if (index < 0) {- selectedNodes = [...this.selectedNodes];- selectedNodes.push(node);+ if (evt && evt.shiftKey) {+ let hierarchy: string[] = [];+ this._nodes?.forEach((n: UiAssetTreeNode) => {+ hierarchy = hierarchy.concat(this._buildPaths(n));+ });++ if (this._latestSelected && this._latestSelected.asset && this._latestSelected.asset.id && node.asset && node.asset.id) {+ let latestSelectedAssetId: string = this._latestSelected.asset.id;+ let newlySelectedAssetId: string = node.asset.id;++ let previousIndex: number = hierarchy.findIndex((val: string) => { return val.includes(latestSelectedAssetId); });+ let newIndex: number = hierarchy.findIndex((val: string) => { return val.includes(newlySelectedAssetId); });++ let startIndex: number = -1;+ let endIndex: number = -1;++ if (previousIndex > newIndex) {+ startIndex = newIndex;+ endIndex = previousIndex;+ } else {+ startIndex = previousIndex;+ endIndex = newIndex;+ }++ let assetIdsToSelect: string[] = hierarchy.slice(startIndex, endIndex + 1 );++ let foundNodes: UiAssetTreeNode[] = [];++ assetIdsToSelect.forEach((assetIdToSelect: string) => {+ let foundNode: UiAssetTreeNode | undefined = this._findNodeFromAssetId(assetIdToSelect);++ if (foundNode) {+ foundNodes.push(foundNode);+ }+ });++ selectedNodes = [...this.selectedNodes];+ selectedNodes = selectedNodes.concat(foundNodes);+ }+ } else {+ selectedNodes = [...this.selectedNodes];+ selectedNodes.push(node);+ }++ this._latestSelected = Object.assign({}, node);}} else if (index >= 0) {selectedNodes = [...this.selectedNodes];+ if (selectedNodes.length === 1) {+ this._latestSelected = undefined;+ }selectedNodes.splice(index, 1);}}@@ -1476,6 +1604,8 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {}}++protected _buildTreeNodes(assets: Asset[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {if (!assets || assets.length === 0) {this._nodes = [];@@ -1566,6 +1696,102 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {});}+ public _onDragStart(ev: any): void {+ this._dragDropParentId = null;++ let currentElement = ev.currentTarget as HTMLElement;+ let selectedId: string | null = currentElement.getAttribute('node-asset-id');++ if (!this.selectedIds) {+ this.selectedIds = [];+ }++ if (selectedId && this.selectedIds && !this.selectedIds.includes(selectedId)) {+ this.selectedIds.push(selectedId);+ }+ }++ public _onDragEnd(ev: any): void {+ const dragEndTargetX: number = ev.x;+ const dragEndTargetY: number = ev.y;++ if (this.shadowRoot !== null) {+ let listElement: HTMLElement | null = this.shadowRoot.getElementById('list');++ if (listElement) {+ const topY: number = listElement.getBoundingClientRect().top;+ const bottomY: number = listElement.getBoundingClientRect().bottom;+ const leftX: number = listElement.getBoundingClientRect().left;+ const rightX: number = listElement.getBoundingClientRect().right;++ if (dragEndTargetX < leftX || dragEndTargetX > rightX || dragEndTargetY > bottomY || dragEndTargetY < topY) {+ return;+ }+ }+ }++ if (this.selectedIds) {+ this.dispatchEvent(new OrAssetTreeChangeParentEvent(!this._dragDropParentId ? undefined : this._dragDropParentId, this.selectedIds));+ }+ }++ protected isExpandable(assetId: string): boolean {+ if (this._nodes) {+ if (this.shadowRoot) {+ let elem: HTMLElement | null = this.shadowRoot.querySelector('[node-asset-id="' + assetId + '"] > .node-name > [data-expandable]');++ if (elem) {+ return true;+ } else {+ return false;+ }+ }+ }++ return false;+ }++ public _onDragOver(ev: any): void {+ let currentElement = ev.currentTarget as HTMLElement;++ currentElement.classList.add('over');++ let assetId: string | null = currentElement.getAttribute('node-asset-id');++ if (assetId && this.isExpandable(assetId) && !this._expandTimer) {+ this._expandTimer = window.setTimeout(() => {+ this.expandeNode(assetId);+ }, 1000);+ }+ }++ protected expandeNode(assetId: string | null): void {+ if (this.shadowRoot && assetId && assetId === this._dragDropParentId) {+ let elem: HTMLElement | null = this.shadowRoot.querySelector('[node-asset-id="' + assetId + '"]');++ elem?.parentElement?.setAttribute('data-expanded','');+ }+ }++ public _onDragEnter(ev: any): void {+ let currentElement = ev.currentTarget as HTMLElement;++ currentElement.classList.add('over');++ let enteredId: string | null = currentElement.getAttribute('node-asset-id');++ this._dragDropParentId = enteredId;+ }++ public _onDragLeave(ev: any): void {+ let currentElement = ev.currentTarget as HTMLElement;++ currentElement.classList.remove('over');++ clearTimeout(this._expandTimer);+ this._expandTimer = undefined;+ }+protected _treeNodeTemplate(treeNode: UiAssetTreeNode, level: number): TemplateResult | string | undefined {const descriptor = AssetModelUtil.getAssetDescriptor(treeNode.asset!.type!);@@ -1589,9 +1815,14 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {filterColorForNonMatchingAsset = true;}+ if (treeNode.expanded && treeNode.children.length === 0) {+ treeNode.expanded = false;+ }+return html`- <li ?data-selected="${treeNode.selected}" ?data-expanded="${treeNode.expanded}" @click="${(evt: MouseEvent) => this._onNodeClicked(evt, treeNode)}">- <div class="node-container" style="padding-left: ${level * 22}px">+ <li class="asset-list-element" ?data-selected="${treeNode.selected}" ?data-expanded="${treeNode.expanded}" @click="${(evt: MouseEvent) => this._onNodeClicked(evt, treeNode)}">+ <div class="in-between-element" node-asset-id="${treeNode.parent ? (treeNode.parent.asset ? treeNode.parent.asset.id : '' ) : undefined}" @dragleave=${(ev: DragEvent) => { this._onDragLeave(ev) }} @dragenter="${(ev: DragEvent) => this._onDragEnter(ev)}" @dragend="${(ev: DragEvent) => this._onDragEnd(ev)}" @dragover="${(ev: DragEvent) => this._onDragOver(ev)}"></div>+ <div class="node-container draggable" node-asset-id="${treeNode.asset ? treeNode.asset.id : ''}" draggable="true" @dragleave=${(ev: DragEvent) => { this._onDragLeave(ev) }} @dragenter="${(ev: DragEvent) => this._onDragEnter(ev)}" @dragstart="${(ev: DragEvent) => this._onDragStart(ev)}" @dragend="${(ev: DragEvent) => this._onDragEnd(ev)}" @dragover="${(ev: DragEvent) => this._onDragOver(ev)}" style="padding-left: ${level * 22}px"><div class="node-name"><div class="expander" ?data-expandable="${treeNode.expandable}"></div>${getAssetDescriptorIconTemplate(descriptor, undefined, undefined, (filterColorForNonMatchingAsset ? '#d3d3d3;' : undefined))}diff --git a/ui/component/or-asset-tree/src/style.ts b/ui/component/or-asset-tree/src/style.tsindex d58d0f58e..7a93cf5a2 100644--- a/ui/component/or-asset-tree/src/style.ts+++ b/ui/component/or-asset-tree/src/style.ts@@ -119,7 +119,19 @@ export const style = css`#list li[data-selected] > .node-container {border-left-color: var(--internal-or-asset-tree-selected-color);}-++ .asset-list-element .over {+ background-color: ${unsafeCSS(DefaultColor5)};+ }++ .in-between-element {+ height: 3px;+ }++ .end-element {+ height: 15px;+ }+.node-container {display: flex;border-left: 4px solid transparent;@@ -301,4 +313,12 @@ export const style = css`.filterMatching {color: #808080;}++ .draggable {+ cursor: pointer;+ }++ .draggable:active {+ cursor: grabbing;+ }`;diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex a0036ed3e..46996e3e2 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -11,7 +11,7 @@ import "@openremote/or-chart";import "@openremote/or-mwc-components/or-mwc-table";import "@openremote/or-components/or-panel";import "@openremote/or-mwc-components/or-mwc-dialog";-import {showOkCancelDialog, showOkDialog} from "@openremote/or-mwc-components/or-mwc-dialog";+import {DialogAction, OrMwcDialog, showDialog, showOkCancelDialog, showOkDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import "@openremote/or-mwc-components/or-mwc-list";import {translate} from "@openremote/or-translate";import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";@@ -44,6 +44,7 @@ import {OrEditAssetModifiedEvent, OrEditAssetPanel, ValidatorResult} from "./or-import "@openremote/or-mwc-components/or-mwc-snackbar";import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";import { progressCircular } from "@openremote/or-mwc-components/style";+import { OrAssetTree } from "@openremote/or-asset-tree";export interface PanelConfig {type: "info" | "setup" | "history" | "group" | "survey" | "survey-results" | "linkedUsers";@@ -208,6 +209,22 @@ export class OrAssetViewerSaveEvent extends CustomEvent<SaveResult> {}}+export class OrAssetViewerChangeParentEvent extends CustomEvent<{ parentId: string | undefined, assetsIds: string[] }> {++ public static readonly NAME = "or-asset-viewer-change-parent";++ constructor(parent: string | undefined, assetsIds: string[]) {+ super(OrAssetViewerChangeParentEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ parentId: parent,+ assetsIds: assetsIds+ }+ });+ }+}+export class OrAssetViewerRequestEditToggleEvent extends CustomEvent<Util.RequestEventDetail<boolean>> {public static readonly NAME = "or-asset-viewer-request-edit-toggle";@@ -244,6 +261,7 @@ declare global {[OrAssetViewerSaveEvent.NAME]: OrAssetViewerSaveEvent;[OrAssetViewerRequestEditToggleEvent.NAME]: OrAssetViewerRequestEditToggleEvent;[OrAssetViewerEditToggleEvent.NAME]: OrAssetViewerEditToggleEvent;+ [OrAssetViewerChangeParentEvent.NAME]: OrAssetViewerChangeParentEvent;}}@@ -1059,8 +1077,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem@property({type: Object, reflect: false})public asset?: Asset;- @property({type: String})- public assetId?: string;+ @property({type: Array})+ public ids: string[] | undefined;@property({type: Object})public config?: ViewerConfig;@@ -1104,13 +1122,13 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemthis.editMode = false;}- if (changedProperties.has("assetId")) {+ if (changedProperties.has("ids")) {this._assetInfo = undefined;this.asset = undefined;// Set asset ID on mixin which will go and load the asset- if (this.assetId) {- super.assetIds = [this.assetId];+ if (this.ids && this.ids.length === 1) {+ super.assetIds = [this.ids[0]];} else {super.assetIds = undefined;}@@ -1118,7 +1136,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemif (changedProperties.has("asset")) {this._assetInfo = undefined;- this.assetId = undefined;+ this.ids = undefined;super.assetIds = undefined;if (this.asset) {@@ -1166,7 +1184,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemconst links = await getLinkedUsers(asset);// Check this asset is still the correct one- if (this.assetId && this.assetId !== asset.id) {+ if (!this.ids || this.ids.length != 1 || this.ids[0] !== asset.id) {throw new Error("Asset has changed");}@@ -1177,7 +1195,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}// Check this asset is still the correct one- if (this.assetId && this.assetId !== asset.id) {+ if (!this.ids || this.ids.length != 1 || this.ids[0] !== asset.id) {throw new Error("Asset has changed");}@@ -1197,9 +1215,85 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}}+ protected _onParentChangeClick() {+ let dialog: OrMwcDialog;++ const blockEvent = (ev: Event) => {+ ev.stopPropagation();+ };++ const dialogContent = html`<or-asset-tree id="parent-asset-tree" disableSubscribe readonly .selectedIds="${[]}" @or-asset-tree-request-select="${blockEvent}" @or-asset-tree-selection-changed="${blockEvent}"></or-asset-tree>`;++ const setParent = () => {+ const assetTree = dialog.shadowRoot!.getElementById("parent-asset-tree") as OrAssetTree;+ let idd = assetTree.selectedIds!.length === 1 ? assetTree.selectedIds![0] : undefined;++ this.dispatchEvent(new OrAssetViewerChangeParentEvent(idd, this.ids || []));+ };++ const clearParent = () => {+ this.dispatchEvent(new OrAssetViewerChangeParentEvent(undefined, this.ids || []));+ };++ const dialogActions: DialogAction[] = [+ {+ actionName: "clear",+ content: i18next.t("none"),+ action: clearParent+ },+ {+ actionName: "ok",+ content: i18next.t("ok"),+ action: setParent+ },+ {+ default: true,+ actionName: "cancel",+ content: i18next.t("cancel")+ }+ ];++ dialog = showDialog(new OrMwcDialog()+ .setContent(dialogContent)+ .setActions(dialogActions)+ .setStyles(html`+ <style>+ .mdc-dialog__surface {+ width: 400px;+ height: 800px;+ display: flex;+ overflow: visible;+ overflow-x: visible !important;+ overflow-y: visible !important;+ }+ #dialog-content {+ flex: 1;+ overflow: visible;+ min-height: 0;+ }+ or-asset-tree {+ height: 100%;+ }+ </style>+ `)+ .setDismissAction(null));+ }+protected render(): TemplateResult | void {- const noSelection = !this.asset && !this.assetId;+ const noSelection = !this.asset && (!this.ids || this.ids.length === 0);+ const multiSelection = !this.asset && (!this.ids || this.ids.length > 1);++ if (multiSelection) {+ return html `+ <div class="msg">+ <div class="multipleAssetsView">+ <or-translate value="multiAssetSelected" .options="${ { assetNbr: this.ids!.length } }"></or-translate>+ <or-mwc-input .type="${InputType.BUTTON}" .label="${i18next.t("changeParent")}" @click="${() => this._onParentChangeClick()}" outlined></or-mwc-input>+ </div>+ </div>+ `;+ }if (noSelection) {return html`@@ -1364,7 +1458,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemif (result.success) {this._assetInfo.modified = false;this.asset = undefined;- this.assetId = result.assetId;+ this.ids = [result.assetId];}this.dispatchEvent(new OrAssetViewerSaveEvent(result));@@ -1378,8 +1472,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}_onEvent(event: SharedEvent) {-- const processEvent = (event.eventType === "asset" && (event as AssetEvent).asset!.id === this.assetId) || (event.eventType === "attribute" && (event as AttributeEvent).attributeState!.ref!.id == this.assetId);+ const assetId = this.ids && this.ids.length > 0 ? this.ids[0] : undefined;+ const processEvent = (event.eventType === "asset" && (event as AssetEvent).asset!.id === assetId) || (event.eventType === "attribute" && (event as AttributeEvent).attributeState!.ref!.id == assetId);if (!processEvent) {return;@@ -1398,6 +1492,10 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemreturn;}+ if (asset.id !== assetId) {+ return;+ }+if (this.editMode) {// Asset hasn't been modified yet so just re-render with new version of assetif (!this._assetInfo.modified) {diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 9c49df757..6bb3f56b2 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -267,6 +267,15 @@ export const style = css`display: none;}+ .multipleAssetsView {+ display: flex;+ flex-direction: column;+ }++ .multipleAssetsView > *:first-child {+ margin: 30px;+ }+@media screen and (max-width: 1200px) {#name-input {width: 150px;