feat: refactor breadcrumbs

artemnih · Oct 5, 2021 · 60d9288 · 60d9288
1 parent d7f0a2e
commit 60d9288
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/projects/ngx-explorer/src/lib/components/breadcrumbs/breadcrumbs.component.ts b/projects/ngx-explorer/src/lib/components/breadcrumbs/breadcrumbs.component.ts
@@ -20,27 +20,11 @@ export class BreadcrumbsComponent {
     private sub = new Subscription();
 
     constructor(private explorerService: ExplorerService, private helperService: HelperService) {
-        this.sub.add(this.explorerService.openedNode.subscribe(n => this.buildBreadcrumbs(n)));
+        this.sub.add(this.explorerService.breadcrumbs.subscribe(n => this.buildBreadcrumbs(n)));
     }
 
-    private buildBreadcrumbs(node: XNode) {
-
-        // TODO: build breadcrumbs in service and emit to component
-        const pieces = [];
-
-        let currentNode = node;
-        while (true) {
-            const crumb = { name: this.helperService.getName(currentNode.data) || 'HOME', node: currentNode };
-            pieces.unshift(crumb);
-
-            if (currentNode.parentId) {
-                currentNode = this.explorerService.getNode(currentNode.parentId);
-            } else {
-                break;
-            }
-        }
-
-        this.breadcrumbs = pieces;
+    private buildBreadcrumbs(nodes: XNode[]) {
+        this.breadcrumbs = nodes.map(n => ({ name: this.helperService.getName(n.data) || 'HOME', node: n }));
     }
 
     public click(crumb: Breadcrumb) {

diff --git a/projects/ngx-explorer/src/lib/services/explorer.service.ts b/projects/ngx-explorer/src/lib/services/explorer.service.ts
@@ -10,6 +10,7 @@ import { DataService } from './data.service';
 export class ExplorerService {
     public readonly selectedNodes = new BehaviorSubject<XNode[]>([]);
     public readonly openedNode = new BehaviorSubject<XNode>(undefined);
+    public readonly breadcrumbs = new BehaviorSubject<XNode[]>([]);
 
     private tree = Utils.createNode();
     private flatPointers: Dictionary<XNode> = Utils.getHashMap(this.tree);
@@ -42,8 +43,8 @@ export class ExplorerService {
                 parent.children = childrenNodes.concat(childrenLeafs);
                 this.flatPointers = Utils.getHashMap(this.tree);
                 this.openedNode.next(parent);
-                // TODO: update enitre tree
-                // TODO: update selected nodes: parent node should be selected
+                const breadcrumbs = Utils.buildBreadcrumbs(this.flatPointers, parent);
+                this.breadcrumbs.next(breadcrumbs);
             });
     }
 
@@ -75,7 +76,7 @@ export class ExplorerService {
             })
         } else {
             this.dataService.renameNode(node.data, name).subscribe(() => {
-                this.refresh(); // TODO: refresh entire tree? or all children?
+                this.refresh();
             });
         }
     }
@@ -85,7 +86,7 @@ export class ExplorerService {
         if (selection.length === 0) {
             throw new Error('Nothing selected to remove');
         }
-        
+
         const targets = selection.map(node => this.flatPointers[node.id])
         const nodes = targets.filter(t => !t.isLeaf).map(data => data.data);
         const leafs = targets.filter(t => t.isLeaf).map(data => data.data);

diff --git a/projects/ngx-explorer/src/lib/shared/utils.ts b/projects/ngx-explorer/src/lib/shared/utils.ts
@@ -23,4 +23,18 @@ export class Utils {
             children: []
         }
     }
+
+    static buildBreadcrumbs(flatPointers: Dictionary<XNode>, node: XNode) {
+        const pieces = [] as XNode[];
+        let currentNode = node;
+        while (true) {
+            pieces.unshift(currentNode);
+            if (currentNode.parentId) {
+                currentNode = flatPointers[currentNode.parentId];
+            } else {
+                break;
+            }
+        }
+        return pieces;
+    }
 }