251210:1709 Frontend: reeactor organization and run build

frontend/components/drawings/card.tsx

@@ -21,34 +21,34 @@ export function DrawingCard({ drawing }: { drawing: Drawing }) {
         <div className="flex-1 min-w-0">
           <div className="flex items-start justify-between mb-2">
             <div>
-              <h3 className="text-lg font-semibold truncate" title={drawing.drawing_number}>
-                {drawing.drawing_number}
+              <h3 className="text-lg font-semibold truncate" title={drawing.drawingNumber}>
+                {drawing.drawingNumber}
               </h3>
               <p className="text-sm text-muted-foreground truncate" title={drawing.title}>
                 {drawing.title}
               </p>
             </div>
-            <Badge variant="outline">{drawing.discipline?.discipline_code}</Badge>
+            <Badge variant="outline">{typeof drawing.discipline === 'object' ? drawing.discipline?.disciplineCode : drawing.discipline}</Badge>
           </div>
 
           <div className="grid grid-cols-2 gap-x-4 gap-y-1 text-sm text-muted-foreground mb-3">
             <div>
-              <span className="font-medium text-foreground">Sheet:</span> {drawing.sheet_number}
+              <span className="font-medium text-foreground">Sheet:</span> {drawing.sheetNumber}
             </div>
             <div>
-              <span className="font-medium text-foreground">Rev:</span> {drawing.current_revision}
+              <span className="font-medium text-foreground">Rev:</span> {drawing.revision}
             </div>
             <div>
               <span className="font-medium text-foreground">Scale:</span> {drawing.scale || "N/A"}
             </div>
             <div>
               <span className="font-medium text-foreground">Date:</span>{" "}
-              {format(new Date(drawing.issue_date), "dd/MM/yyyy")}
+              {drawing.issueDate && format(new Date(drawing.issueDate), "dd/MM/yyyy")}
             </div>
           </div>
 
           <div className="flex gap-2 flex-wrap">
-            <Link href={`/drawings/${drawing.drawing_id}`}>
+            <Link href={`/drawings/${drawing.drawingId}`}>
               <Button variant="outline" size="sm">
                 <Eye className="mr-2 h-4 w-4" />
                 View
@@ -58,7 +58,7 @@ export function DrawingCard({ drawing }: { drawing: Drawing }) {
               <Download className="mr-2 h-4 w-4" />
               Download
             </Button>
-            {drawing.revision_count > 1 && (
+            {(drawing.revisionCount || 0) > 1 && (
               <Button variant="outline" size="sm">
                 <GitCompare className="mr-2 h-4 w-4" />
                 Compare

frontend/components/drawings/list.tsx

@@ -42,7 +42,7 @@ export function DrawingList({ type }: DrawingListProps) {
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3 gap-6">
       {drawings.data.map((drawing: Drawing) => (
-        <DrawingCard key={(drawing as any)[type === 'CONTRACT' ? 'contract_drawing_id' : 'shop_drawing_id'] || drawing.drawing_id || (drawing as any).id} drawing={drawing} />
+        <DrawingCard key={drawing.drawingId} drawing={drawing} />
       ))}
     </div>
   );

frontend/components/drawings/revision-history.tsx

@@ -15,15 +15,15 @@ export function RevisionHistory({ revisions }: { revisions: DrawingRevision[] })
       <div className="space-y-3">
         {revisions.map((rev) => (
           <div
-            key={rev.revision_id}
+            key={rev.revisionId}
             className="flex items-center justify-between p-3 bg-muted/30 rounded-lg border"
           >
             <div className="flex-1">
               <div className="flex items-center gap-3 mb-1">
-                <Badge variant={rev.is_current ? "default" : "outline"}>
-                  Rev. {rev.revision_number}
+                <Badge variant={rev.isCurrent ? "default" : "outline"}>
+                  Rev. {rev.revisionNumber}
                 </Badge>
-                {rev.is_current && (
+                {rev.isCurrent && (
                   <span className="text-xs text-green-600 font-medium flex items-center gap-1">
                     <div className="h-1.5 w-1.5 rounded-full bg-green-600" />
                     CURRENT
@@ -31,11 +31,11 @@ export function RevisionHistory({ revisions }: { revisions: DrawingRevision[] })
                 )}
               </div>
               <p className="text-sm text-foreground font-medium">
-                {rev.revision_description || "No description"}
+                {rev.revisionDescription || "No description"}
               </p>
               <p className="text-xs text-muted-foreground mt-1">
-                {format(new Date(rev.revision_date), "dd MMM yyyy")} by{" "}
-                {rev.revised_by_name}
+                {format(new Date(rev.revisionDate), "dd MMM yyyy")} by{" "}
+                {rev.revisedByName}
               </p>
             </div>
 

frontend/components/drawings/upload-form.tsx

@@ -21,11 +21,11 @@ import { useState } from "react";
 import { Loader2 } from "lucide-react";
 
 const drawingSchema = z.object({
-  drawing_type: z.enum(["CONTRACT", "SHOP"], { required_error: "Type is required" }),
-  drawing_number: z.string().min(1, "Drawing Number is required"),
+  drawingType: z.enum(["CONTRACT", "SHOP"]),
+  drawingNumber: z.string().min(1, "Drawing Number is required"),
   title: z.string().min(5, "Title must be at least 5 characters"),
-  discipline_id: z.number({ required_error: "Discipline is required" }),
-  sheet_number: z.string().min(1, "Sheet Number is required"),
+  disciplineId: z.number().min(1, "Discipline is required"),
+  sheetNumber: z.string().min(1, "Sheet Number is required"),
   scale: z.string().optional(),
   file: z.instanceof(File, { message: "File is required" }), // In real app, might validation creation before upload
 });
@@ -48,7 +48,7 @@ export function DrawingUploadForm() {
     resolver: zodResolver(drawingSchema),
   });
 
-  const drawingType = watch("drawing_type");
+  const drawingType = watch("drawingType");
   const createMutation = useCreateDrawing(drawingType); // Hook depends on type but defaults to undefined initially which is fine or handled
 
   const onSubmit = (data: DrawingFormData) => {
@@ -84,10 +84,10 @@ export function DrawingUploadForm() {
 
     // Actually better to handle FormData logic here since we have the File object
     const formData = new FormData();
-    formData.append('drawing_number', data.drawing_number);
+    formData.append('drawingNumber', data.drawingNumber);
     formData.append('title', data.title);
-    formData.append('discipline_id', String(data.discipline_id));
-    formData.append('sheet_number', data.sheet_number);
+    formData.append('disciplineId', String(data.disciplineId));
+    formData.append('sheetNumber', data.sheetNumber);
     if(data.scale) formData.append('scale', data.scale);
     formData.append('file', data.file);
     // Type specific fields if any? (Project ID?)
@@ -138,7 +138,7 @@ export function DrawingUploadForm() {
         <div className="space-y-4">
           <div>
             <Label>Drawing Type *</Label>
-            <Select onValueChange={(v) => setValue("drawing_type", v as any)}>
+            <Select onValueChange={(v) => setValue("drawingType", v as any)}>
               <SelectTrigger>
                 <SelectValue placeholder="Select type" />
               </SelectTrigger>
@@ -147,24 +147,24 @@ export function DrawingUploadForm() {
                 <SelectItem value="SHOP">Shop Drawing</SelectItem>
               </SelectContent>
             </Select>
-            {errors.drawing_type && (
-              <p className="text-sm text-destructive mt-1">{errors.drawing_type.message}</p>
+            {errors.drawingType && (
+              <p className="text-sm text-destructive mt-1">{errors.drawingType.message}</p>
             )}
           </div>
 
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <Label htmlFor="drawing_number">Drawing Number *</Label>
-              <Input id="drawing_number" {...register("drawing_number")} placeholder="e.g. A-101" />
-              {errors.drawing_number && (
-                <p className="text-sm text-destructive mt-1">{errors.drawing_number.message}</p>
+              <Label htmlFor="drawingNumber">Drawing Number *</Label>
+              <Input id="drawingNumber" {...register("drawingNumber")} placeholder="e.g. A-101" />
+              {errors.drawingNumber && (
+                <p className="text-sm text-destructive mt-1">{errors.drawingNumber.message}</p>
               )}
             </div>
             <div>
-              <Label htmlFor="sheet_number">Sheet Number *</Label>
-              <Input id="sheet_number" {...register("sheet_number")} placeholder="e.g. 01" />
-              {errors.sheet_number && (
-                <p className="text-sm text-destructive mt-1">{errors.sheet_number.message}</p>
+              <Label htmlFor="sheetNumber">Sheet Number *</Label>
+              <Input id="sheetNumber" {...register("sheetNumber")} placeholder="e.g. 01" />
+              {errors.sheetNumber && (
+                <p className="text-sm text-destructive mt-1">{errors.sheetNumber.message}</p>
               )}
             </div>
           </div>
@@ -181,7 +181,7 @@ export function DrawingUploadForm() {
             <div>
               <Label>Discipline *</Label>
               <Select
-                onValueChange={(v) => setValue("discipline_id", parseInt(v))}
+                onValueChange={(v) => setValue("disciplineId", parseInt(v))}
                 disabled={isLoadingDisciplines}
               >
                 <SelectTrigger>
@@ -195,8 +195,8 @@ export function DrawingUploadForm() {
                   ))}
                 </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>