X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ff74ff70ced6e15e0c70735bbd54ca7acadb6185..refs/heads/14319_loaded_contents_for_project_in_trash:/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..b936fb14 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,12 @@ 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 { ReactNode } from "react"; type CssRules = 'toolbar' | 'link'; @@ -27,21 +27,16 @@ const styles: StyleRulesCallback = () => ({ }); interface MainAppBarDataProps { - searchText: string; - searchDebounce?: number; user?: User; buildInfo?: string; + children?: ReactNode; } -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 @@ -57,11 +52,7 @@ export const MainAppBar = withStyles(styles)( xs={6} container alignItems="center"> - {props.user && } + {props.user && } - : } + : } + {props.children} ; } );