merge-conflicts

[arvados-workbench2.git] / src / views-components / project-tree / project-tree.tsx

diff --git a/src/components/project-tree/project-tree.tsx b/src/views-components/project-tree/project-tree.tsx
similarity index 94%
rename from src/components/project-tree/project-tree.tsx
rename to src/views-components/project-tree/project-tree.tsx
index 7406f7f3ec95651480a21a859b98f40d441c3e43..f51b65e054df7f8ab2d69a263e658f9a1fe2a7d8 100644 (file)
--- a/src/components/project-tree/project-tree.tsx
+++ b/src/views-components/project-tree/project-tree.tsx
@@ -9,13 +9,13 @@ import ListItemText from "@material-ui/core/ListItemText/ListItemText";
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Typography from '@material-ui/core/Typography';
 
-import Tree, { TreeItem, TreeItemStatus } from '../tree/tree';
+import Tree, { TreeItem, TreeItemStatus } from '../../components/tree/tree';
 import { Project } from '../../models/project';
 
 export interface ProjectTreeProps {
     projects: Array<TreeItem<Project>>;
     toggleOpen: (id: string, status: TreeItemStatus) => void;
-    toggleActive: (id: string) => void;
+    toggleActive: (id: string, status: TreeItemStatus) => void;
 }
 
 class ProjectTree<T> extends React.Component<ProjectTreeProps & WithStyles<CssRules>> {