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 update: Bugfixes for asset viewer and asset tree (#1509)
Rich Turner441a017acd4a
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.tsindex 93fdfcdbb..ab26b66dc 100644--- a/ui/app/manager/src/pages/page-assets.ts+++ b/ui/app/manager/src/pages/page-assets.ts@@ -3,69 +3,72 @@ import {customElement, property, query, state} from "lit/decorators.js";import "@openremote/or-asset-viewer";import {OrAssetViewer,- OrAssetViewerChangeParentEvent,OrAssetViewerEditToggleEvent,OrAssetViewerRequestEditToggleEvent,OrAssetViewerSaveEvent,OrAssetViewerLoadUserEvent,saveAsset,SaveResult,- ViewerConfig, OrAssetViewerLoadAlarmEvent+ ViewerConfig, OrAssetViewerLoadAlarmEvent, OrAssetViewerRequestSaveEvent} from "@openremote/or-asset-viewer";import {- AssetTreeConfig,+ AssetTreeConfig, ChangeParentEventDetail,OrAssetTree,OrAssetTreeAddEvent,OrAssetTreeAssetEvent,- OrAssetTreeChangeParentEvent,+ OrAssetTreeChangeParentEvent, OrAssetTreeRequestAddEvent,OrAssetTreeRequestSelectionEvent,OrAssetTreeSelectionEvent,OrAssetTreeToggleExpandEvent,} from "@openremote/or-asset-tree";-import manager, {DefaultBoxShadow, Util} from "@openremote/core";+import manager, {DefaultBoxShadow, DefaultColor5, Util} from "@openremote/core";import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";import {createSlice, Store, createSelector, PayloadAction} from "@reduxjs/toolkit";-import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";+import {DialogAction, OrMwcDialog, showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import i18next from "i18next";-import {AssetEventCause, WellknownAssets} from "@openremote/model";+import {Asset, AssetEventCause, WellknownAssets} from "@openremote/model";import "@openremote/or-json-forms";import {getAlarmsRoute, getAssetsRoute, getUsersRoute} from "../routes";import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";+import { InputType } from "@openremote/or-mwc-components/or-mwc-input";export interface PageAssetsConfig {viewer?: ViewerConfig;tree?: AssetTreeConfig;}export interface AssetsState {- expandedParents: {realm: string, ids: string[]}[]+ expandedAssetIds: string[]}export interface AssetsStateKeyed extends AppStateKeyed {assets: AssetsState;}const INITIAL_STATE: AssetsState = {- expandedParents: []+ expandedAssetIds: []};const pageAssetsSlice = createSlice({name: "pageAssets",initialState: INITIAL_STATE,reducers: {updateExpandedParents(state, action: PayloadAction<[string, boolean]>) {- const expandedParents = JSON.parse(JSON.stringify(state.expandedParents)); // copy state to prevent issues inserting it back- const expanded = expandedParents.find(x => x.realm == manager.displayRealm);- if(!expanded) {- expandedParents.push({ realm: manager.displayRealm, ids: []});- }- const expandedId = expandedParents.findIndex(x => x.realm == manager.displayRealm);- if(!action.payload[1] && expanded && expanded.ids && expanded.ids.includes(action.payload[0])) {- expandedParents[expandedId].ids = expanded.ids.filter((parent) => parent != action.payload[0]); // filter out collapsed ones- } else if(!expanded || (action.payload[1] && expanded && expanded.ids && !expanded.ids.includes(action.payload[0]))) {- expandedParents[expandedId].ids.push(action.payload[0]); // add new extended ones+ const expandedAssetIds = [...state.expandedAssetIds]; // copy state to prevent issues inserting it back+ const nodeAssetId = action.payload[0];+ const nodeExpanded = action.payload[1];+ if (nodeExpanded) {+ expandedAssetIds.push(nodeAssetId);+ } else {+ const currentIndex = expandedAssetIds.findIndex(id => id === nodeAssetId);+ if (currentIndex >= 0) {+ expandedAssetIds.splice(currentIndex, 1);+ }}- return { ...state, expandedParents: expandedParents }+ return { ...state, expandedAssetIds: expandedAssetIds }+ },+ clearExpandedNodes(state, action: PayloadAction<void>) {+ return {...state, expandedAssetIds: []}}}})-const {updateExpandedParents} = pageAssetsSlice.actions;+const {clearExpandedNodes, updateExpandedParents} = pageAssetsSlice.actions;export const pageAssetsReducer = pageAssetsSlice.reducer;export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {@@ -90,7 +93,7 @@ export function pageAssetsProvider(store: Store<AssetsStateKeyed>, config?: Pageroutes: ["assets","assets/:editMode",- "assets/:editMode/:id"+ "assets/:editMode/:ids"],pageCreator: () => {const page = new PageAssets(store);@@ -123,6 +126,24 @@ export class PageAssets extends Page<AssetsStateKeyed> {z-index: 0;}+ .multipleAssetsView {+ display: flex;+ justify-content: center;+ align-items: center;+ text-align: center;+ height: 100%;+ width: 100%;+ }++ .multipleAssetsView > div {+ display: flex;+ flex-direction: column;+ }++ .multipleAssetsView > div > *:first-child {+ margin: 30px;+ }+@media only screen and (min-width: 768px){or-asset-tree {width: 300px;@@ -159,10 +180,10 @@ export class PageAssets extends Page<AssetsStateKeyed> {protected _tree!: OrAssetTree;@query("#viewer")- protected _viewer!: OrAssetViewer;+ protected _viewer?: OrAssetViewer;- protected _addedAssetId?: string;- protected _realmSelector = (state: AppStateKeyed) => state.app.realm || manager.displayRealm;+ protected _addCallback?: (asset: Asset) => void;+ protected _realmSelector = (state: AssetsStateKeyed) => state.app.realm || manager.displayRealm;get name(): string {return "assets";@@ -171,9 +192,18 @@ export class PageAssets extends Page<AssetsStateKeyed> {protected getRealmState = createSelector([this._realmSelector],async (realm: string) => {+ // Prevent execution on initial load+ if (this.isUpdatePending) {+ return;+ }this._assetIds = undefined;- if (this._viewer && this._viewer.ids) this._viewer.ids = undefined;- if (this._tree) this._tree.refresh();+ this._expandedIds = undefined;+ if (this._viewer) {+ this._viewer.assetId = undefined;+ }+ if (this._tree) {+ this._tree.refresh();+ }this._updateRoute(true);})@@ -181,13 +211,13 @@ export class PageAssets extends Page<AssetsStateKeyed> {constructor(store: Store<AssetsStateKeyed>) {super(store);this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onAssetSelectionRequested);- this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onAssetSelectionChanged);+ this.addEventListener(OrAssetTreeSelectionEvent.NAME, (ev) => this._onAssetSelectionChanged(false, ev.detail.newNodes.map((node) => node.asset.id!)));this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onEditToggleRequested);this.addEventListener(OrAssetViewerEditToggleEvent.NAME, this._onEditToggle);- this.addEventListener(OrAssetTreeAddEvent.NAME, this._onAssetAdd);- this.addEventListener(OrAssetViewerSaveEvent.NAME, (ev) => this._onAssetSave(ev.detail));+ this.addEventListener(OrAssetTreeRequestAddEvent.NAME, this._onAssetAddRequested);+ this.addEventListener(OrAssetTreeAddEvent.NAME, (ev) => this._onAssetAdd(ev.detail.asset));+ this.addEventListener(OrAssetViewerRequestSaveEvent.NAME, this._onAssetViewerSaveRequested);this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);- this.addEventListener(OrAssetViewerChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));this.addEventListener(OrAssetTreeChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));this.addEventListener(OrAssetTreeToggleExpandEvent.NAME, this._onAssetExpandToggle);this.addEventListener(OrAssetViewerLoadUserEvent.NAME, this._onLoadUserEvent);@@ -196,36 +226,128 @@ export class PageAssets extends Page<AssetsStateKeyed> {public connectedCallback() {super.connectedCallback();- this._expandedIds = this._store.getState().assets.expandedParents.find(x => x.realm == manager.displayRealm)?.ids;+ this._expandedIds = this.getState().assets.expandedAssetIds;}-protected render(): TemplateResult | void {++ let viewerHTML: TemplateResult;+ const multiSelection = this._assetIds && this._assetIds.length > 1;++ if (multiSelection) {+ viewerHTML = html`+ <div class="multipleAssetsView hideMobile">+ <div>+ <or-translate value="multiAssetSelected" .options="${ { assetNbr: this._assetIds.length } }"></or-translate>+ <or-mwc-input .type="${InputType.BUTTON}" label="changeParent" @click="${() => this._onParentChangeClick()}" outlined></or-mwc-input>+ </div>+ </div>+ `;+ } else {+ const assetId = this._assetIds && this._assetIds.length === 1 ? this._assetIds[0] : undefined;+ viewerHTML = html`+ <or-asset-viewer id="viewer"+ .config="${this.config && this.config.viewer ? this.config.viewer : undefined}"+ class="${!assetId ? "hideMobile" : ""}" .assetId="${assetId}"+ .editMode="${this._editMode}"+ ></or-asset-viewer>+ `;+ }+return html`<or-asset-tree id="tree" .config="${this.config && this.config.tree ? this.config.tree : PAGE_ASSETS_CONFIG_DEFAULT.tree}"class="${this._assetIds && this._assetIds.length === 1 ? "hideMobile" : ""}".selectedIds="${this._assetIds}".expandedIds="${this._expandedIds}"></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>+ ${viewerHTML}`;}// State is only utilised for initial loading, and for changes within the store.// On the assets page, we shouldn't change editMode nor assetIds if the URL/state hasn't changed.- stateChanged(state: AppStateKeyed) {+ stateChanged(state: AssetsStateKeyed) {this.getRealmState(state); // Order is important here!this._editMode = !!(state.app.params && state.app.params.editMode === "true");- if(!this._assetIds || this._assetIds.length === 0) {- this._assetIds = state.app.params && state.app.params.id ? [state.app.params.id as string] : undefined;- }+ this._assetIds = state.app.params && state.app.params.ids ? state.app.params.ids.split(",") : undefined;+ }++ 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._onAssetParentChange({parentId: idd, assetIds: this._assetIds});+ };++ const clearParent = () => {+ this._onAssetParentChange({parentId: undefined, assetIds: this._assetIds});+ };++ const dialogActions: DialogAction[] = [+ {+ actionName: "clear",+ content: "none",+ action: clearParent+ },+ {+ actionName: "ok",+ content: "ok",+ action: setParent+ },+ {+ default: true,+ actionName: "cancel",+ content: "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;+ padding: 0;+ }++ footer.mdc-dialog__actions {+ border-top: 1px solid ${unsafeCSS(DefaultColor5)};+ }++ or-asset-tree {+ height: 100%;+ }+ </style>+ `)+ .setHeading(i18next.t("setParent"))+ .setDismissAction(null));}protected _onAssetSelectionRequested(event: OrAssetTreeRequestSelectionEvent) {- const isModified = this._viewer.isModified();+ const isModified = this._viewer && this._viewer.isModified();if (!isModified) {return;@@ -235,24 +357,36 @@ export class PageAssets extends Page<AssetsStateKeyed> {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.ids = undefined;- this._viewer.ids = nodes.map((node) => node.asset.id!);- } else {- this._assetIds = nodes.map((node) => node.asset.id!);- this._viewer.ids = this._assetIds;- this._updateRoute(true);- }+ this._onAssetSelectionChanged(true, event.detail.detail.newNodes.map((node) => node.asset.id!));});}- protected _onAssetSelectionChanged(event: OrAssetTreeSelectionEvent) {- this._assetIds = event.detail.newNodes.map((node) => node.asset.id!);- this._viewer.ids = this._assetIds;- this._updateRoute(true);+ // This is where we set the asset loaded in the asset viewer+ protected _onAssetSelectionChanged(userInitiated: boolean, assetIds: string[] | undefined) {+ if (Util.objectsEqual(this._assetIds, assetIds)) {+ if (!userInitiated) {+ // Asset name or parent has changed and we don't need to react to it here+ return;+ }+ // User has clicked the same node(s)+ if (assetIds.length === 1) {+ // force refresh the selected asset+ if (this._viewer) {+ this._viewer.assetId = undefined;+ setTimeout(() => {+ if (this._viewer) {+ this._viewer.assetId = assetIds[0];+ }+ }, 0);+ }+ }+ } else {+ this._assetIds = assetIds;+ if (this._viewer) {+ this._viewer.assetId = assetIds && assetIds.length === 1 ? assetIds[0] : undefined;+ }+ this._updateRoute(false);+ }}protected _onEditToggleRequested(event: OrAssetViewerRequestEditToggleEvent) {@@ -267,6 +401,18 @@ export class PageAssets extends Page<AssetsStateKeyed> {this._confirmContinue(() => {this._editMode = event.detail.detail;+ this._updateRoute(false);+ if (this._assetIds?.length === 1) {+ // force refresh the selected asset+ if (this._viewer) {+ this._viewer.assetId = undefined;+ setTimeout(() => {+ if (this._viewer) {+ this._viewer.assetId = this._assetIds[0];+ }+ }, 0);+ }+ }});}@@ -288,33 +434,79 @@ export class PageAssets extends Page<AssetsStateKeyed> {}}- protected async _onAssetAdd(ev: OrAssetTreeAddEvent) {+ protected _onAssetAddRequested(ev: OrAssetTreeRequestAddEvent) {+ const isModified = this._viewer && this._viewer.isModified();++ if (!isModified) {+ return;+ }++ // Prevent the request and check if user wants to lose changes+ ev.detail.allow = false;++ this._confirmContinue(() => {+ this._onAssetAdd(ev.detail.detail.asset);+ });+ }++ protected async _onAssetAdd(asset: Asset) {if (this._editMode) {// Just load the asset into the viewer- this._viewer.asset = ev.detail.asset;+ this._viewer.asset = asset;} else {- // Auto save and load- const result = await saveAsset(ev.detail.asset);- result.isCopy = true;- this.dispatchEvent(new OrAssetViewerSaveEvent(result));- this._onAssetSave(result);+ // Save and load+ this._doSaveAndLoad(asset);}}- protected _onAssetSave(result: SaveResult) {+ protected _onAssetViewerSaveRequested(ev: OrAssetViewerRequestSaveEvent) {+ const isModified = this._viewer && this._viewer.isModified();- if (!result.success) {+ if (!isModified) {return;}- if (result.isNew) {- this._addedAssetId = result.assetId!;+ if (this._viewer?.asset && !this._viewer.asset.id) {+ // Prevent the request and handle at this level to allow selection within the tree+ ev.detail.allow = false;+ this._doSaveAndLoad(this._viewer.asset);}}- protected async _onAssetParentChange(newParentId: any) {- let parentId: string | undefined = newParentId.parentId;- let assetsIds: string[] = newParentId.assetsIds;+ protected async _doSaveAndLoad(asset: Asset) {+ let saveResult: SaveResult;+ const assetTreeAssets: Asset[] = [];++ this._addCallback = (assetTreeCreatedAsset) => {+ if (saveResult) {+ // Save has completed before asset tree node created+ completedCallback();+ } else {+ // Store as it might be asset we are trying to save+ assetTreeAssets.push(assetTreeCreatedAsset);+ }+ };++ const completedCallback = () => {+ this._onAssetSelectionChanged(true, saveResult.asset?.id ? [saveResult.asset.id] : undefined);+ this._viewer.dispatchEvent(new OrAssetViewerSaveEvent(saveResult));+ };++ saveResult = await saveAsset(asset);+ if (saveResult.success) {+ const assetTreeCreatedNode = assetTreeAssets.find(a => a.id === saveResult.asset.id);+ if (assetTreeCreatedNode) {+ // Asset tree node creation completed before save callback executed+ completedCallback();+ }+ } else {+ this._addCallback = undefined;+ }+ }++ protected async _onAssetParentChange(parentChange: ChangeParentEventDetail) {+ let parentId: string | undefined = parentChange.parentId;+ let assetsIds: string[] = parentChange.assetIds;try {if (parentId) {@@ -333,14 +525,9 @@ export class PageAssets extends Page<AssetsStateKeyed> {}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;- this._viewer.ids = this._assetIds;- this._updateRoute(true);- }+ // If new asset created and add callback defined then we pass to there for handling+ if (ev.detail.cause === AssetEventCause.CREATE && this._addCallback) {+ this._addCallback(ev.detail.asset);}}@@ -348,10 +535,9 @@ export class PageAssets extends Page<AssetsStateKeyed> {this._store.dispatch(updateExpandedParents([ event.detail.node.asset.id, event.detail.node.expanded]));}-protected _updateRoute(silent: boolean = true) {- const assetId = this._assetIds && this._assetIds.length === 1 ? this._assetIds[0] : undefined;- router.navigate(getAssetsRoute(this._editMode, assetId), {+ const assetIds = this._assetIds ? this._assetIds.toString() : undefined;+ router.navigate(getAssetsRoute(this._editMode, assetIds), {callHooks: !silent,callHandler: !silent});diff --git a/ui/app/manager/src/routes.ts b/ui/app/manager/src/routes.tsindex 44f4fd953..a6e3b91f2 100644--- a/ui/app/manager/src/routes.ts+++ b/ui/app/manager/src/routes.ts@@ -8,10 +8,10 @@ export function getMapRoute(assetId?: string) {return route;}-export function getAssetsRoute(editMode?: boolean, assetId?: string) {+export function getAssetsRoute(editMode?: boolean, assetIds?: string) {let route = "assets/" + (editMode ? "true" : "false");- if (assetId) {- route += "/" + assetId;+ if (assetIds) {+ route += "/" + assetIds;}return route;diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 047eeadee..64c8905f8 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -578,7 +578,7 @@ export class Manager implements EventProviderFactory {}protected doRestApiInit(): boolean {- rest.setTimeout(10000);+ rest.setTimeout(20000);rest.initialise(this.getApiBaseUrl());return true;}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 1447f1b81..83a7ce9c5 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -86,6 +86,11 @@ export interface NodeSelectEventDetail {newNodes: UiAssetTreeNode[];}+export interface ChangeParentEventDetail {+ parentId: string | undefined;+ assetIds: string[];+}+export {style};export class OrAssetTreeRequestSelectionEvent extends CustomEvent<Util.RequestEventDetail<NodeSelectEventDetail>> {@@ -117,7 +122,7 @@ export class OrAssetTreeSelectionEvent extends CustomEvent<NodeSelectEventDetail}}-export class OrAssetTreeChangeParentEvent extends CustomEvent<any> {+export class OrAssetTreeChangeParentEvent extends CustomEvent<ChangeParentEventDetail> {public static readonly NAME = "or-asset-tree-change-parent";@@ -127,7 +132,7 @@ export class OrAssetTreeChangeParentEvent extends CustomEvent<any> {composed: true,detail: {parentId: parent,- assetsIds: assetsIds+ assetIds: assetsIds}});}@@ -688,7 +693,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {nodes.forEach((node) => this._updateSort(node.children, sortFunction));}- protected _toggleExpander(expander: HTMLElement, node: UiAssetTreeNode | null) {+ protected _toggleExpander(expander: HTMLElement, node: UiAssetTreeNode | null, silent: boolean = false) {if (node && node.expandable) {node.expanded = !node.expanded;@@ -700,30 +705,9 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {const elem = expander.parentElement!.parentElement!.parentElement!;elem.toggleAttribute("data-expanded");- this.dispatchEvent(new OrAssetTreeToggleExpandEvent({ node: node }));- this.requestUpdate();- }- }-- /**- * This method is used to avoid to re-render and erase all the this.selectedIds attribute- *- * @param expander- * @param node- * @protected- */- protected _toggleExpanderWithoutEventDispatch(expander: HTMLElement, node: UiAssetTreeNode | null) {- if (node && node.expandable) {- node.expanded = !node.expanded;-- if (node.expanded) {- this._expandedNodes.push(node);- } else {- this._expandedNodes = this._expandedNodes.filter(n => n !== node);+ if (!silent) {+ this.dispatchEvent(new OrAssetTreeToggleExpandEvent({node: node}));}-- const elem = expander.parentElement!.parentElement!.parentElement!;- elem.toggleAttribute("data-expanded");this.requestUpdate();}}@@ -1722,7 +1706,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {return;}- if (event.eventType === "asset" && this._nodes && this._nodes.length > 0) {+ if (event.eventType === "asset") {const assetEvent = event as AssetEvent;if (assetEvent.cause === AssetEventCause.READ) {@@ -1739,15 +1723,18 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {if (assetEvent.cause !== AssetEventCause.DELETE) {assets.push(assetEvent.asset!);}- OrAssetTree._forEachNodeRecursive(this._nodes, (node) => {- if (node.asset!.id !== assetEvent.asset!.id) {- assets.push(node.asset!);- }- });+ if (this._nodes) {+ OrAssetTree._forEachNodeRecursive(this._nodes, (node) => {+ if (node.asset!.id !== assetEvent.asset!.id) {+ assets.push(node.asset!);+ }+ });+ }// In case of filter already active, do not override the actual state of assetTree- if ( !this._filterInput.value ) {- this._buildTreeNodes(assets, this._getSortFunction());+ this._buildTreeNodes(assets, this._getSortFunction());+ if (this._filterInput.value) {+ this._doFiltering();}this.dispatchEvent(new OrAssetTreeAssetEvent(assetEvent));}@@ -1828,9 +1815,19 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {const newExpanded: UiAssetTreeNode[] = [];this._expandedNodes.forEach(expandedNode => {OrAssetTree._forEachNodeRecursive(this._nodes!, n => {- if (n.asset && expandedNode.asset && n.asset.id === expandedNode.asset.id) {+ if (n.asset && expandedNode && expandedNode.asset && n.asset.id === expandedNode.asset.id) {n.expanded = true;newExpanded.push(n);++ // Expand every ancestor+ let parent = n.parent;+ while (parent) {+ parent.expanded = true;+ parent = parent.parent;+ if (newExpanded.indexOf(parent) < 0) {+ newExpanded.push(parent);+ }+ }}});});@@ -1941,8 +1938,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {const node = this._findNodeFromAssetId(assetId);let elem: HTMLElement | null = this.shadowRoot?.querySelector('[node-asset-id="' + assetId + '"]');if(elem && node && !node.expanded) {-- this._toggleExpanderWithoutEventDispatch(elem.firstElementChild!.firstElementChild! as HTMLElement, node);+ this._toggleExpander(elem.firstElementChild!.firstElementChild! as HTMLElement, node, true);}}}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 722afcff3..5489ff14c 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 {DialogAction, OrMwcDialog, showDialog, showOkCancelDialog, showOkDialog} from "@openremote/or-mwc-components/or-mwc-dialog";+import {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";@@ -178,9 +178,8 @@ export class OrAssetViewerComputeGridEvent extends CustomEvent<void> {export type SaveResult = {success: boolean,- assetId: string,- isNew?: boolean,- isCopy?: boolean+ asset: Asset | undefined,+ isNew?: boolean};export class OrAssetViewerRequestSaveEvent extends CustomEvent<Util.RequestEventDetail<Asset>> {@@ -212,22 +211,6 @@ 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";@@ -290,7 +273,6 @@ declare global {[OrAssetViewerSaveEvent.NAME]: OrAssetViewerSaveEvent;[OrAssetViewerRequestEditToggleEvent.NAME]: OrAssetViewerRequestEditToggleEvent;[OrAssetViewerEditToggleEvent.NAME]: OrAssetViewerEditToggleEvent;- [OrAssetViewerChangeParentEvent.NAME]: OrAssetViewerChangeParentEvent;[OrAssetViewerLoadUserEvent.NAME]: OrAssetViewerLoadUserEvent;[OrAssetViewerLoadAlarmEvent.NAME]: OrAssetViewerLoadAlarmEvent;}@@ -907,10 +889,12 @@ export function getPropertyTemplate(asset: Asset, property: string, hostElement:if (ancestors.length > 0) {getAssetNames(ancestors).then((names) => {- if (hostElement && hostElement.shadowRoot) {- const pathField = hostElement.shadowRoot.getElementById("property-parentId") as OrMwcInput;- if (pathField) {- pathField.value = names.join(" > ");+ if (names) {+ if (hostElement && hostElement.shadowRoot) {+ const pathField = hostElement.shadowRoot.getElementById("property-parentId") as OrMwcInput;+ if (pathField) {+ pathField.value = names.join(" > ");+ }}}}@@ -941,19 +925,24 @@ export function getField(name: string, itemConfig?: InfoPanelItemConfig, content`;}-async function getAssetNames(ids: string[]): Promise<string[]> {- const response = await manager.rest.api.AssetResource.queryAssets({- select: {- attributes: []- },- ids: ids- });+async function getAssetNames(ids: string[]): Promise<string[] | undefined> {+ try {+ const response = await manager.rest.api.AssetResource.queryAssets({+ select: {+ attributes: []+ },+ ids: ids+ });- if (response.status !== 200 || !response.data || response.data.length !== ids.length) {- return ids;- }+ if (response.status !== 200 || !response.data || response.data.length !== ids.length) {+ return ids;+ }- return ids.map((id) => response.data.find((asset) => asset.id === id)!.name!);+ return ids.map((id) => response.data.find((asset) => asset.id === id)!.name!);+ } catch (e) {+ console.error("Failed to fetch parent asset names", e);+ return undefined;+ }}async function getAssetChildren(parentId: string, childAssetType: string): Promise<Asset[]> {@@ -1044,8 +1033,7 @@ export async function saveAsset(asset: Asset): Promise<SaveResult> {const isUpdate = !!asset.id && asset.version !== undefined;let success: boolean;- let id: string = "";-+ let savedAsset: Asset | undefined;try {if (isUpdate) {if (!asset.id) {@@ -1053,12 +1041,12 @@ export async function saveAsset(asset: Asset): Promise<SaveResult> {}const response = await manager.rest.api.AssetResource.update(asset.id!, asset);success = response.status === 200;- id = asset.id!;+ savedAsset = response.data;} else {const response = await manager.rest.api.AssetResource.create(asset);success = response.status === 200;if (success) {- id = response.data.id!;+ savedAsset = response.data;}}} catch (e) {@@ -1068,7 +1056,7 @@ export async function saveAsset(asset: Asset): Promise<SaveResult> {}return {- assetId: id,+ asset: savedAsset,success: success,isNew: !isUpdate};@@ -1164,8 +1152,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem@property({type: Object, reflect: false})public asset?: Asset;- @property({type: Array})- public ids: string[] | undefined;+ @property({type: String})+ public assetId: string | undefined;@property({type: Object})public config?: ViewerConfig;@@ -1200,7 +1188,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem@query("#view-container")protected containerElem!: HTMLDivElement;- protected _saveResult?: SaveResult;+ protected _saveInProgress = false;constructor() {super();@@ -1228,13 +1216,13 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemthis.editMode = false;}- if (changedProperties.has("ids")) {+ if (changedProperties.has("assetId")) {this._assetInfo = undefined;this.asset = undefined;// Set asset ID on mixin which will go and load the asset- if (this.ids && this.ids.length === 1) {- super.assetIds = [this.ids[0]];+ if (this.assetId) {+ super.assetIds = [this.assetId];} else {super.assetIds = undefined;}@@ -1242,8 +1230,6 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemif (changedProperties.has("asset")) {this._assetInfo = undefined;- this.ids = undefined;- super.assetIds = undefined;if (this.asset) {this.loadAssetInfo(this.asset)@@ -1291,7 +1277,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemconst alarms = await getLinkedAlarms(asset);// Check this asset is still the correct one- if (!this.ids || this.ids.length != 1 || this.ids[0] !== asset.id) {+ if (!this.assetId || this.assetId !== asset.id) {throw new Error("Asset has changed");}@@ -1302,7 +1288,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}// Check this asset is still the correct one- if (!this.ids || this.ids.length != 1 || this.ids[0] !== asset.id) {+ if (!this.assetId || this.assetId !== asset.id) {throw new Error("Asset has changed");}@@ -1323,96 +1309,9 @@ 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: "none",- action: clearParent- },- {- actionName: "ok",- content: "ok",- action: setParent- },- {- default: true,- actionName: "cancel",- content: "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;- padding: 0;- }-- footer.mdc-dialog__actions {- border-top: 1px solid ${unsafeCSS(DefaultColor5)};- }-- or-asset-tree {- height: 100%;- }- </style>- `)- .setHeading(i18next.t("setParent"))- .setDismissAction(null));- }-protected render(): TemplateResult | void {- 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="changeParent" @click="${() => this._onParentChangeClick()}" outlined></or-mwc-input>- </div>- </div>- `;- }+ const noSelection = !this.asset && !this.assetId;if (noSelection) {return html`@@ -1554,37 +1453,38 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemUtil.dispatchCancellableEvent(this, new OrAssetViewerRequestSaveEvent(this._assetInfo.asset)).then((detail) => {if (detail.allow) {- this._doSave();+ this.save();}});}- protected async _doSave() {+ async save() {if (!this._assetInfo) {return;}const asset = this._assetInfo.asset;this.saveBtnElem.disabled = true;+ this._saveInProgress = true;this.wrapperElem.classList.add("saving");- this._saveResult = await saveAsset(asset);+ const saveResult = await saveAsset(asset);- this.wrapperElem.classList.remove("saving");- this.saveBtnElem.disabled = false;-- if (!this._assetInfo || this._assetInfo.asset !== asset) {- // Asset has changed during save so ignore save result- return;- }-- if (this._saveResult.success) {- this._assetInfo.modified = false;- this.asset = undefined;- this.ids = [this._saveResult.assetId];+ if (saveResult.success) {+ try {+ const assetInfo = await this.loadAssetInfo(saveResult.asset!);+ this._assetInfo = assetInfo;+ this.assetId = saveResult.asset?.id;+ } catch (e) {+ // We can ignore this as it should indicate that the asset has changed+ }+ this.wrapperElem?.classList.remove("saving");+ if (this.saveBtnElem) {+ this.saveBtnElem.disabled = false;+ }}-- this.dispatchEvent(new OrAssetViewerSaveEvent(this._saveResult));+ this._saveInProgress = false;+ this.dispatchEvent(new OrAssetViewerSaveEvent(saveResult));}protected _onAssetModified(validationResults: ValidatorResult[]) {@@ -1594,9 +1494,8 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}}- _onEvent(event: SharedEvent) {- 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).ref!.id == assetId);+ async _onEvent(event: SharedEvent) {+ const processEvent = (event.eventType === "asset" && (event as AssetEvent).asset!.id === this.assetId) || (event.eventType === "attribute" && (event as AttributeEvent).ref!.id == this.assetId);if (!processEvent) {return;@@ -1606,49 +1505,23 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemconst asset = (event as AssetEvent).asset!;- if (!this._assetInfo) {- this.loadAssetInfo(asset)- .then(assetInfo => this._assetInfo = assetInfo)- .catch(reason => {- // We can ignore this as it should indicate that the asset has changed- });- return;- }-- if (asset.id !== assetId) {- return;+ // Reload the asset if...+ const reloadAsset = !this.editMode // Only in view mode+ || !this._assetInfo // Nothing currently loaded+ || (asset.version !== this._assetInfo.asset?.version // Version is different from what is loaded+ && !this._saveInProgress) // And save isn't in progress+ if (reloadAsset && this.editMode && this._assetInfo?.modified) {+ // Asset has changed whilst we're editing it so inform the user and reload+ await showOkDialog("assetModified", i18next.t("assetModifiedMustRefresh"));}- if (this.editMode) {- // Asset hasn't been modified yet so just re-render with new version of asset- if (!this._assetInfo.modified || (this._saveResult?.assetId === assetId)) {- this._assetInfo = undefined;- this._saveResult = undefined;- this.loadAssetInfo(asset)- .then(assetInfo => this._assetInfo = assetInfo)- .catch(reason => {- // We can ignore this as it should indicate that the asset has changed- });- return;- }-- // Asset has changed whilst we're editing it so inform the user and reload- showOkDialog("assetModified", i18next.t("assetModifiedMustRefresh")).then(() => {- this._assetInfo = undefined;- this.loadAssetInfo(asset)- .then(assetInfo => this._assetInfo = assetInfo)- .catch(reason => {- // We can ignore this as it should indicate that the asset has changed- });- });- } else {- // Just reload the whole view+ if (reloadAsset) {this._assetInfo = undefined;- this.loadAssetInfo(asset)- .then(assetInfo => this._assetInfo = assetInfo)- .catch(reason => {- // We can ignore this as it should indicate that the asset has changed- });+ try {+ this._assetInfo = await this.loadAssetInfo(asset);+ } catch (e) {+ // We can ignore this as it should indicate that the asset has changed+ }}}diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 1c1133caf..6103c29d2 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -266,15 +266,6 @@ export const style = css`.hidden {display: none;}-- .multipleAssetsView {- display: flex;- flex-direction: column;- }-- .multipleAssetsView > *:first-child {- margin: 30px;- }@media screen and (max-width: 767px) {#wrapper {