projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14841: Always reload user details on page initialization.
[arvados.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 ba01f5508b1ce342aca0e338e2c09c67ef5db07c..475b29e1254f1ffcb0cdc6d720e30074bc5c4515 100644
(file)
--- a/
src/views-components/main-app-bar/main-app-bar.tsx
+++ b/
src/views-components/main-app-bar/main-app-bar.tsx
@@
-11,8
+11,9
@@
import { SearchBar } from "~/views-components/search-bar/search-bar";
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 { 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 { HelpMenu } from '
.
/help-menu';
+import { HelpMenu } from '
~/views-components/main-app-bar
/help-menu';
import { ReactNode } from "react";
import { ReactNode } from "react";
+import { AdminMenu } from "~/views-components/main-app-bar/admin-menu";
type CssRules = 'toolbar' | 'link';
type CssRules = 'toolbar' | 'link';
@@
-27,18
+28,13
@@
const styles: StyleRulesCallback<CssRules> = () => ({
});
interface MainAppBarDataProps {
});
interface MainAppBarDataProps {
- searchText: string;
- searchDebounce?: number;
user?: User;
buildInfo?: string;
children?: ReactNode;
user?: User;
buildInfo?: string;
children?: ReactNode;
+ uuidPrefix: string;
}
}
-export interface MainAppBarActionProps {
- onSearch: (searchText: string) => void;
-}
-
-export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles<CssRules>;
+export type MainAppBarProps = MainAppBarDataProps & WithStyles<CssRules>;
export const MainAppBar = withStyles(styles)(
(props: MainAppBarProps) => {
export const MainAppBar = withStyles(styles)(
(props: MainAppBarProps) => {
@@
-46,9
+42,9
@@
export const MainAppBar = withStyles(styles)(
<Toolbar className={props.classes.toolbar}>
<Grid container justify="space-between">
<Grid container item xs={3} direction="column" justify="center">
<Toolbar className={props.classes.toolbar}>
<Grid container justify="space-between">
<Grid container item xs={3} direction="column" justify="center">
- <Typography variant=
"title"
color="inherit" noWrap>
+ <Typography variant=
'h6'
color="inherit" noWrap>
<Link to={Routes.ROOT} className={props.classes.link}>
<Link to={Routes.ROOT} className={props.classes.link}>
- arvados workbench
+ arvados workbench
({props.uuidPrefix})
</Link>
</Typography>
<Typography variant="caption" color="inherit">{props.buildInfo}</Typography>
</Link>
</Typography>
<Typography variant="caption" color="inherit">{props.buildInfo}</Typography>
@@
-58,11
+54,7
@@
export const MainAppBar = withStyles(styles)(
xs={6}
container
alignItems="center">
xs={6}
container
alignItems="center">
- {props.user && <SearchBar
- value={props.searchText}
- onSearch={props.onSearch}
- debounce={props.searchDebounce}
- />}
+ {props.user && props.user.isActive && <SearchBar />}
</Grid>
<Grid
item
</Grid>
<Grid
item
@@
-75,6
+67,7
@@
export const MainAppBar = withStyles(styles)(
? <>
<NotificationsMenu />
<AccountMenu />
? <>
<NotificationsMenu />
<AccountMenu />
+ {props.user.isAdmin && <AdminMenu />}
<HelpMenu />
</>
: <HelpMenu />}
<HelpMenu />
</>
: <HelpMenu />}