260316:1347 Refactor to NestJS 11 #2

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

@@ -214,10 +214,12 @@ export default function ContractsPage() {
 
   const handleEdit = (contract: Contract) => {
       setEditingUuid(contract.uuid);
+      // ADR-019: projectId might be a number or a UUID string from the entity response
+      const pId = String((contract as any).id || (contract as any).projectId || "");
       reset({
           contractCode: contract.contractCode,
           contractName: contract.contractName,
-          projectId: contract.projectId?.toString() || "",
+          projectId: pId,
           description: contract.description || "",
           startDate: contract.startDate ? new Date(contract.startDate).toISOString().split('T')[0] : "",
           endDate: contract.endDate ? new Date(contract.endDate).toISOString().split('T')[0] : "",
@@ -239,10 +241,11 @@ export default function ContractsPage() {
   };
 
   const onSubmit = (data: ContractFormData) => {
+      // ADR-019: Resolve projectId (ID or UUID)
       const submitData = {
           ...data,
-          projectId: parseInt(data.projectId),
-      };
+          projectId: isNaN(Number(data.projectId)) ? data.projectId : Number(data.projectId),
+      } as any;
 
       if (editingUuid) {
           updateContract.mutate({ uuid: editingUuid, data: submitData });
@@ -304,8 +307,8 @@ export default function ContractsPage() {
                         <SelectValue placeholder="Select Project" />
                     </SelectTrigger>
                     <SelectContent>
-                        {(projects as Project[])?.map((p) => (
-                            <SelectItem key={p.id} value={p.id.toString()}>
+                        {(projects as any[])?.map((p) => (
+                            <SelectItem key={p.uuid || p.id} value={String(p.id || p.uuid)}>
                                 {p.projectCode} - {p.projectName}
                             </SelectItem>
                         ))}

frontend/app/(admin)/admin/doc-control/drawings/contract/categories/page.tsx

@@ -70,8 +70,8 @@ export default function ContractCategoriesPage() {
           )}
         </SelectTrigger>
         <SelectContent>
-          {projects.map((project: { id: number; projectName: string; projectCode: string }) => (
-            <SelectItem key={project.id} value={String(project.id)}>
+          {(projects as any[]).map((project) => (
+            <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
               {project.projectCode} - {project.projectName}
             </SelectItem>
           ))}

frontend/app/(admin)/admin/doc-control/drawings/contract/sub-categories/page.tsx

@@ -62,8 +62,8 @@ export default function ContractSubCategoriesPage() {
           )}
         </SelectTrigger>
         <SelectContent>
-          {projects.map((project: { id: number; projectName: string; projectCode: string }) => (
-            <SelectItem key={project.id} value={String(project.id)}>
+          {(projects as any[]).map((project) => (
+            <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
               {project.projectCode} - {project.projectName}
             </SelectItem>
           ))}

frontend/app/(admin)/admin/doc-control/drawings/contract/volumes/page.tsx

@@ -74,8 +74,8 @@ export default function ContractVolumesPage() {
           )}
         </SelectTrigger>
         <SelectContent>
-          {projects.map((project: { id: number; projectName: string; projectCode: string }) => (
-            <SelectItem key={project.id} value={String(project.id)}>
+          {(projects as any[]).map((project) => (
+            <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
               {project.projectCode} - {project.projectName}
             </SelectItem>
           ))}

frontend/app/(admin)/admin/doc-control/drawings/shop/main-categories/page.tsx

@@ -73,8 +73,8 @@ export default function ShopMainCategoriesPage() {
           )}
         </SelectTrigger>
         <SelectContent>
-          {projects.map((project: { id: number; projectName: string; projectCode: string }) => (
-            <SelectItem key={project.id} value={String(project.id)}>
+          {(projects as any[]).map((project) => (
+            <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
               {project.projectCode} - {project.projectName}
             </SelectItem>
           ))}

frontend/app/(admin)/admin/doc-control/drawings/shop/sub-categories/page.tsx

@@ -75,8 +75,8 @@ export default function ShopSubCategoriesPage() {
           )}
         </SelectTrigger>
         <SelectContent>
-          {projects.map((project: { id: number; projectName: string; projectCode: string }) => (
-            <SelectItem key={project.id} value={String(project.id)}>
+          {(projects as any[]).map((project) => (
+            <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
               {project.projectCode} - {project.projectName}
             </SelectItem>
           ))}

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

@@ -24,29 +24,37 @@ import { BulkImportForm } from '@/components/numbering/bulk-import-form';
 
 export default function NumberingPage() {
   const { data: projects = [] } = useProjects();
-  const [selectedProjectId, setSelectedProjectId] = useState('1');
+  // Initialize with empty string or first project if available
+  const [selectedProjectId, setSelectedProjectId] = useState<string>('');
   const [activeTab, setActiveTab] = useState('templates');
 
+  useEffect(() => {
+    if (projects.length > 0 && !selectedProjectId) {
+      const first = projects[0] as any;
+      setSelectedProjectId(String(first.id || first.uuid));
+    }
+  }, [projects, selectedProjectId]);
+
   // View states
   const [isEditing, setIsEditing] = useState(false);
   const [activeTemplate, setActiveTemplate] = useState<NumberingTemplate | undefined>(undefined);
   const [isTesting, setIsTesting] = useState(false);
   const [testTemplate, setTestTemplate] = useState<NumberingTemplate | null>(null);
 
-  const selectedProjectName =
-    projects.find((p: { id: number; projectName: string }) => p.id.toString() === selectedProjectId)?.projectName ||
-    'Unknown Project';
+  const selectedProject = projects.find((p: any) => String(p.id || p.uuid) === selectedProjectId) as any;
+  const selectedProjectName = selectedProject?.projectName || 'Unknown Project';
 
   // Master Data
   const { data: correspondenceTypes = [] } = useCorrespondenceTypes();
-  const { data: contracts = [] } = useContracts(Number(selectedProjectId));
-  const contractId = contracts[0]?.id;
+  const { data: contracts = [] } = useContracts(selectedProjectId as any); // Passing UUID/ID string
+  const firstContract = contracts[0] as any;
+  const contractId = firstContract?.id || firstContract?.uuid;
   const { data: disciplines = [] } = useDisciplines(contractId);
 
   const { data: templateResponse, isLoading: isLoadingTemplates } = useTemplates();
   const saveTemplateMutation = useSaveTemplate();
 
-  // Extract templates array from response (handles both direct array and { data: array } formats)
+  // Extract templates array from response
   const templates: NumberingTemplate[] = Array.isArray(templateResponse)
     ? templateResponse
     : ((templateResponse as any)?.data ?? []);
@@ -76,7 +84,7 @@ export default function NumberingPage() {
       <div className="p-6 max-w-4xl mx-auto animate-in fade-in slide-in-from-bottom-4">
         <TemplateEditor
           template={activeTemplate}
-          projectId={Number(selectedProjectId)}
+          projectId={selectedProjectId as any}
           projectName={selectedProjectName}
           correspondenceTypes={correspondenceTypes}
           disciplines={disciplines}
@@ -100,8 +108,8 @@ export default function NumberingPage() {
               <SelectValue placeholder="Select Project" />
             </SelectTrigger>
             <SelectContent>
-              {projects.map((project: { id: number; projectCode: string; projectName: string }) => (
-                <SelectItem key={project.id} value={project.id.toString()}>
+              {(projects as any[]).map((project) => (
+                <SelectItem key={project.uuid || project.id} value={String(project.id || project.uuid)}>
                   {project.projectCode} - {project.projectName}
                 </SelectItem>
               ))}
@@ -129,7 +137,7 @@ export default function NumberingPage() {
             <div className="lg:col-span-2 space-y-4">
               <div className="grid gap-4">
                 {templates
-                  .filter((t) => !t.projectId || t.projectId === Number(selectedProjectId))
+                  .filter((t: any) => !t.projectId || String(t.projectId) === selectedProjectId || t.project?.uuid === selectedProjectId)
                   .map((template) => (
                     <Card key={template.id} className="p-6 hover:shadow-md transition-shadow">
                       <div className="flex justify-between items-start">
@@ -194,11 +202,11 @@ export default function NumberingPage() {
 
         <TabsContent value="tools" className="space-y-4">
           <div className="grid gap-4 md:grid-cols-2">
-            <ManualOverrideForm projectId={Number(selectedProjectId)} />
-            <VoidReplaceForm projectId={Number(selectedProjectId)} />
+            <ManualOverrideForm projectId={selectedProjectId as any} />
+            <VoidReplaceForm projectId={selectedProjectId as any} />
             <CancelNumberForm />
             <div className="md:col-span-2">
-              <BulkImportForm projectId={Number(selectedProjectId)} />
+              <BulkImportForm projectId={selectedProjectId as any} />
             </div>
           </div>
         </TabsContent>

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

@@ -43,9 +43,9 @@ export default function DisciplinesPage() {
     },
   ];
 
-  const contractOptions = contracts.map((c) => ({
+  const contractOptions = contracts.map((c: any) => ({
     label: `${c.contractName} (${c.contractCode})`,
-    value: c.id,
+    value: String(c.id || c.uuid),
   }));
 
   return (
@@ -55,8 +55,8 @@ export default function DisciplinesPage() {
         title="Disciplines Management"
         description="Manage system disciplines (e.g., ARCH, STR, MEC)"
         queryKey={['disciplines', selectedContractId ?? 'all']}
-        fetchFn={() => masterDataService.getDisciplines(selectedContractId ? parseInt(selectedContractId) : undefined)}
-        createFn={(data: Record<string, unknown>) => masterDataService.createDiscipline(data as unknown as Parameters<typeof masterDataService.createDiscipline>[0])}
+        fetchFn={() => masterDataService.getDisciplines(selectedContractId ? selectedContractId : undefined)}
+        createFn={(data: Record<string, unknown>) => masterDataService.createDiscipline(data as any)}
         updateFn={(id, data) => Promise.reject('Not implemented yet')} 
         deleteFn={(id) => masterDataService.deleteDiscipline(id)}
         columns={columns}
@@ -71,8 +71,8 @@ export default function DisciplinesPage() {
               </SelectTrigger>
               <SelectContent>
                 <SelectItem value="all">All Contracts</SelectItem>
-                {contracts.map((c) => (
-                  <SelectItem key={c.id} value={c.id.toString()}>
+                {contracts.map((c: any) => (
+                  <SelectItem key={c.uuid || c.id} value={String(c.id || c.uuid)}>
                     {c.contractName} ({c.contractCode})
                   </SelectItem>
                 ))}

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

@@ -47,9 +47,9 @@ export default function RfaTypesPage() {
     },
   ];
 
-  const contractOptions = contracts.map((c) => ({
+  const contractOptions = contracts.map((c: any) => ({
     label: `${c.contractName} (${c.contractCode})`,
-    value: c.id,
+    value: String(c.id || c.uuid),
   }));
 
   return (
@@ -58,8 +58,8 @@ export default function RfaTypesPage() {
         entityName="RFA Type"
         title="RFA Types Management"
         queryKey={['rfa-types', selectedContractId ?? 'all']}
-        fetchFn={() => masterDataService.getRfaTypes(selectedContractId ? parseInt(selectedContractId) : undefined)}
-        createFn={(data: Record<string, unknown>) => masterDataService.createRfaType(data as unknown as any)}
+        fetchFn={() => masterDataService.getRfaTypes(selectedContractId ? selectedContractId : undefined)}
+        createFn={(data: Record<string, unknown>) => masterDataService.createRfaType(data as any)}
         updateFn={(id, data) => masterDataService.updateRfaType(id, data)}
         deleteFn={(id) => masterDataService.deleteRfaType(id)}
         columns={columns}
@@ -74,8 +74,8 @@ export default function RfaTypesPage() {
               </SelectTrigger>
               <SelectContent>
                 <SelectItem value="all">All Contracts</SelectItem>
-                {contracts.map((c) => (
-                  <SelectItem key={c.id} value={c.id.toString()}>
+                {contracts.map((c: any) => (
+                  <SelectItem key={c.uuid || c.id} value={String(c.id || c.uuid)}>
                     {c.contractName} ({c.contractCode})
                   </SelectItem>
                 ))}