diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index 2792c32985..c38823a81a 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -37,6 +37,7 @@ class DataListToolbar extends React.Component { additionalControls, i18n, qsConfig, + pagination } = this.props; const showExpandCollapse = onCompact && onExpand; @@ -86,14 +87,16 @@ class DataListToolbar extends React.Component { )} - - {itemCount} {i18n._(t`results`)} - {additionalControls.map(control => ( {control} ))} + {(pagination && itemCount > 0) && + + {pagination} + + } ); diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx index ccd0c0b0fc..255120f74c 100644 --- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx +++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx @@ -98,6 +98,7 @@ class ListHeader extends React.Component { renderToolbar, qsConfig, location, + pagination } = this.props; const params = parseQueryString(qsConfig, location.search); const isEmpty = itemCount === 0 && Object.keys(params).length === 0; @@ -127,6 +128,7 @@ class ListHeader extends React.Component { onRemove: this.handleRemove, clearAllFilters: this.handleRemoveAll, qsConfig, + pagination })} )} @@ -141,10 +143,11 @@ ListHeader.propTypes = { searchColumns: SearchColumns.isRequired, sortColumns: SortColumns.isRequired, renderToolbar: PropTypes.func, + pagination: PropTypes.element }; ListHeader.defaultProps = { - renderToolbar: props => , + renderToolbar: props => }; export default withRouter(ListHeader); diff --git a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx index e69775fd6f..da2e485134 100644 --- a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx +++ b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx @@ -121,6 +121,28 @@ class PaginatedDataList extends React.Component { ); } + let ToolbarPagination = ( + + ) + return ( + pagination={ToolbarPagination} + > + {Content} {items.length ? (