Merge branch 'master' into 14097-make-a-copy-process

[arvados-workbench2.git] / src / views-components / main-app-bar / main-app-bar.tsx

diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index bb42e235ddae33054407f04c990eea7e4c9c3c99..ec2a511a1e89faf2e0261911dbe8e5b679d1882d 100644 (file)
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -12,13 +12,17 @@ import { Routes } from '~/routes/routes';
 import { NotificationsMenu } from "~/views-components/main-app-bar/notifications-menu";
 import { AccountMenu } from "~/views-components/main-app-bar/account-menu";
 import { AnonymousMenu } from "~/views-components/main-app-bar/anonymous-menu";
+import { HelpMenu } from './help-menu';
 
-type CssRules = 'link';
+type CssRules = 'toolbar' | 'link';
 
 const styles: StyleRulesCallback<CssRules> = () => ({
     link: {
         textDecoration: 'none',
         color: 'inherit'
+    },
+    toolbar: {
+        height: '56px'
     }
 });
 
@@ -26,6 +30,7 @@ interface MainAppBarDataProps {
     searchText: string;
     searchDebounce?: number;
     user?: User;
+    buildInfo?: string;
 }
 
 export interface MainAppBarActionProps {
@@ -37,14 +42,15 @@ export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & With
 export const MainAppBar = withStyles(styles)(
     (props: MainAppBarProps) => {
         return <AppBar position="static">
-            <Toolbar>
+            <Toolbar className={props.classes.toolbar}>
                 <Grid container justify="space-between">
-                    <Grid container item xs={3} alignItems="center">
-                        <Typography variant="headline" color="inherit" noWrap>
+                    <Grid container item xs={3} direction="column" justify="center">
+                        <Typography variant="title" color="inherit" noWrap>
                             <Link to={Routes.ROOT} className={props.classes.link}>
                                 arvados workbench
                             </Link>
                         </Typography>
+                        <Typography variant="caption" color="inherit">{props.buildInfo}</Typography>
                     </Grid>
                     <Grid
                         item
@@ -62,11 +68,13 @@ export const MainAppBar = withStyles(styles)(
                         xs={3}
                         container
                         alignItems="center"
-                        justify="flex-end">
+                        justify="flex-end"
+                        wrap="nowrap">
                         {props.user
                             ? <>
                                 <NotificationsMenu />
                                 <AccountMenu />
+                                <HelpMenu />
                             </>
                             : <AnonymousMenu />}
                     </Grid>