diff --git a/src/app/(modules)/ticket/[ticketId]/components/TicketStatusActions.tsx b/src/app/(modules)/ticket/[ticketId]/components/TicketStatusActions.tsx index 9395174..0d70cb3 100644 --- a/src/app/(modules)/ticket/[ticketId]/components/TicketStatusActions.tsx +++ b/src/app/(modules)/ticket/[ticketId]/components/TicketStatusActions.tsx @@ -49,7 +49,7 @@ function getTicketAction(ticket: TicketDetail) { ); } - if (ticket.status === 'closed') { + if (ticket.assignment_status === 'approved' || ticket.assignment_status === 'rejected') { return ; } diff --git a/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts b/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts index c7413d5..3d31ac9 100644 --- a/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts +++ b/src/app/(modules)/ticket/hooks/useTenantTicketTableEvents.ts @@ -59,7 +59,6 @@ function shouldCountCreatedTicket( event: TicketTableStatusEvent, params?: TicketListParams, ) { - if (params?.status && event.status !== params.status) return false; if (params?.chainage_id && event.chainage_id !== params.chainage_id) { return false; } @@ -87,7 +86,6 @@ function buildTicketListItem( if ( !event.id || !event.ticket_name || - !event.status || event.detection_count === undefined || !event.updated_at ) { @@ -99,7 +97,6 @@ function buildTicketListItem( ticket_name: event.ticket_name, chainage_id: event.chainage_id ?? null, chainage_name: event.chainage_name ?? null, - status: event.status, default_defect_class: event.default_defect_class ?? null, assigned_to_name: event.assigned_to_name ?? null, detection_count: event.detection_count, @@ -118,7 +115,6 @@ function mergeTicketListItem( ticket_name: event.ticket_name ?? current.ticket_name, chainage_id: event.chainage_id ?? current.chainage_id, chainage_name: event.chainage_name ?? current.chainage_name, - status: event.status ?? current.status, default_defect_class: event.default_defect_class ?? current.default_defect_class, assigned_to_name: event.assigned_to_name ?? current.assigned_to_name, diff --git a/src/app/(modules)/ticket/hooks/useTicketDetailEvents.ts b/src/app/(modules)/ticket/hooks/useTicketDetailEvents.ts index b98c0a4..52078b9 100644 --- a/src/app/(modules)/ticket/hooks/useTicketDetailEvents.ts +++ b/src/app/(modules)/ticket/hooks/useTicketDetailEvents.ts @@ -63,19 +63,11 @@ export function useTicketDetailEvents( [refetchTicket], ); - const shouldStop = useCallback( - (eventName: keyof typeof events, event: unknown) => - eventName === 'ticket_status' && - (event as TicketDetailStatusEvent).status === 'closed', - [], - ); - useSseWithToken({ enabled: Boolean(enabled && ticketId), getToken, getPath, events, reconnectOnEvents: TICKET_DETAIL_RECONNECT_EVENTS, - shouldStop, }); } diff --git a/src/app/(modules)/ticket/hooks/useTicketQueries.ts b/src/app/(modules)/ticket/hooks/useTicketQueries.ts index 1dff49f..9f1b8f0 100644 --- a/src/app/(modules)/ticket/hooks/useTicketQueries.ts +++ b/src/app/(modules)/ticket/hooks/useTicketQueries.ts @@ -13,7 +13,6 @@ import type { SubmitRepairUploadPayload, TicketDetail, TicketListParams, - TicketStatus, } from '@/types'; import { ticketKeys } from '../queries/ticketKeys'; diff --git a/src/services/api/ticket.service.ts b/src/services/api/ticket.service.ts index e639c76..35b8418 100644 --- a/src/services/api/ticket.service.ts +++ b/src/services/api/ticket.service.ts @@ -25,7 +25,6 @@ export const ticketService = { params: { skip: params?.skip ?? 0, limit: params?.limit ?? 10, - status: params?.status, chainage_id: params?.chainage_id, }, }, diff --git a/src/types/ticket/events.ts b/src/types/ticket/events.ts index 0d9879d..a8403f3 100644 --- a/src/types/ticket/events.ts +++ b/src/types/ticket/events.ts @@ -13,7 +13,6 @@ export type TicketTableStatusEvent = { ticket_name?: string; chainage_id?: string | null; chainage_name?: string | null; - status?: TicketStatus; default_defect_class?: string | null; assigned_to_name?: string | null; detection_count?: number; diff --git a/src/types/ticket/list.ts b/src/types/ticket/list.ts index c5045e0..fefc9c2 100644 --- a/src/types/ticket/list.ts +++ b/src/types/ticket/list.ts @@ -1,8 +1,6 @@ import type { PaginationParams } from '../common'; -import type { TicketStatus } from './status'; export interface TicketListParams extends PaginationParams { - status?: TicketStatus; chainage_id?: string; } @@ -11,7 +9,6 @@ export interface TicketListItem { ticket_name: string; chainage_id: string | null; chainage_name: string | null; - status: TicketStatus; default_defect_class: string | null; assigned_to_name: string | null; detection_count: number;