Merge pull request #38 from knovator/development

Development_v1.3.4
knovator · Oct 10, 2022 · e535cf0 · e535cf0
2 parents 5c2cc49 + ebf92bc
commit e535cf0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@knovator/masters-admin",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "description": "Package for integrating Masters, Submasters functionality in React projects",
     "main": "dist/index.js",
     "module": "dist/masters-admin.esm.js",

diff --git a/src/hook/useMaster.tsx b/src/hook/useMaster.tsx
@@ -176,6 +176,9 @@ const useMaster = ({ defaultLimit, routes, defaultSort = ["createdAt", 1], preCo
                 if (response?.code === "SUCCESS") {
                     setLoading(false)
                     onSuccess(CALLBACK_CODES.DELETE, response?.code, response?.message)
+                    if (Array.isArray(list) && list.length === 1 && currentPageRef.current > 1) {
+                        currentPageRef.current = currentPageRef.current - 1
+                    }
                     getMastersList()
                     onCloseForm()
                     return
@@ -196,6 +199,7 @@ const useMaster = ({ defaultLimit, routes, defaultSort = ["createdAt", 1], preCo
     }
     const onChangePageSize = (size: number): void => {
         limitRef.current = size
+        currentPageRef.current = 1
         getMastersList()
     }
     const onChangeCurrentPage = (page: number): void => {

diff --git a/src/hook/useSubMaster.tsx b/src/hook/useSubMaster.tsx
@@ -190,6 +190,9 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
                 if (response?.code === "SUCCESS") {
                     setLoading(false)
                     onSuccess(CALLBACK_CODES.DELETE, response?.code, response?.message)
+                    if (Array.isArray(list) && list.length === 1 && currentPageRef.current > 1) {
+                        currentPageRef.current = currentPageRef.current - 1
+                    }
                     getSubMastersList()
                     onCloseForm()
                     return
@@ -315,6 +318,7 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
     }
     const onChangePageSize = (size: number): void => {
         limitRef.current = size
+        currentPageRef.current = 1
         setSequencing(false)
         getSubMastersList()
     }