feat(xo-web/SortedTable): always show filter input (#3296)

Fixes #3295
This commit is contained in:
Pierre Donias 2018-08-13 16:44:31 +02:00 committed by GitHub
parent 0110e223ee
commit dc40ceaafe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 29 deletions

View File

@ -4,6 +4,8 @@
### Enhancements
- [Tables] Filter input now always shows up even if the table is empty [#3295](https://github.com/vatesfr/xen-orchestra/issues/3295) (PR [#3296](https://github.com/vatesfr/xen-orchestra/pull/3296))
### Bug fixes
### Released packages

View File

@ -825,7 +825,6 @@ export default class SortedTable extends Component {
const displayPagination =
paginationContainer === undefined && itemsPerPage < nAllItems
const displayFilter = nAllItems !== 0
const paginationInstance = displayPagination && (
<Pagination
@ -835,7 +834,7 @@ export default class SortedTable extends Component {
/>
)
const filterInstance = displayFilter && (
const filterInstance = (
<TableFilter
filters={props.filters}
onChange={this._setFilter}
@ -956,7 +955,6 @@ export default class SortedTable extends Component {
)}
</tbody>
</table>
{(displayFilter || displayPagination) && (
<Container>
<SingleLineRow>
<Col mediumSize={8}>
@ -971,18 +969,16 @@ export default class SortedTable extends Component {
))}
</Col>
<Col mediumSize={4}>
{displayFilter &&
(filterContainer ? (
{filterContainer ? (
<Portal container={() => filterContainer()}>
{filterInstance}
</Portal>
) : (
filterInstance
))}
)}
</Col>
</SingleLineRow>
</Container>
)}
</div>
)
}