From 47f12508f437811b1c10295c209e3dc448318eb6 Mon Sep 17 00:00:00 2001
From: admin <peancharoen.pslcp3@gmail.com>
Date: Fri, 27 Mar 2026 13:45:29 +0700
Subject: [PATCH] 690327:1345 Fixing Refactor ADR-019 Naming convention uuid
 #16

---
 frontend/components/correspondences/form.tsx         | 5 +++--
 frontend/components/drawings/upload-form.tsx         | 4 ++--
 frontend/components/transmittal/transmittal-form.tsx | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

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<typeof correspondenceSchema>;
 
 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<ProjectOption>(projectsData);
+  const projects = (projectsData as ProjectOption[]) ?? [];
   const organizationOptions = extractArrayData<Organization>(organizations);
   const correspondenceTypes = extractArrayData<CorrespondenceTypeOption>(correspondenceTypesData);
   const disciplines = extractArrayData<DisciplineOption>(disciplinesData);
@@ -316,7 +317,7 @@ export function CorrespondenceForm({ initialData, uuid }: { initialData?: Initia
             </SelectTrigger>
             <SelectContent>
               {projects.map((p) => (
-                <SelectItem key={p.uuid || String(p.id)} value={p.uuid || String(p.id)}>
+                <SelectItem key={p.publicId || String(p.id)} value={p.publicId || String(p.id)}>
                   {p.projectName} ({p.projectCode})
                 </SelectItem>
               ))}
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<typeof formSchema>;
 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<number | string | undefined>(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() {
                       </FormControl>
                       <SelectContent>
                         {(Array.isArray(projectsList) ? projectsList : []).map(
-                          (p: { uuid: string; projectName?: string; projectCode?: string }) => (
-                            <SelectItem key={p.uuid} value={p.uuid}>
+                          (p: { publicId: string; projectName?: string; projectCode?: string }) => (
+                            <SelectItem key={p.publicId} value={p.publicId}>
                               {p.projectName || p.projectCode}
                             </SelectItem>
                           )