X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4cdf454b772363d262eb7a391c3f37c55800d853..eeb82d50816250cc6287928e6d958affa73880ee:/src/views/workbench/workbench.tsx?ds=sidebyside

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 8d9e35edc9..7cccfe3034 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -9,21 +9,28 @@ 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, { TreeItem } from "../../components/tree/tree";
+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/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 ListItemText from "@material-ui/core/ListItemText/ListItemText";
-import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ProjectTree, { WorkbenchProps } from '../../components/project-tree/project-tree';
 
 const drawerWidth = 240;
 
-type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'row' | 'treeContainer' | 'toolbar';
+type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'toolbar';
 
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     root: {
@@ -32,8 +39,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,
@@ -47,64 +54,116 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
         flexGrow: 1,
         backgroundColor: theme.palette.background.default,
         padding: theme.spacing.unit * 3,
+        height: '100%',
         minWidth: 0,
     },
-    row: {
-        display: 'flex',
-        alignItems: 'center'
-    },
-    treeContainer: {
-        position: 'absolute',        
-        overflowX: 'visible',
-        marginTop: '80px',
-        minWidth: drawerWidth,
-        whiteSpace: 'nowrap'
-    },
     toolbar: theme.mixins.toolbar
 });
 
-interface WorkbenchProps {
-    projects: Array<TreeItem<Project>>;
-    toggleProjectTreeItem: (id: string) => any;
+interface WorkbenchDataProps {
+    projects: 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> {
+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
+        });
+    };
+
     render() {
-        const {classes, projects} = this.props;
+        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}/>
-                    <div className={classes.treeContainer}>
-                        <Tree items={projects}
-                            toggleItem={this.props.toggleProjectTreeItem}
-                            render={(p: Project) => <span className={classes.row}>
-                                <div><ListItemIcon>{p.icon}</ListItemIcon></div>
-                                <div><ListItemText primary={p.name}/></div>
-                            </span>}
-                            />
-                    </div>
-                </Drawer>
+		            <ProjectTree
+                        projects={this.props.projects}
+                        toggleProjectTreeItem={this.props.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}/>
                     </Switch>
                 </main>
@@ -113,10 +172,11 @@ class Workbench extends React.Component<WorkbenchProps & WithStyles<CssRules>, W
     }
 }
 
-export default connect(
+export default connect<WorkbenchDataProps>(
     (state: RootState) => ({
-        projects: state.projects
-    }), {
+        projects: state.projects,
+        user: state.auth.user
+    }){
         toggleProjectTreeItem: (id: string) => projectActions.toggleProjectTreeItem(id)
     }
 )(
