diff --git a/frontend/src/components/tables/UsersTable.jsx b/frontend/src/components/tables/UsersTable.jsx
index 6572b418..ddb62f14 100644
--- a/frontend/src/components/tables/UsersTable.jsx
+++ b/frontend/src/components/tables/UsersTable.jsx
@@ -160,23 +160,9 @@ const UsersTable = () => {
),
},
{
- header: 'First Name',
- accessorKey: 'first_name',
- cell: ({ getValue }) => (
-
- {getValue() || '-'}
-
- ),
- },
- {
- header: 'Last Name',
- accessorKey: 'last_name',
+ id: 'name',
+ header: 'Name',
+ accessorFn: (row) => `${row.first_name || ''} ${row.last_name || ''}`.trim(),
cell: ({ getValue }) => (
{
{
header: 'Date Joined',
accessorKey: 'date_joined',
- size: 140,
+ size: 120,
cell: ({ getValue }) => {
const date = getValue();
return (
@@ -220,12 +206,12 @@ const UsersTable = () => {
{
header: 'Last Login',
accessorKey: 'last_login',
- size: 140,
+ size: 175,
cell: ({ getValue }) => {
const date = getValue();
return (
- {date ? new Date(date).toLocaleDateString() : 'Never'}
+ {date ? new Date(date).toLocaleString() : 'Never'}
);
},
@@ -316,8 +302,7 @@ const UsersTable = () => {
headerCellRenderFns: {
actions: renderHeaderCell,
username: renderHeaderCell,
- first_name: renderHeaderCell,
- last_name: renderHeaderCell,
+ name: renderHeaderCell,
email: renderHeaderCell,
user_level: renderHeaderCell,
last_login: renderHeaderCell,