Rename findTreeBranch to getTreePath
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 18 Jun 2018 11:07:29 +0000 (13:07 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 18 Jun 2018 11:07:29 +0000 (13:07 +0200)
Feature #13628

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

src/store/project/project-reducer.test.ts
src/store/project/project-reducer.ts
src/views/workbench/workbench.tsx

index 311ec9d18346f2745337ecda29fb8f97028a2463..f964e0ea311f333af3486a69ed6188a1cddb9e0c 100644 (file)
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import projectsReducer, { findTreeBranch } from "./project-reducer";
+import projectsReducer, { getTreePath } from "./project-reducer";
 import actions from "./project-action";
 import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
 
@@ -82,7 +82,7 @@ describe("findTreeBranch", () => {
                 ])
             ])
         ];
-        const branch = findTreeBranch(tree, "2.1.1");
+        const branch = getTreePath(tree, "2.1.1");
         expect(branch.map(item => item.id)).toEqual(["2", "2.1", "2.1.1"]);
     });
 
@@ -101,7 +101,7 @@ describe("findTreeBranch", () => {
                 ])
             ])
         ];
-        expect(findTreeBranch(tree, "3")).toHaveLength(0);
+        expect(getTreePath(tree, "3")).toHaveLength(0);
     });
 
 });
index 8770391acbefe09eb6d8520e1b3ff21f0aa442e6..4f7545fc979ea93b9fbe4fd6ee2f4e74559e6a87 100644 (file)
@@ -22,12 +22,12 @@ export function findTreeItem<T>(tree: Array<TreeItem<T>>, itemId: string): TreeI
     return item;
 }
 
-export function findTreeBranch<T>(tree: Array<TreeItem<T>>, itemId: string): Array<TreeItem<T>> {
+export function getTreePath<T>(tree: Array<TreeItem<T>>, itemId: string): Array<TreeItem<T>> {
     for(const item of tree){
         if(item.id === itemId){
             return [item];
         } else {
-            const branch = findTreeBranch(item.items || [], itemId);
+            const branch = getTreePath(item.items || [], itemId);
             if(branch.length > 0){
                 return [item, ...branch];
             }
index 0aecc0d2b578e7045c4a6a37a892c5492cf81e65..ee4ac7f5398ac71e32756db016018c9a6a083465 100644 (file)
@@ -19,7 +19,7 @@ import ProjectTree from '../../components/project-tree/project-tree';
 import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
 import { Project } from "../../models/project";
 import { projectService } from '../../services/services';
-import { findTreeBranch } from '../../store/project/project-reducer';
+import { getTreePath } from '../../store/project/project-reducer';
 import DataExplorer from '../data-explorer/data-explorer';
 
 const drawerWidth = 240;
@@ -138,7 +138,7 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
     }
 
     openProjectItem = (itemId: string) => {
-        const branch = findTreeBranch(this.props.projects, itemId);
+        const branch = getTreePath(this.props.projects, itemId);
         this.setState({
             breadcrumbs: branch.map(item => ({
                 label: item.data.name,