projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 13797-refactoring
[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 ce9ddb7b78b706ec325d013f7769fd0514b37b56..c44448aadc029f115ce394ba9523d357c096b6a5 100644
(file)
--- a/
src/views-components/main-app-bar/main-app-bar.tsx
+++ b/
src/views-components/main-app-bar/main-app-bar.tsx
@@
-73,9
+73,10
@@
export const MainAppBar: React.SFC<MainAppBarProps> = (props) => {
onClick={props.onBreadcrumbClick}
onContextMenu={props.onContextMenu} />
}
onClick={props.onBreadcrumbClick}
onContextMenu={props.onContextMenu} />
}
- <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
- { DetailsIcon() }
- </IconButton>
+ { props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
+ <DetailsIcon />
+ </IconButton>
+ }
</Toolbar>
</AppBar>;
};
</Toolbar>
</AppBar>;
};
@@
-86,16
+87,16
@@
const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps
<>
<IconButton color="inherit">
<Badge badgeContent={3} color="primary">
<>
<IconButton color="inherit">
<Badge badgeContent={3} color="primary">
- {NotificationIcon()}
+ <NotificationIcon />
</Badge>
</IconButton>
</Badge>
</IconButton>
- <DropdownMenu icon={
UserPanelIcon()
} id="account-menu">
+ <DropdownMenu icon={
<UserPanelIcon />
} id="account-menu">
<MenuItem>
{getUserFullname(user)}
</MenuItem>
{renderMenuItems(menuItems.accountMenu, onMenuItemClick)}
</DropdownMenu>
<MenuItem>
{getUserFullname(user)}
</MenuItem>
{renderMenuItems(menuItems.accountMenu, onMenuItemClick)}
</DropdownMenu>
- <DropdownMenu icon={
HelpIcon()
} id="help-menu">
+ <DropdownMenu icon={
<HelpIcon />
} id="help-menu">
{renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
</DropdownMenu>
</>
{renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
</DropdownMenu>
</>