From 25cb7aae898c58f045637d4d01a6aa1cc4ace9b1 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Tue, 18 Mar 2025 15:11:03 +0700 Subject: [PATCH] fix filter search posto and remove console log parsedUser --- .../home/user-profile/blocks/BasicSettings.tsx | 2 +- src/pages/master/postoadms/blocks/ListToolbar.tsx | 4 ++-- .../postoadms/hooks/ManagePostoAdmsContext.tsx | 12 ++++++------ .../menu/manage-menu/hooks/ManageMenusContext.tsx | 6 ++++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/pages/account/home/user-profile/blocks/BasicSettings.tsx b/src/pages/account/home/user-profile/blocks/BasicSettings.tsx index c5d9249..0d3847b 100644 --- a/src/pages/account/home/user-profile/blocks/BasicSettings.tsx +++ b/src/pages/account/home/user-profile/blocks/BasicSettings.tsx @@ -14,7 +14,7 @@ const BasicSettings = () => { // const user = localStorage.getItem('user'); // const parsedUser = user ? JSON.parse(user) : null; const parsedUser = getAuth()?.user; - console.log('parsedUser :', parsedUser); + // console.log('parsedUser :', parsedUser); const [newUsername, setNewUsername] = useState(parsedUser?.username || ''); const [newEmail, setNewEmail] = useState(parsedUser?.email || ''); const [newName, setNewName] = useState(parsedUser?.name || ''); diff --git a/src/pages/master/postoadms/blocks/ListToolbar.tsx b/src/pages/master/postoadms/blocks/ListToolbar.tsx index c476994..6d6de9c 100644 --- a/src/pages/master/postoadms/blocks/ListToolbar.tsx +++ b/src/pages/master/postoadms/blocks/ListToolbar.tsx @@ -17,9 +17,9 @@ const ListToolbar = () => { - table.getColumn('PostoAdms_name')?.setFilterValue(event.target.value) + table.getColumn('name')?.setFilterValue(event.target.value) } /> diff --git a/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx b/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx index 986db2e..0a80a85 100644 --- a/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx +++ b/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx @@ -84,9 +84,9 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod const columns = useMemo[]>( () => [ { - // accessorFn: (row) => row.PostoAdms_id, - // id: 'PostoAdms_id', - accessorKey: 'PostoAdms_id', + accessorFn: (row) => row.PostoAdms_id, + id: 'id', + // accessorKey: 'PostoAdms_id', header: ({ column }) => , enableSorting: true, enableHiding: false, @@ -95,9 +95,9 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod } }, { - // accessorFn: (row) => row.posto_adms_name, - // id: 'posto_adms_name', - accessorKey: 'PostoAdms_name', + accessorFn: (row) => row.PostoAdms_name, + id: 'name', + // accessorKey: 'PostoAdms_name', header: ({ column }) => ( ), diff --git a/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx b/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx index 96a82f0..a8a40e6 100644 --- a/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx +++ b/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx @@ -175,7 +175,8 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) const flattenChildren = (parent: any, parentIdx: number, depth = 0, parentName = '') => { if (parent.link === '/') { - if (!parents.find((el: any) => el.id === parent.id)) setParents((el: any) => [...el, { id: parent.id, name: parent.name }]) // GET PARENTS + if (!parents.find((el: any) => el.id === parent.id)) + setParents((el: any) => [...el, { id: parent.id, name: parent.name }]); // GET PARENTS } if (!parent.children || parent.children.length === 0) { return []; // Jika tidak ada children, kembalikan array kosong @@ -220,8 +221,9 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) const total_count = transformedData.length; + console.log(response.data); setMenus(transformedData); - return { data: transformedData, totalCount: total_count }; + return { data: transformedData, totalCount: response.data.total_count }; } catch (error) { console.error('Error fetching Menus', error); return { data: [], totalCount: 0 };