External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

update page header toolbar component names to new pf v4 names

Browse Source
This commit is contained in:
John Mitchell
2020-06-10 13:01:09 -04:00
parent c762545c47
commit 25916d983e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/AppContainer/AppContainer.jsx
View File

@@ -82,7 +82,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
onNavToggle={handleNavToggle} onNavToggle={handleNavToggle}
logo={<BrandLogo />} logo={<BrandLogo />}
logoProps={{ href: '/' }} logoProps={{ href: '/' }}
toolbar={ headerTools={
<PageHeaderToolbar <PageHeaderToolbar
loggedInUser={config?.me} loggedInUser={config?.me}
isAboutDisabled={!config?.version} isAboutDisabled={!config?.version}

22
awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
View File

@@ -7,9 +7,9 @@ import {
DropdownItem, DropdownItem,
DropdownToggle, DropdownToggle,
DropdownPosition, DropdownPosition,
Toolbar, PageHeaderTools,
ToolbarGroup, PageHeaderToolsGroup,
ToolbarItem, PageHeaderToolsItem,
Tooltip, Tooltip,
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import { QuestionCircleIcon, UserIcon } from '@patternfly/react-icons'; import { QuestionCircleIcon, UserIcon } from '@patternfly/react-icons';
@@ -62,10 +62,10 @@ class PageHeaderToolbar extends Component {
} = this.props; } = this.props;
return ( return (
<Toolbar> <PageHeaderTools>
<ToolbarGroup> <PageHeaderToolsGroup>
<Tooltip position="left" content={<div>{i18n._(t`Info`)}</div>}> <Tooltip position="left" content={<div>{i18n._(t`Info`)}</div>}>
<ToolbarItem> <PageHeaderToolsItem>
<Dropdown <Dropdown
isPlain isPlain
isOpen={isHelpOpen} isOpen={isHelpOpen}
@@ -93,10 +93,10 @@ class PageHeaderToolbar extends Component {
</DropdownItem>, </DropdownItem>,
]} ]}
/> />
</ToolbarItem> </PageHeaderToolsItem>
</Tooltip> </Tooltip>
<Tooltip position="left" content={<div>{i18n._(t`User`)}</div>}> <Tooltip position="left" content={<div>{i18n._(t`User`)}</div>}>
<ToolbarItem> <PageHeaderToolsItem>
<Dropdown <Dropdown
id="toolbar-user-dropdown" id="toolbar-user-dropdown"
isPlain isPlain
@@ -134,10 +134,10 @@ class PageHeaderToolbar extends Component {
</DropdownItem>, </DropdownItem>,
]} ]}
/> />
</ToolbarItem> </PageHeaderToolsItem>
</Tooltip> </Tooltip>
</ToolbarGroup> </PageHeaderToolsGroup>
</Toolbar> </PageHeaderTools>
); );
} }
} }