diff --git a/package.json b/package.json index 4500100..c8c09a9 100644 --- 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 index 5cbf664..e0138b4 100644 --- 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 index 2614249..f70f13c 100644 --- 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() }