From f94e33cd82560f61883cd319e1c73f990f89f8df Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Tue, 14 Jan 2025 14:03:17 -0500 Subject: [PATCH] Merge pull request #9324 from GilbertCherrie/fix_table_pagination_setting Fix table pagination setting (cherry picked from commit f94b1625d20d80762e70f416c9031be021ba6253) --- app/javascript/components/gtl-view.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/javascript/components/gtl-view.jsx b/app/javascript/components/gtl-view.jsx index 9f62115381a..df3e987c4d4 100644 --- a/app/javascript/components/gtl-view.jsx +++ b/app/javascript/components/gtl-view.jsx @@ -273,7 +273,7 @@ const setPaging = (settings, start, perPage) => ({ const computePagination = (settings) => ({ page: settings.current, perPage: settings.perpage, - perPageOptions: [10, 20, 50, 100, 200, 500, 1000], + perPageOptions: [5, 10, 20, 50, 100, 200, 500, 1000], }); const GtlView = ({ @@ -292,6 +292,9 @@ const GtlView = ({ noFlashDiv, }) => { // const { settings, data } = props; + if (pages && pages.perpage) { + initialState.settings.perpage = pages.perpage; + } const initState = { ...initialState, additionalOptions, @@ -387,7 +390,7 @@ const GtlView = ({ isExplorer, setPaging(settings, 0, perPage), records, - additionalOptions, + additionalOptions ); /** Function execution when a page or perPage is changed in carbon pagination events. */ @@ -528,7 +531,9 @@ GtlView.propTypes = { records: PropTypes.arrayOf(PropTypes.any), // fixme hideSelect: PropTypes.bool, showUrl: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]), - pages: PropTypes.shape({}), // fixme + pages: PropTypes.shape({ + list: PropTypes.number, reports: PropTypes.number, grid: PropTypes.number, tile: PropTypes.number, + }), isAscending: PropTypes.bool, };