@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.17.2 → 3.17.3

package/dpr/components/pagination/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const SELECTED_PAGE_PARAM = 'selectedPage';
+const PAGE_SIZE_PARAM = 'pageSize';
 const DEFAULT_PAGE = 1;
 const DEFAULT_PAGE_SIZE = 20;
 /**
@@ -13,8 +14,7 @@ const DEFAULT_PAGE_SIZE = 20;
  * @param currentPage
  * @return {*}  {{ pages: page[]; pagesLength: number }}
  */
-const createPages = (pathname, search, totalRows, pageSize, currentPage) => {
-    const queryParams = new URLSearchParams(search);
+const createPages = (pathname, queryParams, totalRows, pageSize, currentPage) => {
     const pagesLength = Math.ceil(totalRows / pageSize);
     const pages = [];
     Array(pagesLength)
@@ -100,9 +100,12 @@ const setPageSizes = (totalRows) => {
  * @return {*}
  */
 exports.default = {
-    getPaginationData: (url, totalRows, pageSize = DEFAULT_PAGE_SIZE, currentPage = DEFAULT_PAGE) => {
+    getPaginationData: (url, totalRows) => {
         const { pathname, search } = url;
-        const { pages, pagesLength } = createPages(pathname, search, totalRows, pageSize, currentPage);
+        const queryParams = new URLSearchParams(search);
+        const pageSize = +queryParams.get(PAGE_SIZE_PARAM) || DEFAULT_PAGE_SIZE;
+        const currentPage = +queryParams.get(SELECTED_PAGE_PARAM) || DEFAULT_PAGE;
+        const { pages, pagesLength } = createPages(pathname, queryParams, totalRows, pageSize, currentPage);
         return {
             next: createNext(pathname, search, pagesLength, totalRows, currentPage),
             prev: createPrev(pathname, search, currentPage),

package/dpr/components/pagination/utils.ts

@@ -2,6 +2,7 @@ import { Url } from 'url'
 import { Page, PageSize, Pagination } from './types'
 
 const SELECTED_PAGE_PARAM = 'selectedPage'
+const PAGE_SIZE_PARAM = 'pageSize'
 const DEFAULT_PAGE = 1
 const DEFAULT_PAGE_SIZE = 20
 
@@ -17,12 +18,11 @@ const DEFAULT_PAGE_SIZE = 20
  */
 const createPages = (
   pathname: string,
-  search: string,
+  queryParams: URLSearchParams,
   totalRows: number,
   pageSize: number,
   currentPage: number,
 ): { pages: Page[]; pagesLength: number } => {
-  const queryParams = new URLSearchParams(search)
   const pagesLength = Math.ceil(totalRows / pageSize)
 
   const pages: Page[] = []
@@ -126,14 +126,13 @@ const setPageSizes = (totalRows: number): PageSize[] => {
  * @return {*}
  */
 export default {
-  getPaginationData: (
-    url: Url,
-    totalRows: number,
-    pageSize: number = DEFAULT_PAGE_SIZE,
-    currentPage: number = DEFAULT_PAGE,
-  ): Pagination => {
+  getPaginationData: (url: Url, totalRows: number): Pagination => {
     const { pathname, search } = url
-    const { pages, pagesLength } = createPages(pathname, search, totalRows, pageSize, currentPage)
+    const queryParams = new URLSearchParams(search)
+    const pageSize = +queryParams.get(PAGE_SIZE_PARAM) || DEFAULT_PAGE_SIZE
+    const currentPage = +queryParams.get(SELECTED_PAGE_PARAM) || DEFAULT_PAGE
+
+    const { pages, pagesLength } = createPages(pathname, queryParams, totalRows, pageSize, currentPage)
     return {
       next: createNext(pathname, search, pagesLength, totalRows, currentPage),
       prev: createPrev(pathname, search, currentPage),

package/dpr/components/report-list/utils.js

@@ -93,7 +93,7 @@ function renderList(listData, variantDefinition, reportQuery, request, response,
                 ...dataTable,
                 classification,
                 printable,
-                pagination: utils_4.default.getPaginationData(url, count, reportQuery.pageSize, reportQuery.selectedPage),
+                pagination: utils_4.default.getPaginationData(url, count),
             };
             const filterOptions = utils_1.default.getFilterOptions(variantDefinition, reportQuery.filters, reportQuery, urlHelper_1.default, dynamicAutocompleteEndpoint);
             const actions = utils_3.default.initReportActions(reportName, variantDefinition.name, variantDefinition.printable, `${request.protocol}://${request.get('host')}${request.originalUrl}`);

package/dpr/components/report-list/utils.ts

@@ -107,7 +107,7 @@ function renderList(
           ...dataTable,
           classification,
           printable,
-          pagination: PaginationUtils.getPaginationData(url, count, reportQuery.pageSize, reportQuery.selectedPage),
+          pagination: PaginationUtils.getPaginationData(url, count),
         }
 
         const filterOptions: FilterOptions = FilterUtils.getFilterOptions(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "3.17.2",
+  "version": "3.17.3",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {