From 01b9aef245d1e419bd77999c12b65742e1363bc9 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 18 Jun 2018 13:07:29 +0200 Subject: [PATCH] Rename findTreeBranch to getTreePath Feature #13628 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/store/project/project-reducer.test.ts | 6 +++--- src/store/project/project-reducer.ts | 4 ++-- src/views/workbench/workbench.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/store/project/project-reducer.test.ts b/src/store/project/project-reducer.test.ts index 311ec9d1..f964e0ea 100644 --- a/src/store/project/project-reducer.test.ts +++ b/src/store/project/project-reducer.test.ts @@ -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); }); }); diff --git a/src/store/project/project-reducer.ts b/src/store/project/project-reducer.ts index 8770391a..4f7545fc 100644 --- a/src/store/project/project-reducer.ts +++ b/src/store/project/project-reducer.ts @@ -22,12 +22,12 @@ export function findTreeItem(tree: Array>, itemId: string): TreeI return item; } -export function findTreeBranch(tree: Array>, itemId: string): Array> { +export function getTreePath(tree: Array>, itemId: string): Array> { 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]; } diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 0aecc0d2..ee4ac7f5 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -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 { } 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, -- 2.30.2