Merge branch 'master'

[arvados-workbench2.git] / src / views / workbench / workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 15f6fa5ed093649ed5f71e23bd8ead0f05fae44a..0aecc0d2b578e7045c4a6a37a892c5492cf81e65 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -6,27 +6,21 @@ import * as React from 'react';
 
 import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles';
 import Drawer from '@material-ui/core/Drawer';
-import AppBar from '@material-ui/core/AppBar';
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
 import { connect, DispatchProp } from "react-redux";
-import Tree from "../../components/tree/tree";
-import { Project } from "../../models/project";
-import ProjectList from "../../components/project-list/project-list";
 import { Route, Switch } from "react-router";
-import { Link } from "react-router-dom";
-import Button from "@material-ui/core/Button/Button";
 import authActions from "../../store/auth/auth-action";
-import IconButton from "@material-ui/core/IconButton/IconButton";
-import Menu from "@material-ui/core/Menu/Menu";
-import MenuItem from "@material-ui/core/MenuItem/MenuItem";
-import { AccountCircle } from "@material-ui/icons";
 import { User } from "../../models/user";
-import Grid from "@material-ui/core/Grid/Grid";
 import { RootState } from "../../store/store";
-import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItems, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar';
-import { Breadcrumb } from '../../components/main-app-bar/breadcrumbs/breadcrumbs';
+import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar';
+import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
 import { push } from 'react-router-redux';
+import projectActions from "../../store/project/project-action";
+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 DataExplorer from '../data-explorer/data-explorer';
 
 const drawerWidth = 240;
 
@@ -63,7 +57,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
 });
 
 interface WorkbenchDataProps {
-    projects: Project[];
+    projects: Array<TreeItem<Project>>;
     user?: User;
 }
 
@@ -73,17 +67,18 @@ interface WorkbenchActionProps {
 type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles<CssRules>;
 
 interface NavBreadcrumb extends Breadcrumb {
-    path: string
+    itemId: string;
+    status: TreeItemStatus;
 }
 
 interface NavMenuItem extends MainAppBarMenuItem {
-    action: () => void
+    action: () => void;
 }
 
 interface WorkbenchState {
     anchorEl: any;
     breadcrumbs: NavBreadcrumb[];
-    searchQuery: string;
+    searchText: string;
     menuItems: {
         accountMenu: NavMenuItem[],
         helpMenu: NavMenuItem[],
@@ -94,16 +89,8 @@ interface WorkbenchState {
 class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
     state = {
         anchorEl: null,
-        searchQuery: "",
-        breadcrumbs: [
-            {
-                label: "Projects",
-                path: "/projects"
-            }, {
-                label: "Project 1",
-                path: "/projects/project-1"
-            }
-        ],
+        searchText: "",
+        breadcrumbs: [],
         menuItems: {
             accountMenu: [
                 {
@@ -128,18 +115,41 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                 }
             ]
         }
-    }
+    };
 
 
     mainAppBarActions: MainAppBarActionProps = {
-        actions: {
-            onBreadcrumbClick: (breadcrumb: NavBreadcrumb) => this.props.dispatch(push(breadcrumb.path)),
-            onSearchQueryChange: searchQuery => this.setState({ searchQuery }),
-            onSearchQuerySubmit: () => this.props.dispatch(push(`/search?q=${this.state.searchQuery}`)),
-            onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action()
+        onBreadcrumbClick: ({ itemId, status }: NavBreadcrumb) => {
+            this.toggleProjectTreeItem(itemId, status);
+        },
+        onSearch: searchText => {
+            this.setState({ searchText });
+            this.props.dispatch(push(`/search?q=${searchText}`));
+        },
+        onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action()
+    };
+
+    toggleProjectTreeItem = (itemId: string, status: TreeItemStatus) => {
+        if (status === TreeItemStatus.Loaded) {
+            this.openProjectItem(itemId);
+        } else {
+            this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => this.openProjectItem(itemId));
         }
     }
 
+    openProjectItem = (itemId: string) => {
+        const branch = findTreeBranch(this.props.projects, itemId);
+        this.setState({
+            breadcrumbs: branch.map(item => ({
+                label: item.data.name,
+                itemId: item.data.uuid,
+                status: item.status
+            }))
+        });
+        this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
+        this.props.dispatch(push(`/project/${itemId}`));
+    }
+
     render() {
         const { classes, user } = this.props;
         return (
@@ -147,10 +157,10 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                 <div className={classes.appBar}>
                     <MainAppBar
                         breadcrumbs={this.state.breadcrumbs}
-                        searchQuery={this.state.searchQuery}
+                        searchText={this.state.searchText}
                         user={this.props.user}
                         menuItems={this.state.menuItems}
-                        actions={this.mainAppBarActions.actions}
+                        {...this.mainAppBarActions}
                     />
                 </div>
                 {user &&
@@ -160,16 +170,15 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                             paper: classes.drawerPaper,
                         }}>
                         <div className={classes.toolbar} />
-                        <div className={classes.toolbar} />
-                        <Tree items={this.props.projects} render={(p: Project) =>
-                            <Link to={`/project/${p.name}`}>{p.name}</Link>
-                        } />
+                        <ProjectTree
+                            projects={this.props.projects}
+                            toggleProjectTreeItem={this.toggleProjectTreeItem} />
                     </Drawer>}
                 <main className={classes.content}>
                     <div className={classes.toolbar} />
                     <div className={classes.toolbar} />
                     <Switch>
-                        <Route path="/project/:name" component={ProjectList} />
+                        <Route path="/project/:name" component={DataExplorer} />
                     </Switch>
                 </main>
             </div>