changes

Author: shivani170

src/Common/Hooks/useStateFilters/types.ts

@@ -29,14 +29,6 @@ export interface UseStateFiltersReturnType<T>
         | 'changePageSize'
         | 'offset'
         | 'pageSize'
-    > {
-    /*
-     *  Handler for resetting the pagination to the initial state
-     */
-    resetPagination: () => void
-}
+    > {}
 
-export interface PaginationType {
-    pageSize: number
-    offset: number
-}
+export interface PaginationType<T> extends Pick<UseUrlFiltersReturnType<T>, 'pageSize' | 'pageNumber'> {}

src/Common/Hooks/useStateFilters/useStateFilters.tsx

@@ -17,6 +17,7 @@
 import { useState } from 'react'
 import { DEFAULT_BASE_PAGE_SIZE, SortingOrder } from '../../Constants'
 import { PaginationType, UseStateFiltersProps, UseStateFiltersReturnType } from './types'
+import { DEFAULT_PAGE_NUMBER } from '../useUrlFilters/constants'
 
 /**
  * Generic hook for implementing state based pagination, search, sorting.
@@ -40,24 +41,23 @@ const useStateFilters = <T = string,>({
     })
     const { sortBy, sortOrder } = sortingConfig
 
-    const [pagination, setPagination] = useState<PaginationType>({
+    const [pagination, setPagination] = useState<PaginationType<T>>({
         pageSize: DEFAULT_BASE_PAGE_SIZE,
-        offset: 0,
+        pageNumber: DEFAULT_PAGE_NUMBER,
     })
+    const offset = pagination.pageSize * (pagination.pageNumber - 1)
 
     const changePage = (pageNo: number): void => {
-        const offset = pagination.pageSize * (pageNo - 1)
         setPagination({
             ...pagination,
-            offset,
+            pageNumber: pageNo,
         })
     }
 
     const changePageSize = (_pageSize: number): void => {
         setPagination({
             ...pagination,
             pageSize: _pageSize,
-            offset: 0,
         })
     }
 
@@ -75,6 +75,10 @@ const useStateFilters = <T = string,>({
             sortBy: _sortBy,
             sortOrder: order,
         }))
+        setPagination({
+            ...pagination,
+            pageNumber: DEFAULT_PAGE_NUMBER,
+        })
     }
 
     const clearFilters = () => {
@@ -84,21 +88,14 @@ const useStateFilters = <T = string,>({
         })
     }
 
-    const resetPagination = () => {
-        setPagination({
-            pageSize: DEFAULT_BASE_PAGE_SIZE,
-            offset: 0,
-        })
-    }
-
     return {
         ...sortingConfig,
         handleSorting,
         clearFilters,
         ...pagination,
         changePage,
         changePageSize,
-        resetPagination,
+        offset,
     }
 }
 

src/Common/Hooks/useUrlFilters/types.ts

@@ -32,6 +32,10 @@ export type UseUrlFiltersReturnType<T, K = unknown> = K & {
      * Currently applied page size
      */
     pageSize: number
+    /**
+     * PageNumber for the current page
+     */
+    pageNumber?: number
     /**
      * Handler for updating the current page
      */