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: Improve asset tree loading (#840)
Jérôme Vervierdc51bec050d2
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 87daed23d..6abfa83f2 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -352,6 +352,10 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {protected _expandTimer?: number = undefined;private _latestSelected: UiAssetTreeNode | undefined = undefined;+ protected assetsChildren: {+ [key: string]: UiAssetTreeNode[]+ } = {};+public get selectedNodes(): UiAssetTreeNode[] {return this._selectedNodes ? [...this._selectedNodes] : [];}@@ -1728,6 +1732,28 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {});}+ this.assetsChildren = {};++ assets.forEach((asset: AssetWithReparentId) => {+ if (asset.parentId) {+ if (!this.assetsChildren[asset.parentId]) {+ this.assetsChildren[asset.parentId] = [];+ }+ this.assetsChildren[asset.parentId].push({+ asset: asset+ } as UiAssetTreeNode);+ }++ if (asset.reparentId) {+ if (!this.assetsChildren[asset.reparentId]) {+ this.assetsChildren[asset.reparentId] = [];+ }+ this.assetsChildren[asset.reparentId].push({+ asset: asset+ } as UiAssetTreeNode);+ }+ });+rootAssets.sort(sortFunction);rootAssets.forEach((rootAsset) => this._buildChildTreeNodes(rootAsset, assets, sortFunction));this._nodes = rootAssets;@@ -1757,11 +1783,8 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {}protected _buildChildTreeNodes(treeNode: UiAssetTreeNode, assets: AssetWithReparentId[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {- treeNode.children = assets.filter((asset) => asset.parentId === treeNode.asset!.id || asset.reparentId === treeNode.asset!.id).map((asset) => {- return {- asset: asset- } as UiAssetTreeNode;- }).sort(sortFunction);+ let children: UiAssetTreeNode[] | undefined = this.assetsChildren[treeNode.asset!.id!];+ treeNode.children = children ? children.sort(sortFunction) : [];if (treeNode.children.length > 0) {treeNode.expandable = true;