diff --git a/src/pages/CrossmatchResults.tsx b/src/pages/CrossmatchResults.tsx index 456fd01..9d879b7 100644 --- a/src/pages/CrossmatchResults.tsx +++ b/src/pages/CrossmatchResults.tsx @@ -12,7 +12,6 @@ import { getCrossmatchRecords } from "../clients/admin/sdk.gen"; import type { GetRecordsCrossmatchResponse, RecordCrossmatch, - RecordCrossmatchStatus, RecordTriageStatus, ValidationError, } from "../clients/admin/types.gen"; @@ -27,12 +26,10 @@ import { adminClient } from "../clients/config"; interface CrossmatchFiltersProps { tableName: string | null; - status: RecordCrossmatchStatus | null; triageStatus: string | null; pageSize: number; onApplyFilters: ( tableName: string, - status: string, triageStatus: string, pageSize: number, ) => void; @@ -40,12 +37,10 @@ interface CrossmatchFiltersProps { function CrossmatchFilters({ tableName, - status, triageStatus, pageSize, onApplyFilters, }: CrossmatchFiltersProps): ReactElement { - const [localStatus, setLocalStatus] = useState(status || "all"); const [localTriageStatus, setLocalTriageStatus] = useState( triageStatus ?? "pending", ); @@ -53,19 +48,13 @@ function CrossmatchFilters({ const [localTableName, setLocalTableName] = useState(tableName || ""); useEffect(() => { - setLocalStatus(status || "all"); setLocalTriageStatus(triageStatus ?? "pending"); setLocalPageSize(pageSize); setLocalTableName(tableName || ""); - }, [status, triageStatus, pageSize, tableName]); + }, [triageStatus, pageSize, tableName]); function applyFilters(): void { - onApplyFilters( - localTableName, - localStatus, - localTriageStatus, - localPageSize, - ); + onApplyFilters(localTableName, localTriageStatus, localPageSize); } return ( @@ -78,18 +67,6 @@ function CrossmatchFilters({ onEnter={applyFilters} /> - - {displayName} - +
+ + {displayName} + + {triageStatusLabel} +
); } @@ -156,14 +144,6 @@ function CrossmatchResults({ ); } - function getStatusLabel(status: RecordCrossmatchStatus): string { - return getResource(`crossmatch.status.${status}`).Title; - } - - function getTriageStatusLabel(triageStatus: RecordTriageStatus): string { - return getResource(`crossmatch.triage.${triageStatus}`).Title; - } - const columns: Column[] = [ { name: "Record name", @@ -174,8 +154,6 @@ function CrossmatchResults({ return NULL; }, }, - { name: "Status" }, - { name: "Manual check status" }, { name: "Candidates", renderCell: (recordIndex: CellPrimitive) => { @@ -188,10 +166,8 @@ function CrossmatchResults({ ]; const tableData: Record[] = - data?.records.map((record: RecordCrossmatch, index: number) => ({ + data?.records.map((_: RecordCrossmatch, index: number) => ({ "Record name": index, - Status: getStatusLabel(record.status), - "Manual check status": getTriageStatusLabel(record.triage_status), Candidates: index, })) || []; @@ -200,7 +176,6 @@ function CrossmatchResults({ async function fetcher( tableName: string | null, - status: RecordCrossmatchStatus | null, triageStatus: RecordTriageStatus | null, page: number, pageSize: number, @@ -213,7 +188,6 @@ async function fetcher( client: adminClient, query: { table_name: tableName, - status: status, triage_status: triageStatus, page: page, page_size: pageSize, @@ -239,7 +213,6 @@ export function CrossmatchResultsPage(): ReactElement { const [searchParams, setSearchParams] = useSearchParams(); const tableName = searchParams.get("table_name"); - const status = searchParams.get("status") as RecordCrossmatchStatus | null; const triageStatusParam = searchParams.get("triage_status"); const apiTriageStatus: RecordTriageStatus | null = triageStatusParam === null || triageStatusParam === "" @@ -255,8 +228,8 @@ export function CrossmatchResultsPage(): ReactElement { }, [tableName]); const { data, loading, error } = useDataFetching( - () => fetcher(tableName, status, apiTriageStatus, page, pageSize), - [tableName, status, apiTriageStatus, page, pageSize], + () => fetcher(tableName, apiTriageStatus, page, pageSize), + [tableName, apiTriageStatus, page, pageSize], ); function handlePageChange(newPage: number): void { @@ -267,7 +240,6 @@ export function CrossmatchResultsPage(): ReactElement { function handleApplyFilters( newTableName: string, - newStatus: string, newTriageStatus: string, newPageSize: number, ): void { @@ -279,12 +251,6 @@ export function CrossmatchResultsPage(): ReactElement { newSearchParams.delete("table_name"); } - if (newStatus === "all") { - newSearchParams.delete("status"); - } else { - newSearchParams.set("status", newStatus); - } - if (newTriageStatus === "all") { newSearchParams.set("triage_status", "all"); } else { @@ -320,7 +286,6 @@ export function CrossmatchResultsPage(): ReactElement {

Crossmatch results