From ac5969c3b8d08d696a91ee05ef0c0885d542d6d7 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Wed, 16 Apr 2025 10:13:24 +0700 Subject: [PATCH] update variable on columns table manage user - sync with response - fix sorting --- .../settings/user/manage-user/blocks/ListToolBar.tsx | 2 +- .../user/manage-user/hooks/ManageUserContext.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx index 2e76deb..998ef61 100644 --- a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx +++ b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx @@ -15,7 +15,7 @@ const ListToolBar = () => { table.getColumn('username')?.setFilterValue(event.target.value) diff --git a/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx b/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx index 8b33e36..77f68a9 100644 --- a/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx +++ b/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx @@ -86,7 +86,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.customer?.username, - id: 'customer', + id: 'Users.customer', header: ({ column }) => , enableSorting: true, enableHiding: false, @@ -98,7 +98,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) accessorFn: (row) => row.email, id: 'email', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[350px]' @@ -106,9 +106,9 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.name, - id: 'name', + id: 'Users.name', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' @@ -116,7 +116,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.role.name, - id: 'role_name', + id: 'Users.role', header: ({ column }) => , enableSorting: true, enableHiding: false, @@ -239,7 +239,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) pagination={{ size: 10 }} toolbar={} layout={{ card: true }} - sorting={[{ id: 'Users.username', desc: false }]} + sorting={[{ id: 'Users.created_at', desc: false }]} serverSide={true} onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) => doGetListData(pageIndex, pageSize, sorting, columnFilters)