From 14f27cf2b64af7bfdd8a09b0fa35109b8b537637 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 25 Jun 2024 15:53:17 -0700 Subject: [PATCH] Fixed: Limit Queue maximum page size to 200 (cherry picked from commit 6de536a7adcb604ec057d37873585fa665567437) --- frontend/src/Activity/Queue/Queue.js | 1 + .../src/Components/Table/TableOptions/TableOptionsModal.js | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/Activity/Queue/Queue.js b/frontend/src/Activity/Queue/Queue.js index 38de5b116..55c1e283d 100644 --- a/frontend/src/Activity/Queue/Queue.js +++ b/frontend/src/Activity/Queue/Queue.js @@ -219,6 +219,7 @@ class Queue extends Component { > diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js index 42961676f..f7cdcc78e 100644 --- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js +++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js @@ -49,11 +49,12 @@ class TableOptionsModal extends Component { onPageSizeChange = ({ value }) => { let pageSizeError = null; + const maxPageSize = this.props.maxPageSize ?? 250; if (value < 5) { pageSizeError = translate('TablePageSizeMinimum', { minimumValue: '5' }); - } else if (value > 250) { - pageSizeError = translate('TablePageSizeMaximum', { maximumValue: '250' }); + } else if (value > maxPageSize) { + pageSizeError = translate('TablePageSizeMaximum', { maximumValue: `${maxPageSize}` }); } else { this.props.onTableOptionChange({ pageSize: value }); } @@ -248,6 +249,7 @@ TableOptionsModal.propTypes = { isOpen: PropTypes.bool.isRequired, columns: PropTypes.arrayOf(PropTypes.object).isRequired, pageSize: PropTypes.number, + maxPageSize: PropTypes.number, canModifyColumns: PropTypes.bool.isRequired, optionsComponent: PropTypes.elementType, onTableOptionChange: PropTypes.func.isRequired,