X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ff74ff70ced6e15e0c70735bbd54ca7acadb6185..b4fa8e69af5429da361aae1eea93301b6c1d725f:/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 ec2a511a..7bec7b24 100644 --- a/src/views-components/main-app-bar/main-app-bar.tsx +++ b/src/views-components/main-app-bar/main-app-bar.tsx @@ -7,12 +7,14 @@ import { AppBar, Toolbar, Typography, Grid } from "@material-ui/core"; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import { Link } from "react-router-dom"; import { User } from "~/models/user"; -import { SearchBar } from "~/components/search-bar/search-bar"; +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 { AnonymousMenu } from "~/views-components/main-app-bar/anonymous-menu"; -import { HelpMenu } from './help-menu'; +import { HelpMenu } from '~/views-components/main-app-bar/help-menu'; +import { ReactNode } from "react"; +import { AdminMenu } from "~/views-components/main-app-bar/admin-menu"; +import { pluginConfig } from '~/plugins'; type CssRules = 'toolbar' | 'link'; @@ -27,41 +29,34 @@ const styles: StyleRulesCallback = () => ({ }); interface MainAppBarDataProps { - searchText: string; - searchDebounce?: number; user?: User; buildInfo?: string; + children?: ReactNode; + uuidPrefix: string; + siteBanner: string; } -export interface MainAppBarActionProps { - onSearch: (searchText: string) => void; -} - -export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles; +export type MainAppBarProps = MainAppBarDataProps & WithStyles; export const MainAppBar = withStyles(styles)( (props: MainAppBarProps) => { - return + return - - + {pluginConfig.appBarLeft || + - arvados workbench + ({props.uuidPrefix}) {props.buildInfo} - + } - {props.user && } + {pluginConfig.appBarMiddle || (props.user && props.user.isActive && )} - {props.user - ? <> + {pluginConfig.appBarRight || + (props.user ? <> + {props.user.isAdmin && } - - : } + : + )} + {props.children} ; } );