251210:1709 Frontend: reeactor organization and run build

frontend/components/rfas/detail.tsx

@@ -30,7 +30,7 @@ export function RFADetail({ data }: RFADetailProps) {
 
     processMutation.mutate(
       {
-        id: data.rfa_id,
+        id: data.rfaId,
         data: {
           action: apiAction,
           comments: comments,
@@ -57,9 +57,9 @@ export function RFADetail({ data }: RFADetailProps) {
             </Button>
           </Link>
           <div>
-            <h1 className="text-2xl font-bold">{data.rfa_number}</h1>
+            <h1 className="text-2xl font-bold">{data.rfaNumber}</h1>
             <p className="text-muted-foreground">
-              Created on {format(new Date(data.created_at), "dd MMM yyyy HH:mm")}
+              Created on {format(new Date(data.createdAt), "dd MMM yyyy HH:mm")}
             </p>
           </div>
         </div>
@@ -154,7 +154,7 @@ export function RFADetail({ data }: RFADetailProps) {
                     <tbody className="divide-y">
                       {data.items.map((item) => (
                         <tr key={item.id}>
-                          <td className="px-4 py-3 font-medium">{item.item_no}</td>
+                          <td className="px-4 py-3 font-medium">{item.itemNo}</td>
                           <td className="px-4 py-3">{item.description}</td>
                           <td className="px-4 py-3 text-right">{item.quantity}</td>
                           <td className="px-4 py-3 text-muted-foreground">{item.unit}</td>
@@ -180,14 +180,14 @@ export function RFADetail({ data }: RFADetailProps) {
             <CardContent className="space-y-4">
               <div>
                 <p className="text-sm font-medium text-muted-foreground">Contract</p>
-                <p className="font-medium mt-1">{data.contract_name}</p>
+                <p className="font-medium mt-1">{data.contractName}</p>
               </div>
 
               <hr className="my-4 border-t" />
 
               <div>
                 <p className="text-sm font-medium text-muted-foreground">Discipline</p>
-                <p className="font-medium mt-1">{data.discipline_name}</p>
+                <p className="font-medium mt-1">{data.disciplineName}</p>
               </div>
             </CardContent>
           </Card>

frontend/components/rfas/form.tsx

@@ -21,17 +21,20 @@ import { useDisciplines, useContracts } from "@/hooks/use-master-data";
 import { CreateRFADto } from "@/types/rfa";
 
 const rfaItemSchema = z.object({
-  item_no: z.string().min(1, "Item No is required"),
+  itemNo: z.string().min(1, "Item No is required"),
   description: z.string().min(3, "Description is required"),
-  quantity: z.number({ invalid_type_error: "Quantity must be a number" }).min(0),
+  quantity: z.number().min(0, "Quantity must be positive"),
   unit: z.string().min(1, "Unit is required"),
 });
-
 const rfaSchema = z.object({
-  subject: z.string().min(5, "Subject must be at least 5 characters"),
+  contractId: z.number().min(1, "Contract is required"),
+  disciplineId: z.number().min(1, "Discipline is required"),
+  rfaTypeId: z.number().min(1, "Type is required"),
+  title: z.string().min(5, "Title must be at least 5 characters"),
   description: z.string().optional(),
-  contract_id: z.number({ required_error: "Contract is required" }),
-  discipline_id: z.number({ required_error: "Discipline is required" }),
+  toOrganizationId: z.number().min(1, "Please select To Organization"),
+  dueDate: z.string().optional(),
+  shopDrawingRevisionIds: z.array(z.number()).optional(),
   items: z.array(rfaItemSchema).min(1, "At least one item is required"),
 });
 
@@ -55,12 +58,19 @@ export function RFAForm() {
   } = useForm<RFAFormData>({
     resolver: zodResolver(rfaSchema),
     defaultValues: {
-      contract_id: undefined, // Force selection
-      items: [{ item_no: "1", description: "", quantity: 0, unit: "" }],
+      contractId: 0,
+      disciplineId: 0,
+      rfaTypeId: 0,
+      title: "",
+      description: "",
+      toOrganizationId: 0,
+      dueDate: "",
+      shopDrawingRevisionIds: [],
+      items: [{ itemNo: "1", description: "", quantity: 0, unit: "" }],
     },
   });
 
-  const selectedContractId = watch("contract_id");
+  const selectedContractId = watch("contractId");
   const { data: disciplines, isLoading: isLoadingDisciplines } = useDisciplines(selectedContractId);
 
   const { fields, append, remove } = useFieldArray({
@@ -69,8 +79,11 @@ export function RFAForm() {
   });
 
   const onSubmit = (data: RFAFormData) => {
-    // Map to DTO if needed, assuming generic structure matches
-    createMutation.mutate(data as unknown as CreateRFADto, {
+    const payload: CreateRFADto = {
+      ...data,
+      projectId: currentProjectId,
+    };
+    createMutation.mutate(payload as any, {
       onSuccess: () => {
         router.push("/rfas");
       },
@@ -85,11 +98,11 @@ export function RFAForm() {
 
         <div className="space-y-4">
           <div>
-            <Label htmlFor="subject">Subject *</Label>
-            <Input id="subject" {...register("subject")} placeholder="Enter subject" />
-            {errors.subject && (
+            <Label htmlFor="title">Title *</Label>
+            <Input id="title" {...register("title")} placeholder="Enter title" />
+            {errors.title && (
               <p className="text-sm text-destructive mt-1">
-                {errors.subject.message}
+                {errors.title.message}
               </p>
             )}
           </div>
@@ -103,7 +116,7 @@ export function RFAForm() {
             <div>
               <Label>Contract *</Label>
               <Select
-                onValueChange={(v) => setValue("contract_id", parseInt(v))}
+                onValueChange={(val) => setValue("contractId", Number(val))}
                 disabled={isLoadingContracts}
               >
                 <SelectTrigger>
@@ -117,15 +130,15 @@ export function RFAForm() {
                   ))}
                 </SelectContent>
               </Select>
-              {errors.contract_id && (
-                <p className="text-sm text-destructive mt-1">{errors.contract_id.message}</p>
+              {errors.contractId && (
+                <p className="text-sm text-destructive mt-1">{errors.contractId.message}</p>
               )}
             </div>
 
             <div>
               <Label>Discipline *</Label>
               <Select
-                onValueChange={(v) => setValue("discipline_id", parseInt(v))}
+                onValueChange={(val) => setValue("disciplineId", Number(val))}
                 disabled={!selectedContractId || isLoadingDisciplines}
               >
                 <SelectTrigger>
@@ -142,8 +155,8 @@ export function RFAForm() {
                   )}
                 </SelectContent>
               </Select>
-              {errors.discipline_id && (
-                <p className="text-sm text-destructive mt-1">{errors.discipline_id.message}</p>
+              {errors.disciplineId && (
+                <p className="text-sm text-destructive mt-1">{errors.disciplineId.message}</p>
               )}
             </div>
           </div>
@@ -160,7 +173,7 @@ export function RFAForm() {
             size="sm"
             onClick={() =>
               append({
-                item_no: (fields.length + 1).toString(),
+                itemNo: (fields.length + 1).toString(),
                 description: "",
                 quantity: 0,
                 unit: "",
@@ -193,9 +206,9 @@ export function RFAForm() {
               <div className="grid grid-cols-1 md:grid-cols-12 gap-3">
                 <div className="md:col-span-2">
                   <Label className="text-xs">Item No.</Label>
-                  <Input {...register(`items.${index}.item_no`)} placeholder="1.1" />
-                  {errors.items?.[index]?.item_no && (
-                    <p className="text-xs text-destructive mt-1">{errors.items[index]?.item_no?.message}</p>
+                  <Input {...register(`items.${index}.itemNo`)} placeholder="1.1" />
+                  {errors.items?.[index]?.itemNo && (
+                    <p className="text-xs text-destructive mt-1">{errors.items[index]?.itemNo?.message}</p>
                   )}
                 </div>
                 <div className="md:col-span-6">

frontend/components/rfas/list.tsx

@@ -47,9 +47,9 @@ export function RFAList({ data }: RFAListProps) {
       header: "Discipline",
     },
     {
-      accessorKey: "created_at",
-      header: "Date",
-      cell: ({ row }) => format(new Date(row.getValue("created_at")), "dd MMM yyyy"),
+      accessorKey: "createdAt",
+      header: "Created",
+      cell: ({ row }) => format(new Date(row.getValue("createdAt")), "dd MMM yyyy"),
     },
     {
       accessorKey: "status",
@@ -62,7 +62,7 @@ export function RFAList({ data }: RFAListProps) {
         const item = row.original;
         return (
           <div className="flex gap-2">
-            <Link href={`/rfas/${item.rfa_id}`}>
+            <Link href={`/rfas/${row.original.rfaId}`}>
               <Button variant="ghost" size="icon" title="View">
                 <Eye className="h-4 w-4" />
               </Button>