diff --git a/src/app/(modules)/ticket/components/TicketColumns.tsx b/src/app/(modules)/ticket/components/TicketColumns.tsx index d10e93e..25e7fd8 100644 --- a/src/app/(modules)/ticket/components/TicketColumns.tsx +++ b/src/app/(modules)/ticket/components/TicketColumns.tsx @@ -30,10 +30,21 @@ export function useTicketColumns(): ColumnDef[] { size: 120, }, { - accessorKey: 'created_by_name', + id: 'created_by', header: 'Uploaded By', size: 220, - cell: ({ row }) => row.original.created_by_name || 'N/A', + cell: ({ row }) => ( +
+

+ {row.original.created_by_name || 'N/A'} +

+ {row.original.created_by_email ? ( +

+ {row.original.created_by_email} +

+ ) : null} +
+ ), }, { accessorKey: 'updated_at', diff --git a/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts b/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts index 40a61f6..d889f24 100644 --- a/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts +++ b/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts @@ -100,6 +100,7 @@ function buildTicketListItem( default_defect_class: event.default_defect_class ?? null, detection_count: event.detection_count, created_by_name: event.created_by_name ?? null, + created_by_email: event.created_by_email ?? null, created_at: event.created_at ?? event.updated_at, updated_at: event.updated_at, }; @@ -118,6 +119,7 @@ function mergeTicketListItem( event.default_defect_class ?? current.default_defect_class, detection_count: event.detection_count ?? current.detection_count, created_by_name: event.created_by_name ?? current.created_by_name, + created_by_email: event.created_by_email ?? current.created_by_email, created_at: event.created_at ?? current.created_at, updated_at: event.updated_at ?? current.updated_at, }; diff --git a/src/types/ticket/events.ts b/src/types/ticket/events.ts index e0a17c4..3bb91a6 100644 --- a/src/types/ticket/events.ts +++ b/src/types/ticket/events.ts @@ -16,6 +16,7 @@ export type TicketTableStatusEvent = { default_defect_class?: string | null; detection_count?: number; created_by_name?: string | null; + created_by_email?: string | null; created_at?: string; updated_at?: string; message?: string; diff --git a/src/types/ticket/list.ts b/src/types/ticket/list.ts index d270f48..5c8da0b 100644 --- a/src/types/ticket/list.ts +++ b/src/types/ticket/list.ts @@ -12,6 +12,7 @@ export interface TicketListItem { default_defect_class: string | null; detection_count: number; created_by_name: string | null; + created_by_email: string | null; created_at: string; updated_at: string; }