Add logged in username to top level header bar.

This commit is contained in:
Kia Lam
2019-04-30 11:05:08 -04:00
parent ffade973a9
commit 5287af1b9f
4 changed files with 100 additions and 96 deletions

View File

@@ -64,24 +64,22 @@ class App extends Component {
}
render () {
const {
isAboutModalOpen,
isNavOpen
} = this.state;
const { isAboutModalOpen, isNavOpen } = this.state;
const {
render,
routeGroups = [],
navLabel = '',
} = this.props;
const { render, routeGroups = [], navLabel = '' } = this.props;
return (
<Config>
{({ ansible_version, version }) => (
{({ ansible_version, version, me }) => (
<I18n>
{({ i18n }) => (
<RootDialog>
{({ title, bodyText, variant = 'info', clearRootDialogMessage }) => (
{({
title,
bodyText,
variant = 'info',
clearRootDialogMessage
}) => (
<Fragment>
{(title || bodyText) && (
<AlertModal
@@ -90,7 +88,13 @@ class App extends Component {
onClose={clearRootDialogMessage}
title={title}
actions={[
<Button key="close" variant="secondary" onClick={clearRootDialogMessage}>{i18n._(t`Close`)}</Button>
<Button
key="close"
variant="secondary"
onClick={clearRootDialogMessage}
>
{i18n._(t`Close`)}
</Button>
]}
>
{bodyText}
@@ -105,6 +109,7 @@ class App extends Component {
logo={<TowerLogo linkTo="/" />}
toolbar={(
<PageHeaderToolbar
loggedInUser={me}
isAboutDisabled={!version}
onAboutClick={this.onAboutModalOpen}
onLogoutClick={this.onLogout}
@@ -118,14 +123,16 @@ class App extends Component {
nav={(
<Nav aria-label={navLabel}>
<NavList>
{routeGroups.map(({ groupId, groupTitle, routes }) => (
<NavExpandableGroup
key={groupId}
groupId={groupId}
groupTitle={groupTitle}
routes={routes}
/>
))}
{routeGroups.map(
({ groupId, groupTitle, routes }) => (
<NavExpandableGroup
key={groupId}
groupId={groupId}
groupTitle={groupTitle}
routes={routes}
/>
)
)}
</NavList>
</Nav>
)}