From 3f995cfa38bdf91fed8621f63ca4814c254b0e59 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Mon, 24 Mar 2025 11:45:22 +0700 Subject: [PATCH] fix search filter --- src/pages/menu/manage-menu/blocks/ListToolbar.tsx | 4 ++-- src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx index 784c705..b0364d8 100644 --- a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx +++ b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx @@ -16,8 +16,8 @@ const ListToolbar = () => { table.getColumn('subMenu')?.setFilterValue(event.target.value)} + value={(table.getColumn('name')?.getFilterValue() as string) ?? ''} + onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)} /> diff --git a/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx b/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx index ab46533..fcdf17c 100644 --- a/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx +++ b/src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx @@ -118,7 +118,7 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.name, - id: 'subMenu', + id: 'name', header: ({ column }) => , enableSorting: false, enableHiding: false, @@ -210,7 +210,8 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) page: page + 1, with_deleted: false, order_field: sorting[0].id, - order_direction: sorting[0].desc ? 'DESC' : 'ASC' + order_direction: sorting[0].desc ? 'DESC' : 'ASC', + filter: JSON.stringify(filter) }); if (!response?.data.list) return { data: [], totalCount: 0 }; @@ -223,7 +224,7 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) console.log(response.data); setMenus(transformedData); - return { data: transformedData, totalCount: response.data.total_count }; + return { data: transformedData, totalCount: total_count }; } catch (error) { console.error('Error fetching Menus', error); return { data: [], totalCount: 0 }; @@ -250,7 +251,7 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode }) } layout={{ card: true }} sorting={[{ id: 'id', desc: false }]}