X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1933452553965a2066191eccaaa40943d6d5c5d8..bccb9ca5151f041d8c8b73098a3e1874023e3efa:/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 d2082395..9c031080 100644 --- a/src/views-components/main-app-bar/main-app-bar.tsx +++ b/src/views-components/main-app-bar/main-app-bar.tsx @@ -4,14 +4,11 @@ import * as React from "react"; import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem } from "@material-ui/core"; -import NotificationsIcon from "@material-ui/icons/Notifications"; -import PersonIcon from "@material-ui/icons/Person"; -import HelpIcon from "@material-ui/icons/Help"; -import InfoIcon from '@material-ui/icons/Info'; -import SearchBar from "../../components/search-bar/search-bar"; -import Breadcrumbs, { Breadcrumb } from "../../components/breadcrumbs/breadcrumbs"; -import DropdownMenu from "../../components/dropdown-menu/dropdown-menu"; import { User, getUserFullname } from "../../models/user"; +import { SearchBar } from "../../components/search-bar/search-bar"; +import { Breadcrumbs, Breadcrumb } from "../../components/breadcrumbs/breadcrumbs"; +import { DropdownMenu } from "../../components/dropdown-menu/dropdown-menu"; +import { DetailsIcon, NotificationIcon, UserPanelIcon, HelpIcon } from "../../components/icon/icon"; export interface MainAppBarMenuItem { label: string; @@ -76,29 +73,29 @@ export const MainAppBar: React.SFC = (props) => { onClick={props.onBreadcrumbClick} onContextMenu={props.onContextMenu} /> } - - - + { props.user && + + + } ; }; - const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps) => { return ( <> - + - + } id="account-menu"> {getUserFullname(user)} {renderMenuItems(menuItems.accountMenu, onMenuItemClick)} - + } id="help-menu"> {renderMenuItems(menuItems.helpMenu, onMenuItemClick)} @@ -120,5 +117,3 @@ const renderMenuItems = (menuItems: MainAppBarMenuItem[], onMenuItemClick: (menu )); }; - -export default MainAppBar;