X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9ec2e259bd565aea710cdae34d8cba433b09a749..6e830f14ac2732c6d8661275fff691dd8a6179fa:/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 ce9ddb7b..9c031080 100644 --- a/src/views-components/main-app-bar/main-app-bar.tsx +++ b/src/views-components/main-app-bar/main-app-bar.tsx @@ -5,9 +5,9 @@ import * as React from "react"; import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem } from "@material-ui/core"; 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 { 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 { @@ -73,29 +73,29 @@ export const MainAppBar: React.SFC = (props) => { onClick={props.onBreadcrumbClick} onContextMenu={props.onContextMenu} /> } - - { DetailsIcon() } - + { props.user && + + + } ; }; - const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps) => { return ( <> - {NotificationIcon()} + - + } id="account-menu"> {getUserFullname(user)} {renderMenuItems(menuItems.accountMenu, onMenuItemClick)} - + } id="help-menu"> {renderMenuItems(menuItems.helpMenu, onMenuItemClick)} @@ -117,5 +117,3 @@ const renderMenuItems = (menuItems: MainAppBarMenuItem[], onMenuItemClick: (menu )); }; - -export default MainAppBar;