diff --git a/src/pages/AdminPage/components/ActiveShiftsTable/ActiveShiftsTable.tsx b/src/pages/AdminPage/components/ActiveShiftsTable/ActiveShiftsTable.tsx index a5b2482..f921bc2 100644 --- a/src/pages/AdminPage/components/ActiveShiftsTable/ActiveShiftsTable.tsx +++ b/src/pages/AdminPage/components/ActiveShiftsTable/ActiveShiftsTable.tsx @@ -83,8 +83,9 @@ export const ActiveShiftsTable = ({ activeShifts, fetchActiveShifts }: Props) => columns={columns} restProps={ { - enablePagination: true, enableRowActions: true, + enableSorting: true, + enableColumnActions: false, renderRowActions: ({ row }) => ( diff --git a/src/pages/AdminPage/components/ActiveShiftsTable/columns.tsx b/src/pages/AdminPage/components/ActiveShiftsTable/columns.tsx index 8531613..e3b9253 100644 --- a/src/pages/AdminPage/components/ActiveShiftsTable/columns.tsx +++ b/src/pages/AdminPage/components/ActiveShiftsTable/columns.tsx @@ -7,6 +7,7 @@ export const useActiveShiftsTableColumns = () => { () => [ { header: "Начало смены", + accessorKey: "startedAt", Cell: ({ row }) => new Date(row.original.startedAt).toLocaleString("ru-RU"), }, @@ -18,10 +19,12 @@ export const useActiveShiftsTableColumns = () => { { header: "Роль", accessorKey: "user.role.name", + enableSorting: false, }, { header: "Должность", accessorKey: "user.position.name", + enableSorting: false, } ], []