From f005d9584ee9f28fac1bc3d3444dca6b3c01d0a6 Mon Sep 17 00:00:00 2001 From: Rama Priyanto Date: Wed, 11 Jun 2025 15:02:32 +0700 Subject: [PATCH] fix:table user levels --- .../master-user-level-table.tsx | 122 +++++++++--------- 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/components/table/master/master-user-level/master-user-level-table.tsx b/components/table/master/master-user-level/master-user-level-table.tsx index 337fc3c..2b0b611 100644 --- a/components/table/master/master-user-level/master-user-level-table.tsx +++ b/components/table/master/master-user-level/master-user-level-table.tsx @@ -104,7 +104,7 @@ export default function MasterUserLevelTable() { }; const res = await getAllUserLevels(request); const data = res?.data?.data; - setTotalPage(Math.ceil(res?.data?.meta?.totalPage)); + setTotalPage(Math.ceil(res?.data?.meta?.totalPage) || 1); await initUserData(10, data); close(); } @@ -114,7 +114,7 @@ export default function MasterUserLevelTable() { page: 1, limit: -1, search: "", - timeStamp: getUnixTimestamp(), + // timeStamp: getUnixTimestamp(), }; const res = await getAllUserLevels(request); const data = res?.data?.data; @@ -140,6 +140,8 @@ export default function MasterUserLevelTable() { return value; }); setMasterUserLevel(newData); + } else { + setMasterUserLevel([]); } } @@ -156,6 +158,7 @@ export default function MasterUserLevelTable() { }; async function doneTyping() { + setPage(1); fetchData(); } @@ -331,64 +334,67 @@ export default function MasterUserLevelTable() { )} - - - - {(column) => ( - - {column.uid === "setup" ? ( - { - doMapping(e); - }} - > - ) : ( - column.name + {masterUserLevelTable && ( + <> +
+ + {(column) => ( + + {column.uid === "setup" ? ( + { + doMapping(e); + }} + > + ) : ( + column.name + )} + )} - - )} - - - {(item) => ( - - {(columnKey) => ( - {renderCell(item, columnKey)} + + + {(item) => ( + + {(columnKey) => ( + {renderCell(item, columnKey)} + )} + )} - - )} - -
-
- setPage(page)} - /> -
+ + +
+ setPage(page)} + /> +
+ + )}