diff --git a/frontend/components/correspondences/form.tsx b/frontend/components/correspondences/form.tsx index 06b104a..7238ce9 100644 --- a/frontend/components/correspondences/form.tsx +++ b/frontend/components/correspondences/form.tsx @@ -44,6 +44,7 @@ const correspondenceSchema = z.object({ type FormData = z.infer; type ProjectOption = { + publicId?: string; uuid?: string; id?: number; projectName: string; @@ -116,7 +117,7 @@ export function CorrespondenceForm({ initialData, uuid }: { initialData?: Initia const { data: organizations, isLoading: isLoadingOrgs } = useOrganizations(); const { data: correspondenceTypesData, isLoading: isLoadingTypes } = useCorrespondenceTypes(); const { data: disciplinesData, isLoading: isLoadingDisciplines } = useDisciplines(); - const projects = extractArrayData(projectsData); + const projects = (projectsData as ProjectOption[]) ?? []; const organizationOptions = extractArrayData(organizations); const correspondenceTypes = extractArrayData(correspondenceTypesData); const disciplines = extractArrayData(disciplinesData); @@ -316,7 +317,7 @@ export function CorrespondenceForm({ initialData, uuid }: { initialData?: Initia {projects.map((p) => ( - + {p.projectName} ({p.projectCode}) ))} diff --git a/frontend/components/drawings/upload-form.tsx b/frontend/components/drawings/upload-form.tsx index 7178dd2..617bd5b 100644 --- a/frontend/components/drawings/upload-form.tsx +++ b/frontend/components/drawings/upload-form.tsx @@ -88,9 +88,9 @@ type DrawingFormData = z.infer; export function DrawingUploadForm() { const router = useRouter(); - // Project list + // Project list - ADR-019: useProjects returns array directly now const { data: projectsData, isLoading: isLoadingProjects } = useProjects(); - const projects = extractArrayData<{ id?: number; publicId?: string; projectName: string; projectCode: string }>(projectsData); + const projects = (projectsData ?? []) as { id?: number; publicId?: string; projectName: string; projectCode: string }[]; // Selected project for category fetching const [selectedProjectId, setSelectedProjectId] = useState(undefined); diff --git a/frontend/components/transmittal/transmittal-form.tsx b/frontend/components/transmittal/transmittal-form.tsx index 2ba8d06..bd81b56 100644 --- a/frontend/components/transmittal/transmittal-form.tsx +++ b/frontend/components/transmittal/transmittal-form.tsx @@ -149,8 +149,8 @@ export function TransmittalForm() { {(Array.isArray(projectsList) ? projectsList : []).map( - (p: { uuid: string; projectName?: string; projectCode?: string }) => ( - + (p: { publicId: string; projectName?: string; projectCode?: string }) => ( + {p.projectName || p.projectCode} )