diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dd9c5d..1085ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Explicit paging for list of harvestables. Fixes UIHAADM-142. * When downloading Failed Records, provide all records in the result set, not just the currently visible page. Fixes UIHAADM-140. * When running in development (`yarn start`) use the Stripes CLI's `--startProxy` argument. Fixes UIHAADM-144. +* Explicitly specify paging size for Harvestables, Jobs and Failed Records. Fixes UIHAADM-145. ## [2.2.0](https://github.com/folio-org/ui-harvester-admin/tree/v2.2.0) (2024-10-23) diff --git a/src/routes/HarvestablesRoute.js b/src/routes/HarvestablesRoute.js index e46d701..245afe2 100644 --- a/src/routes/HarvestablesRoute.js +++ b/src/routes/HarvestablesRoute.js @@ -5,8 +5,8 @@ import { StripesConnectedSource } from '@folio/stripes/smart-components'; import Harvestables from '../views/Harvestables'; -const INITIAL_RESULT_COUNT = 500; -const RESULT_COUNT_INCREMENT = 500; +const INITIAL_RESULT_COUNT = 100; +const RESULT_COUNT_INCREMENT = 100; function HarvestablesRoute({ stripes, resources, mutator, children }) { @@ -19,11 +19,7 @@ function HarvestablesRoute({ stripes, resources, mutator, children }) { } const handleNeedMoreData = (_askAmount, index) => { - if (index >= 0) { - source.fetchOffset(index); - } else { - source.fetchMore(RESULT_COUNT_INCREMENT); - } + source.fetchOffset(index); }; @@ -40,6 +36,7 @@ function HarvestablesRoute({ stripes, resources, mutator, children }) { updateQuery={mutator.query.update} error={error} hasLoaded={hasLoaded} + pageAmount={RESULT_COUNT_INCREMENT} onNeedMoreData={handleNeedMoreData} > {children} diff --git a/src/routes/JobsRoute.js b/src/routes/JobsRoute.js index 0b9a56f..18fe33c 100644 --- a/src/routes/JobsRoute.js +++ b/src/routes/JobsRoute.js @@ -7,8 +7,8 @@ import queryFunction from '../search/queryFunction'; import Jobs from '../views/Jobs'; -const INITIAL_RESULT_COUNT = 200; -const RESULT_COUNT_INCREMENT = 200; +const INITIAL_RESULT_COUNT = 100; +const RESULT_COUNT_INCREMENT = 100; function JobsRoute({ stripes, resources, mutator, children }) { @@ -21,11 +21,7 @@ function JobsRoute({ stripes, resources, mutator, children }) { } const handleNeedMoreData = (_askAmount, index) => { - if (index >= 0) { - source.fetchOffset(index); - } else { - source.fetchMore(RESULT_COUNT_INCREMENT); - } + source.fetchOffset(index); }; const error = resources.jobs.failed ? resources.jobs.failed.message : undefined; @@ -41,6 +37,7 @@ function JobsRoute({ stripes, resources, mutator, children }) { updateQuery={mutator.query.update} error={error} hasLoaded={hasLoaded} + pageAmount={RESULT_COUNT_INCREMENT} onNeedMoreData={handleNeedMoreData} > {children} diff --git a/src/routes/RecordsRoute.js b/src/routes/RecordsRoute.js index f4f1ca6..ab7e631 100644 --- a/src/routes/RecordsRoute.js +++ b/src/routes/RecordsRoute.js @@ -20,11 +20,7 @@ const RecordsRoute = ({ stripes, resources, mutator, children }) => { } const handleNeedMoreData = (_askAmount, index, _firstIndex, _direction) => { - if (index >= 0) { - source.fetchOffset(index); - } else { - source.fetchMore(RESULT_COUNT_INCREMENT); - } + source.fetchOffset(index); }; const hasLoaded = resources.records.hasLoaded; @@ -40,6 +36,7 @@ const RecordsRoute = ({ stripes, resources, mutator, children }) => { updateQuery={mutator.query.update} hasLoaded={hasLoaded} error={error} + pageAmount={RESULT_COUNT_INCREMENT} onNeedMoreData={handleNeedMoreData} > {children} diff --git a/src/views/Harvestables/Harvestables.js b/src/views/Harvestables/Harvestables.js index 6fdce07..c101756 100644 --- a/src/views/Harvestables/Harvestables.js +++ b/src/views/Harvestables/Harvestables.js @@ -98,6 +98,7 @@ function Harvestables({ updateQuery, error, hasLoaded, + pageAmount, onNeedMoreData, children, }) { @@ -213,6 +214,7 @@ function Harvestables({ onHeaderClick={sasqParams.onSort} sortedColumn={sortedColumn} sortDirection={sortDirection} + pageAmount={pageAmount} onNeedMoreData={onNeedMoreData} pagingType={MCLPagingTypes.PREV_NEXT} onRowClick={(event, rec) => updateQuery({ _path: `${packageInfo.stripes.route}/harvestables/${rec.id}` })} @@ -242,6 +244,7 @@ Harvestables.propTypes = { updateQuery:PropTypes.func.isRequired, error: PropTypes.string, hasLoaded: PropTypes.bool.isRequired, + pageAmount: PropTypes.number.isRequired, onNeedMoreData: PropTypes.func.isRequired, children: PropTypes.arrayOf(PropTypes.object.isRequired).isRequired, }; diff --git a/src/views/Jobs/Jobs.js b/src/views/Jobs/Jobs.js index d5ef08e..ce38466 100644 --- a/src/views/Jobs/Jobs.js +++ b/src/views/Jobs/Jobs.js @@ -19,6 +19,7 @@ function Jobs({ updateQuery, error, hasLoaded, + pageAmount, onNeedMoreData, children, }) { @@ -110,6 +111,7 @@ function Jobs({ totalCount={resultCount} onHeaderClick={sasqParams.onSort} nonInteractiveHeaders={['seconds']} + pageAmount={pageAmount} onNeedMoreData={onNeedMoreData} sortedColumn={sortedColumn} sortDirection={sortDirection} @@ -146,6 +148,7 @@ Jobs.propTypes = { updateQuery:PropTypes.func.isRequired, error: PropTypes.string, hasLoaded: PropTypes.bool.isRequired, + pageAmount: PropTypes.number.isRequired, onNeedMoreData: PropTypes.func.isRequired, children: PropTypes.oneOfType([ PropTypes.object.isRequired, diff --git a/src/views/Records/Records.js b/src/views/Records/Records.js index a2e2924..cc4af52 100644 --- a/src/views/Records/Records.js +++ b/src/views/Records/Records.js @@ -63,6 +63,7 @@ function Records({ updateQuery, error, hasLoaded, + pageAmount, onNeedMoreData, children, }) { @@ -139,6 +140,7 @@ function Records({ totalCount={resultCount} onHeaderClick={sasqParams.onSort} nonInteractiveHeaders={['instanceHrid', 'instanceTitle', 'errors']} + pageAmount={pageAmount} onNeedMoreData={onNeedMoreData} sortedColumn={sortedColumn} sortDirection={sortDirection} @@ -181,6 +183,7 @@ Records.propTypes = { updateQuery:PropTypes.func.isRequired, error: PropTypes.string, hasLoaded: PropTypes.bool.isRequired, + pageAmount: PropTypes.number.isRequired, onNeedMoreData: PropTypes.func.isRequired, children: PropTypes.oneOfType([ PropTypes.object.isRequired,