260318:1135 Fix UUID #3

frontend/app/(admin)/admin/doc-control/reference/disciplines/page.tsx

@@ -45,7 +45,7 @@ export default function DisciplinesPage() {
 
   const contractOptions = contracts.map((c: any) => ({
     label: `${c.contractName} (${c.contractCode})`,
-    value: String(c.id || c.uuid),
+    value: String(c.id),
   }));
 
   return (
@@ -55,9 +55,16 @@ export default function DisciplinesPage() {
         title="Disciplines Management"
         description="Manage system disciplines (e.g., ARCH, STR, MEC)"
         queryKey={['disciplines', selectedContractId ?? 'all']}
-        fetchFn={() => masterDataService.getDisciplines(selectedContractId ? selectedContractId : undefined)}
+        fetchFn={async () => {
+          const items = await masterDataService.getDisciplines(selectedContractId ? selectedContractId : undefined);
+          // ADR-019: Map contractId INT → contract UUID for edit mode select matching
+          return (items as any[]).map((item: any) => ({
+            ...item,
+            contractId: item.contract?.id || item.contract?.uuid || String(item.contractId),
+          }));
+        }}
         createFn={(data: Record<string, unknown>) => masterDataService.createDiscipline(data as any)}
-        updateFn={(id, data) => Promise.reject('Not implemented yet')} 
+        updateFn={(id, data) => Promise.reject('Not implemented yet')}
         deleteFn={(id) => masterDataService.deleteDiscipline(id)}
         columns={columns}
         filters={
@@ -72,7 +79,7 @@ export default function DisciplinesPage() {
               <SelectContent>
                 <SelectItem value="all">All Contracts</SelectItem>
                 {contracts.map((c: any) => (
-                  <SelectItem key={c.uuid || c.id} value={String(c.id || c.uuid)}>
+                  <SelectItem key={c.id} value={String(c.id)}>
                     {c.contractName} ({c.contractCode})
                   </SelectItem>
                 ))}

frontend/app/(admin)/admin/doc-control/reference/rfa-types/page.tsx

@@ -49,7 +49,7 @@ export default function RfaTypesPage() {
 
   const contractOptions = contracts.map((c: any) => ({
     label: `${c.contractName} (${c.contractCode})`,
-    value: String(c.id || c.uuid),
+    value: String(c.id),
   }));
 
   return (
@@ -58,7 +58,14 @@ export default function RfaTypesPage() {
         entityName="RFA Type"
         title="RFA Types Management"
         queryKey={['rfa-types', selectedContractId ?? 'all']}
-        fetchFn={() => masterDataService.getRfaTypes(selectedContractId ? selectedContractId : undefined)}
+        fetchFn={async () => {
+          const items = await masterDataService.getRfaTypes(selectedContractId ? selectedContractId : undefined);
+          // ADR-019: Map contractId INT → contract UUID for edit mode select matching
+          return (items as any[]).map((item: any) => ({
+            ...item,
+            contractId: item.contract?.id || item.contract?.uuid || String(item.contractId),
+          }));
+        }}
         createFn={(data: Record<string, unknown>) => masterDataService.createRfaType(data as any)}
         updateFn={(id, data) => masterDataService.updateRfaType(id, data)}
         deleteFn={(id) => masterDataService.deleteRfaType(id)}
@@ -75,7 +82,7 @@ export default function RfaTypesPage() {
               <SelectContent>
                 <SelectItem value="all">All Contracts</SelectItem>
                 {contracts.map((c: any) => (
-                  <SelectItem key={c.uuid || c.id} value={String(c.id || c.uuid)}>
+                  <SelectItem key={c.id} value={String(c.id)}>
                     {c.contractName} ({c.contractCode})
                   </SelectItem>
                 ))}

frontend/app/(admin)/admin/doc-control/reference/tags/page.tsx

@@ -16,8 +16,8 @@ export default function TagsPage() {
   const projectOptions = [
     { label: "Global (All Projects)", value: "__none__" },
     ...(projectsData || []).map((p: Record<string, unknown>) => ({
-      label: p.projectName || p.projectCode || p.project_name || p.project_code || `Project ${p.id}`,
-      value: String(p.id),
+      label: (p.projectName || p.projectCode || p.project_name || p.project_code || `Project ${p.id}`) as string,
+      value: String(p.id), // p.id = UUID string via serialization
     })),
   ];
 
@@ -26,10 +26,10 @@ export default function TagsPage() {
       accessorKey: "project_id",
       header: "Project",
       cell: ({ row }) => {
-        const pId = row.original.project_id;
-        if (!pId) return <span className="text-muted-foreground italic">Global</span>;
-        const p = (projectsData || []).find((proj: Record<string, unknown>) => proj.id === pId);
-        return p ? (p.projectName || p.projectCode || p.project_name || p.project_code || `Project ${pId}`) as React.ReactNode : pId as React.ReactNode;
+        const item = row.original as Record<string, unknown>;
+        const project = item.project as Record<string, unknown> | null;
+        if (!project) return <span className="text-muted-foreground italic">Global</span>;
+        return (project.projectName || project.projectCode || `Project ${project.id}`) as React.ReactNode;
       },
     },
     {
@@ -70,7 +70,14 @@ export default function TagsPage() {
       description="Manage system tags, multi-tenant capable."
       entityName="Tag"
       queryKey={["tags"]}
-      fetchFn={() => masterDataService.getTags()}
+      fetchFn={async () => {
+        const items = await masterDataService.getTags();
+        // ADR-019: Map project_id INT → project UUID for edit mode select matching
+        return (items as any[]).map((item: any) => ({
+          ...item,
+          project_id: item.project?.id || item.project?.uuid || (item.project_id ? String(item.project_id) : null),
+        }));
+      }}
       createFn={(data: Record<string, unknown>) => masterDataService.createTag(formatPayload(data) as unknown as CreateTagDto)}
       updateFn={(id, data) => masterDataService.updateTag(id, formatPayload(data))}
       deleteFn={(id) => masterDataService.deleteTag(id)}