External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 18:51:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Conditionally render rather than show expand/collapse

Browse Source
This commit is contained in:
mabashian
2018-12-17 11:28:34 -05:00
parent 4a8791693f
commit 14f1c4b652
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/DataListToolbar/DataListToolbar.jsx
View File

@@ -86,7 +86,7 @@ class DataListToolbar extends React.Component {
sortedColumnKey, sortedColumnKey,
sortOrder, sortOrder,
addUrl, addUrl,
hideExpandCollapse showExpandCollapse
} = this.props; } = this.props;
const { const {
// isActionDropdownOpen, // isActionDropdownOpen,
@@ -203,18 +203,20 @@ class DataListToolbar extends React.Component {
</Button> </Button>
</ToolbarItem> </ToolbarItem>
</ToolbarGroup> </ToolbarGroup>
<ToolbarGroup className={hideExpandCollapse ? 'pf-u-display-none' : null}> { showExpandCollapse && (
<ToolbarItem> <ToolbarGroup>
<Button variant="plain" aria-label={i18n._(t`Expand`)}> <ToolbarItem>
<BarsIcon /> <Button variant="plain" aria-label={i18n._(t`Expand`)}>
</Button> <BarsIcon />
</ToolbarItem> </Button>
<ToolbarItem> </ToolbarItem>
<Button variant="plain" aria-label={i18n._(t`Collapse`)}> <ToolbarItem>
<EqualsIcon /> <Button variant="plain" aria-label={i18n._(t`Collapse`)}>
</Button> <EqualsIcon />
</ToolbarItem> </Button>
</ToolbarGroup> </ToolbarItem>
</ToolbarGroup>
)}
</Toolbar> </Toolbar>
</LevelItem> </LevelItem>
<LevelItem> <LevelItem>

1
src/pages/Organizations/views/Organizations.list.jsx
View File

@@ -205,7 +205,6 @@ class Organizations extends Component {
onSearch={this.onSearch} onSearch={this.onSearch}
onSort={this.onSort} onSort={this.onSort}
onSelectAll={this.onSelectAll} onSelectAll={this.onSelectAll}
hideExpandCollapse
/> />
<I18n> <I18n>
{({ i18n }) => ( {({ i18n }) => (