Skip to content

armgit / core

Public Imported from GitHub
0

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

Remove caching feature from the asset tree UI (#2211)

Martin Peeters8951cd3348c3
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.ts
index 87ded9d5e..13835986b 100644
--- a/ui/app/manager/src/pages/page-assets.ts
+++ b/ui/app/manager/src/pages/page-assets.ts
@@ -1,5 +1,5 @@
import {css, html, TemplateResult, unsafeCSS} from "lit";
-import {customElement, property, query, state} from "lit/decorators.js";
+import {customElement, property, query} from "lit/decorators.js";
import "@openremote/or-asset-viewer";
import {
OrAssetViewer,
@@ -18,12 +18,11 @@ import {
OrAssetTreeAssetEvent,
OrAssetTreeChangeParentEvent, OrAssetTreeRequestAddEvent,
OrAssetTreeRequestSelectionEvent,
- OrAssetTreeSelectionEvent,
- OrAssetTreeToggleExpandEvent,
+ OrAssetTreeSelectionEvent
} from "@openremote/or-asset-tree";
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 {createSlice, Store, createSelector} from "@reduxjs/toolkit";
import {DialogAction, OrMwcDialog, showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import i18next from "i18next";
import {Asset, AssetEventCause, WellknownAssets} from "@openremote/model";
@@ -37,38 +36,19 @@ export interface PageAssetsConfig {
tree?: AssetTreeConfig;
}
export interface AssetsState {
- expandedAssetIds: string[]
+
}
export interface AssetsStateKeyed extends AppStateKeyed {
assets: AssetsState;
}
const INITIAL_STATE: AssetsState = {
- expandedAssetIds: []
+
};
const pageAssetsSlice = createSlice({
name: "pageAssets",
initialState: INITIAL_STATE,
- reducers: {
- updateExpandedParents(state, action: PayloadAction<[string, boolean]>) {
- 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, expandedAssetIds: expandedAssetIds }
- },
- clearExpandedNodes(state, action: PayloadAction<void>) {
- return {...state, expandedAssetIds: []}
- }
- }
+ reducers: {}
})
-const {clearExpandedNodes, updateExpandedParents} = pageAssetsSlice.actions;
export const pageAssetsReducer = pageAssetsSlice.reducer;
export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {
@@ -173,9 +153,6 @@ export class PageAssets extends Page<AssetsStateKeyed> {
@property() // selected asset ids
protected _assetIds?: string[];
- @state()
- protected _expandedIds?: string[];
-
@query("#tree")
protected _tree!: OrAssetTree;
@@ -197,7 +174,6 @@ export class PageAssets extends Page<AssetsStateKeyed> {
return;
}
this._assetIds = undefined;
- this._expandedIds = undefined;
if (this._viewer) {
this._viewer.assetId = undefined;
}
@@ -219,16 +195,10 @@ export class PageAssets extends Page<AssetsStateKeyed> {
this.addEventListener(OrAssetViewerRequestSaveEvent.NAME, this._onAssetViewerSaveRequested);
this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);
this.addEventListener(OrAssetTreeChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));
- this.addEventListener(OrAssetTreeToggleExpandEvent.NAME, this._onAssetExpandToggle);
this.addEventListener(OrAssetViewerLoadUserEvent.NAME, this._onLoadUserEvent);
this.addEventListener(OrAssetViewerLoadAlarmEvent.NAME,(ev) => this._onLoadAlarmEvent(ev));
}
- public connectedCallback() {
- super.connectedCallback();
- this._expandedIds = this.getState().assets.expandedAssetIds;
- }
-
protected render(): TemplateResult | void {
let viewerHTML: TemplateResult;
@@ -258,7 +228,6 @@ export class PageAssets extends Page<AssetsStateKeyed> {
<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>
${viewerHTML}
`;
@@ -542,10 +511,6 @@ export class PageAssets extends Page<AssetsStateKeyed> {
}
}
- protected _onAssetExpandToggle(event: OrAssetTreeToggleExpandEvent) {
- this._store.dispatch(updateExpandedParents([ event.detail.node.asset.id, event.detail.node.expanded]));
- }
-
protected _updateRoute(silent: boolean = true) {
const assetIds = this._assetIds ? this._assetIds.toString() : undefined;
router.navigate(getAssetsRoute(this._editMode, assetIds), {
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 099734947..d68a65527 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -293,9 +293,6 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
@property({type: Boolean})
public expandAllNodes?: boolean = false;
- @property({type: Array})
- public expandedIds?: string[] = [];
-
@property({type: Boolean})
public checkboxes?: boolean = false;
@@ -2147,10 +2144,6 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
treeNode.expanded = false;
}
- if (this.expandedIds && this.expandedIds.findIndex((expandId: string) => { return expandId === treeNode.asset!.id!; }) !== -1) {
- treeNode.expanded = true;
- }
-
return html`
<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>