X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a92bb3822b537682ca621df3c05a458b9ae3420b..973fce01f05a50d4aa0169a88281f20476b305b2:/src/views/workbench/workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 365835a90a..f45394718e 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -9,13 +9,27 @@ 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 } from "react-redux";
-import Tree from "../../components/tree/tree";
-import { Project } from "../../models/project";
-import { RootState } from "../../store/root-reducer";
+import { connect, DispatchProp } from "react-redux";
 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 projectActions from "../../store/project/project-action"
+
+import ProjectTree from '../../components/project-tree/project-tree';
+import { TreeItem } from "../../components/tree/tree";
+import { Project } from "../../models/project";
+import { projectService } from '../../services/services';
+import ProjectExplorer from '../project-explorer/project-explorer';
+import { push } from 'react-router-redux';
 
 const drawerWidth = 240;
 
@@ -28,8 +42,8 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
         overflow: 'hidden',
         position: 'relative',
         display: 'flex',
-        width: '100%',
-        height: '100%'
+        width: '100vw',
+        height: '100vh'
     },
     appBar: {
         zIndex: theme.zIndex.drawer + 1,
@@ -43,48 +57,124 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
         flexGrow: 1,
         backgroundColor: theme.palette.background.default,
         padding: theme.spacing.unit * 3,
+        height: '100%',
         minWidth: 0,
     },
     toolbar: theme.mixins.toolbar
 });
 
-interface WorkbenchProps {
-    projects: Project[]
+interface WorkbenchDataProps {
+    projects: Array<TreeItem<Project>>;
+    user?: User;
 }
 
+interface WorkbenchActionProps {
+}
+
+type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles<CssRules>;
+
 interface WorkbenchState {
+    anchorEl: any;
 }
 
-class Workbench extends React.Component<WorkbenchProps & WithStyles<CssRules>, WorkbenchState> {
-    render() {
-        const {classes} = this.props;
+class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
+    constructor(props: WorkbenchProps) {
+        super(props);
+        this.state = {
+            anchorEl: null
+        }
+    }
+
+    login = () => {
+        this.props.dispatch(authActions.LOGIN());
+    };
+
+    logout = () => {
+        this.handleClose();
+        this.props.dispatch(authActions.LOGOUT());
+    };
+
+    handleOpenMenu = (event: React.MouseEvent<any>) => {
+        this.setState({
+            anchorEl: event.currentTarget
+        });
+    };
 
+    handleClose = () => {
+        this.setState({
+            anchorEl: null
+        });
+    };
+
+    toggleProjectTreeItem = (itemId: string) => {
+        this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => {
+            this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
+            this.props.dispatch(push(`/project/${itemId}`))
+        });
+    };
+
+    render() {
+        const {classes, user} = this.props;
         return (
             <div className={classes.root}>
                 <AppBar position="absolute" className={classes.appBar}>
                     <Toolbar>
-                        <Typography variant="title" color="inherit" noWrap>
-                            Arvados<br/>Workbench 2
+                        <Typography variant="title" color="inherit" noWrap style={{flexGrow: 1}}>
+                            <span>Arvados</span><br/><span style={{fontSize: 12}}>Workbench 2</span>
                         </Typography>
+                        {user ?
+                            <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}
+                                  anchorOrigin={{
+                                    vertical: 'top',
+                                    horizontal: 'right',
+                                  }}
+                                  transformOrigin={{
+                                    vertical: 'top',
+                                    horizontal: 'right',
+                                  }}
+                                  open={!!this.state.anchorEl}
+                                  onClose={this.handleClose}>
+                                  <MenuItem onClick={this.logout}>Logout</MenuItem>
+                                  <MenuItem onClick={this.handleClose}>My account</MenuItem>
+                                </Menu>
+                            </Grid>
+                            :
+                            <Button color="inherit" onClick={this.login}>Login</Button>
+                        }
                     </Toolbar>
                 </AppBar>
+                {user &&
                 <Drawer
                     variant="permanent"
                     classes={{
                         paper: classes.drawerPaper,
                     }}>
                     <div className={classes.toolbar}/>
-                    <Tree items={this.props.projects} render={(p: Project) =>
-                        <Link to={`/project/${p.name}`}>{p.name}</Link>
-                    }/>
-                </Drawer>
+                    <ProjectTree
+                        projects={this.props.projects}
+                        toggleProjectTreeItem={this.toggleProjectTreeItem}/>
+                </Drawer>}
                 <main className={classes.content}>
                     <div className={classes.toolbar}/>
                     <Switch>
-                        <Route exact path="/">
-                            <Typography noWrap>Hello new workbench!</Typography>
-                        </Route>
-                        <Route path="/project/:name" component={ProjectList}/>
+                        <Route path="/project/:name" component={ProjectExplorer}/>
                     </Switch>
                 </main>
             </div>
@@ -92,9 +182,10 @@ class Workbench extends React.Component<WorkbenchProps & WithStyles<CssRules>, W
     }
 }
 
-export default connect<WorkbenchProps>(
+export default connect<WorkbenchDataProps>(
     (state: RootState) => ({
-        projects: state.projects
+        projects: state.projects,
+        user: state.auth.user
     })
 )(
     withStyles(styles)(Workbench)
