From 437758ba50b934916cd7cf894234b32d74555a61 Mon Sep 17 00:00:00 2001
From: admin <peancharoen.pslcp3@gmail.com>
Date: Fri, 27 Mar 2026 07:58:39 +0700
Subject: [PATCH] 690327:0758 Fixing Refactor ADR-019 Naming convention uuid
 #12

---
 frontend/components/rfas/form.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/components/rfas/form.tsx b/frontend/components/rfas/form.tsx
index eddd082..eb8ff7f 100644
--- a/frontend/components/rfas/form.tsx
+++ b/frontend/components/rfas/form.tsx
@@ -39,7 +39,8 @@ const rfaSchema = z.object({
 type RFAFormData = z.infer<typeof rfaSchema>;
 
 type ProjectOption = {
-  uuid?: string;
+  publicId?: string;
+  uuid?: string; // Legacy alias for publicId
   id?: number;
   projectName?: string;
   projectCode?: string;
@@ -142,7 +143,7 @@ export function RFAForm() {
   const createMutation = useCreateRFA();
 
   const { data: projectsData, isLoading: isLoadingProjects } = useProjects();
-  const projects = dedupeByKey(extractArrayData<ProjectOption>(projectsData), (project) => project.uuid ?? project.id);
+  const projects = dedupeByKey(extractArrayData<ProjectOption>(projectsData), (project) => project.publicId ?? project.uuid ?? project.id);
   const { data: organizationsData, isLoading: isLoadingOrganizations } = useOrganizations({ isActive: true });
   const organizations = dedupeByKey(
     extractArrayData<OrganizationOption>(organizationsData),
@@ -378,7 +379,7 @@ export function RFAForm() {
               </SelectTrigger>
               <SelectContent>
                 {projects.map((p) => {
-                  const projectValue = getOptionValue(p.uuid ?? p.id);
+                  const projectValue = getOptionValue(p.publicId ?? p.uuid ?? p.id);
 
                   if (!projectValue) {
                     return null;