[ARVADOS-WORKBENCH2] updated: 1.1.4-97-g01b9aef
Git user
git at public.curoverse.com
Mon Jun 18 07:07:54 EDT 2018
Summary of changes:
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(-)
via 01b9aef245d1e419bd77999c12b65742e1363bc9 (commit)
from 4bbaf2a0cede89ea50d63d210c6631adc1970620 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 01b9aef245d1e419bd77999c12b65742e1363bc9
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Jun 18 13:07:29 2018 +0200
Rename findTreeBranch to getTreePath
Feature #13628
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/project/project-reducer.test.ts b/src/store/project/project-reducer.test.ts
index 311ec9d..f964e0e 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 8770391..4f7545f 100644
--- a/src/store/project/project-reducer.ts
+++ b/src/store/project/project-reducer.ts
@@ -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];
}
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 0aecc0d..ee4ac7f 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<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,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list