diff --git a/CHANGELOG.md b/CHANGELOG.md index 54363d1f0..e6f3c54b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/packages/xo-web/src/common/sorted-table/index.js b/packages/xo-web/src/common/sorted-table/index.js index 15173db4c..f0385cde5 100644 --- a/packages/xo-web/src/common/sorted-table/index.js +++ b/packages/xo-web/src/common/sorted-table/index.js @@ -825,7 +825,6 @@ export default class SortedTable extends Component { const displayPagination = paginationContainer === undefined && itemsPerPage < nAllItems - const displayFilter = nAllItems !== 0 const paginationInstance = displayPagination && ( ) - const filterInstance = displayFilter && ( + const filterInstance = ( - {(displayFilter || displayPagination) && ( - - - - {displayPagination && - (paginationContainer !== undefined ? ( - // Rebuild container function to refresh Portal component. - paginationContainer()}> - {paginationInstance} - - ) : ( - paginationInstance - ))} - - - {displayFilter && - (filterContainer ? ( - filterContainer()}> - {filterInstance} - - ) : ( - filterInstance - ))} - - - - )} + + + + {displayPagination && + (paginationContainer !== undefined ? ( + // Rebuild container function to refresh Portal component. + paginationContainer()}> + {paginationInstance} + + ) : ( + paginationInstance + ))} + + + {filterContainer ? ( + filterContainer()}> + {filterInstance} + + ) : ( + filterInstance + )} + + + ) }