refs #13535 Merge branch '13535-tree-component' into 13610-projects-hierarchy

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

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 38c3f042d817923a53c9faaf8e400e0766e3b6e1..7cccfe3034698057db006cde792dc0e4d201a915 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -12,17 +12,21 @@ 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 { RootState } from "../../store/root-reducer";
 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-action";
+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 { actions as projectActions } from "../../store/project-action";
+import ProjectTree, { WorkbenchProps } from '../../components/project-tree/project-tree';
 
 const drawerWidth = 240;
 
@@ -109,17 +113,21 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                             <span>Arvados</span><br/><span style={{fontSize: 12}}>Workbench 2</span>
                         </Typography>
                         {user ?
-                            <div>
-                                <Typography variant="title" color="inherit" noWrap>
-                                    {user.firstName} {user.lastName}
-                                </Typography>
-                                <IconButton
-                                      aria-owns={this.state.anchorEl ? 'menu-appbar' : undefined}
-                                      aria-haspopup="true"
-                                      onClick={this.handleOpenMenu}
-                                      color="inherit">
-                                  <AccountCircle/>
-                                </IconButton>
+                            <Grid container style={{width: 'auto'}}>
+                                <Grid container style={{width: 'auto'}} alignItems='center'>
+                                    <Typography variant="title" color="inherit" noWrap>
+                                        {user.firstName} {user.lastName}
+                                    </Typography>
+                                </Grid>
+                                <Grid item>
+                                    <IconButton
+                                          aria-owns={this.state.anchorEl ? 'menu-appbar' : undefined}
+                                          aria-haspopup="true"
+                                          onClick={this.handleOpenMenu}
+                                          color="inherit">
+                                      <AccountCircle/>
+                                    </IconButton>
+                                </Grid>
                                 <Menu
                                   id="menu-appbar"
                                   anchorEl={this.state.anchorEl}
@@ -136,7 +144,7 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                                   <MenuItem onClick={this.logout}>Logout</MenuItem>
                                   <MenuItem onClick={this.handleClose}>My account</MenuItem>
                                 </Menu>
-                            </div>
+                            </Grid>
                             :
                             <Button color="inherit" onClick={this.login}>Login</Button>
                         }
@@ -149,9 +157,9 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                         paper: classes.drawerPaper,
                     }}>
                     <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.props.toggleProjectTreeItem}/>
                 </Drawer>}
                 <main className={classes.content}>
                     <div className={classes.toolbar}/>
@@ -168,7 +176,9 @@ export default connect<WorkbenchDataProps>(
     (state: RootState) => ({
         projects: state.projects,
         user: state.auth.user
-    })
+    }){
+        toggleProjectTreeItem: (id: string) => projectActions.toggleProjectTreeItem(id)
+    }
 )(
     withStyles(styles)(Workbench)
 );