From 762503cedf15a8611958106cd156cb37a80d751b Mon Sep 17 00:00:00 2001
From: "santasri.pachhal" <santasri.pachhal@sentientgeeks.com>
Date: Thu, 19 Mar 2026 09:26:19 +0530
Subject: [PATCH] chore: add culvert type in model method and fix dashboard
 skeleton issue

---
 src/app/(modules)/upload/page.tsx             | 201 +++++++-----------
 .../dashboard/dashboard-skeleton.tsx          |  81 ++++---
 src/components/ui/sidebar.tsx                 |   4 +-
 3 files changed, 136 insertions(+), 150 deletions(-)

diff --git a/src/app/(modules)/upload/page.tsx b/src/app/(modules)/upload/page.tsx
index fd25c58..550bb77 100644
--- a/src/app/(modules)/upload/page.tsx
+++ b/src/app/(modules)/upload/page.tsx
@@ -24,22 +24,15 @@ import { cn } from '@/lib/utils';
 
 const API_URL = process.env.NEXT_PUBLIC_API_URL;
 
-const DETECTION_TYPES = [
-  { value: 'pothole-detection', label: 'Pothole Detection' },
-  { value: 'sign-board-detection', label: 'Signboard Detection' },
-  { value: 'pot-sign-detection', label: 'Pothole & Signboard Detection' },
-] as const;
-
 const DETECTION_METHODS = [
   { value: 'yolo', label: 'YOLO Detection Model' },
   { value: 'yolo_vl', label: 'YOLO with Vision-Language Model' },
   { value: 'sam3', label: 'OpenAI SAM 3 Segmentation Model' },
   { value: 'yoloe', label: 'YOLOE Open-Vocabulary Detection' },
   { value: 'yoloe_trained_vl', label: 'YOLOE With Vision Language Model' },
+  { value: 'culvert_detection', label: 'Culvert Detection' },
 ] as const;
 
-type DetectionType = 'pothole-detection' | 'sign-board-detection' | 'pot-sign-detection';
-
 export default function UploadPage() {
   const router = useRouter();
   const [session, setSession] = useState<SessionContext | null>(null);
@@ -48,8 +41,6 @@ export default function UploadPage() {
   // Form states
   const [file, setFile] = useState<File | null>(null);
   const [jsonFile, setJsonFile] = useState<File | null>(null);
-  const [speed, setSpeed] = useState(30);
-  const [detectionType, setDetectionType] = useState<DetectionType>('pothole-detection');
   const [selectMethod, setSelectMethod] = useState('yolo_vl');
 
   // Upload states
@@ -77,9 +68,12 @@ export default function UploadPage() {
 
     const formData = new FormData();
     formData.append('file', file);
-    formData.append('detection_type', detectionType);
-    formData.append('speed_kmh', speed.toString());
     formData.append('detection_mode', selectMethod);
+
+    if (session?.chainageId) {
+      formData.append('chainage_id', session.chainageId);
+    }
+
     if (jsonFile) {
       formData.append('json_file', jsonFile);
     }
@@ -101,7 +95,7 @@ export default function UploadPage() {
         }
       }
 
-      sessionService.saveVideoData({ videoId: result.video_id, detectionType });
+      sessionService.saveVideoData({ videoId: result.video_id });
 
       // Redirect to the dynamic processing page
       router.push(`/upload/${result.video_id}`);
@@ -124,11 +118,7 @@ export default function UploadPage() {
     router.push(ROUTES.NEW_ANALYSIS);
   };
 
-  const getTitle = () => {
-    if (detectionType === 'pothole-detection') return 'Pothole Detection';
-    if (detectionType === 'sign-board-detection') return 'Signboard Detection';
-    return 'Pothole & Signboard Detection';
-  };
+  const getTitle = () => 'Road Analysis';
 
   if (isLoading) {
     return (
@@ -160,30 +150,33 @@ export default function UploadPage() {
               <Card className="p-0 border shadow-sm overflow-hidden">
                 <div className="flex flex-col md:flex-row md:items-center justify-between py-4 px-6 gap-6 bg-card">
                   <div className="flex flex-wrap items-center gap-x-12 gap-y-4">
-                    <div className="flex flex-col">
-                      <span className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground mb-1.5">
-                        Project
-                      </span>
-                      <span className="text-base font-bold leading-tight">
-                        {session.projectName}
-                      </span>
-                    </div>
-                    <div className="flex flex-col border-l pl-12 border-border/60">
-                      <span className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground mb-1.5">
-                        Package
-                      </span>
-                      <span className="text-sm font-semibold text-muted-foreground leading-tight">
-                        {session.packageName}
-                      </span>
-                    </div>
-                    <div className="flex flex-col border-l pl-12 border-border/60">
-                      <span className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground mb-1.5">
-                        Chainage
-                      </span>
-                      <span className="text-sm font-semibold text-muted-foreground leading-tight">
-                        {session.chainageName}
-                      </span>
-                    </div>
+                    {[
+                      { label: 'Project', value: session.projectName, primary: true },
+                      { label: 'Package', value: session.packageName },
+                      { label: 'Chainage', value: session.chainageName },
+                    ].map((item, idx) => (
+                      <div
+                        key={item.label}
+                        className={cn(
+                          'flex flex-col',
+                          idx !== 0 && 'border-l pl-12 border-border/60',
+                        )}
+                      >
+                        <span className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground mb-1.5">
+                          {item.label}
+                        </span>
+                        <span
+                          className={cn(
+                            'leading-tight',
+                            item.primary
+                              ? 'text-base font-bold'
+                              : 'text-sm font-semibold text-muted-foreground',
+                          )}
+                        >
+                          {item.value}
+                        </span>
+                      </div>
+                    ))}
                   </div>
                   <Button
                     variant="outline"
@@ -203,12 +196,12 @@ export default function UploadPage() {
             <CardHeader className="pb-4">
               <CardTitle className="text-xl font-bold">Upload Video</CardTitle>
               <CardDescription className="text-sm">
-                Select video file, detection type, vehicle speed, and method for analysis
+                Select video file, GPS JSON file, and method for analysis
               </CardDescription>
             </CardHeader>
             <CardContent className="pt-4 space-y-6">
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-6 mb-4">
-                {/* Video File Input */}
+              <div className="space-y-6">
+                {/* Video File Input - Full Width */}
                 <div className="space-y-2">
                   <Label htmlFor="video-file" className="text-sm font-semibold">
                     Video File
@@ -226,84 +219,48 @@ export default function UploadPage() {
                   />
                 </div>
 
-                {/* JSON File Input */}
-                <div className="space-y-2">
-                  <Label htmlFor="json-file" className="text-sm font-semibold">
-                    GPS JSON File
-                  </Label>
-                  <Input
-                    id="json-file"
-                    type="file"
-                    accept=".json,application/json"
-                    onChange={(e) => {
-                      setJsonFile(e.target.files?.[0] || null);
-                      setError(null);
-                    }}
-                    disabled={uploading}
-                    className="h-11 bg-muted/20 file:mr-3 file:py-1.5 file:px-3 file:rounded-md file:border-0 file:bg-primary/10 file:text-primary file:font-medium file:text-xs hover:file:bg-primary/20"
-                  />
-                </div>
-              </div>
+                {/* JSON File and Method - Both in one line */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                  {/* JSON File Input */}
+                  <div className="space-y-2">
+                    <Label htmlFor="json-file" className="text-sm font-semibold">
+                      GPS JSON File
+                    </Label>
+                    <Input
+                      id="json-file"
+                      type="file"
+                      accept=".json,application/json"
+                      onChange={(e) => {
+                        setJsonFile(e.target.files?.[0] || null);
+                        setError(null);
+                      }}
+                      disabled={uploading}
+                      className="h-11 bg-muted/20 file:mr-3 file:py-1.5 file:px-3 file:rounded-md file:border-0 file:bg-primary/10 file:text-primary file:font-medium file:text-xs hover:file:bg-primary/20"
+                    />
+                  </div>
 
-              {/* Detection, Speed, and Method Row */}
-              <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-                {/* Detection Type */}
-                <div className="space-y-2">
-                  <Label htmlFor="detection-type" className="text-sm font-semibold">
-                    Detection Type
-                  </Label>
-                  <Select
-                    value={detectionType}
-                    onValueChange={(v) => setDetectionType(v as DetectionType)}
-                    disabled={uploading}
-                  >
-                    <SelectTrigger id="detection-type" className="h-11">
-                      <SelectValue placeholder="Select detection type" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {DETECTION_TYPES.map((type) => (
-                        <SelectItem key={type.value} value={type.value}>
-                          {type.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-
-                {/* Speed Input */}
-                <div className="space-y-2">
-                  <Label htmlFor="speed" className="text-sm font-semibold">
-                    Vehicle Speed (km/h)
-                  </Label>
-                  <Input
-                    id="speed"
-                    type="number"
-                    min={1}
-                    max={200}
-                    value={speed}
-                    onChange={(e) => setSpeed(Number(e.target.value))}
-                    disabled={uploading}
-                    className="h-11"
-                  />
-                </div>
-
-                {/* Select Method */}
-                <div className="space-y-2">
-                  <Label htmlFor="select-method" className="text-sm font-semibold">
-                    Select Method
-                  </Label>
-                  <Select value={selectMethod} onValueChange={setSelectMethod} disabled={uploading}>
-                    <SelectTrigger id="select-method" className="h-11">
-                      <SelectValue placeholder="Select method" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {DETECTION_METHODS.map((method) => (
-                        <SelectItem key={method.value} value={method.value}>
-                          {method.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
+                  {/* Select Method */}
+                  <div className="space-y-2">
+                    <Label htmlFor="select-method" className="text-sm font-semibold">
+                      Select Method
+                    </Label>
+                    <Select
+                      value={selectMethod}
+                      onValueChange={setSelectMethod}
+                      disabled={uploading}
+                    >
+                      <SelectTrigger id="select-method" className="h-11">
+                        <SelectValue placeholder="Select method" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {DETECTION_METHODS.map((method) => (
+                          <SelectItem key={method.value} value={method.value}>
+                            {method.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </div>
                 </div>
               </div>
 
diff --git a/src/components/dashboard/dashboard-skeleton.tsx b/src/components/dashboard/dashboard-skeleton.tsx
index c0bad69..1e86000 100644
--- a/src/components/dashboard/dashboard-skeleton.tsx
+++ b/src/components/dashboard/dashboard-skeleton.tsx
@@ -7,16 +7,18 @@ export function DashboardSkeleton() {
   return (
     <div className="space-y-6">
       {/* Stats Cards Skeleton */}
-      <div className="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mb-6">
         {[...Array(6)].map((_, i) => (
-          <Card key={i} className="py-8 px-6">
+          <Card key={i} className="py-6 px-4">
             <CardContent className="p-0 flex items-center justify-between gap-6">
-              <div className="flex flex-col gap-2 flex-1">
-                <Skeleton className="h-4 w-32" />
-                <Skeleton className="h-10 w-20" />
-                <Skeleton className="h-3 w-40" />
+              <div className="flex flex-col gap-1 min-w-0 flex-1">
+                <Skeleton className="h-4 w-24 mb-1" />
+                <div className="flex flex-col gap-1">
+                  <Skeleton className="h-9 w-20" />
+                  <Skeleton className="h-3 w-32" />
+                </div>
               </div>
-              <Skeleton className="w-16 h-16 rounded-lg shrink-0" />
+              <Skeleton className="w-12 h-12 rounded-xl shrink-0" />
             </CardContent>
           </Card>
         ))}
@@ -24,30 +26,59 @@ export function DashboardSkeleton() {
 
       {/* Charts Row Skeleton */}
       <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-4">
-        {[...Array(2)].map((_, i) => (
-          <Card key={i}>
-            <CardHeader className="pb-2">
-              <div className="flex items-center gap-2">
-                <Skeleton className="w-10 h-10 rounded-md" />
-                <Skeleton className="h-6 w-48" />
-              </div>
-            </CardHeader>
-            <CardContent className="pt-4 h-[350px] flex items-center justify-center">
-              <Skeleton className="h-[300px] w-full max-w-[300px] rounded-full" />
-            </CardContent>
-          </Card>
-        ))}
+        {/* Donut Chart Skeleton */}
+        <Card className="h-full">
+          <CardHeader className="items-center pb-2">
+            <Skeleton className="h-6 w-48 mb-2" />
+            <Skeleton className="h-4 w-64" />
+          </CardHeader>
+          <CardContent className="h-[300px] flex items-center justify-center">
+            <Skeleton className="h-56 w-56 rounded-full border-20 border-muted" />
+          </CardContent>
+        </Card>
+
+        {/* Bar Chart Skeleton */}
+        <Card className="h-full">
+          <CardHeader className="items-center pb-2">
+            <Skeleton className="h-6 w-40 mb-2" />
+            <Skeleton className="h-4 w-52" />
+          </CardHeader>
+          <CardContent className="h-[300px] flex items-end justify-between gap-2 px-6 pb-8 pt-4">
+            {[...Array(8)].map((_, i) => {
+              const heights = ['60%', '40%', '75%', '50%', '65%', '35%', '80%', '45%'];
+              return (
+                <div key={i} className="flex flex-col gap-1 items-center flex-1">
+                  <Skeleton
+                    className="w-full rounded-t-sm"
+                    style={{ height: heights[i % heights.length] }}
+                  />
+                  <Skeleton className="h-2 w-full mt-2" />
+                </div>
+              );
+            })}
+          </CardContent>
+        </Card>
       </div>
 
       {/* Map Skeleton */}
-      <Card>
+      <Card className="overflow-hidden">
         <CardHeader className="pb-2">
           <div className="flex items-center justify-between">
-            <div className="flex items-center gap-2">
-              <Skeleton className="w-10 h-10 rounded-md" />
-              <Skeleton className="h-6 w-48" />
+            <div className="flex items-center gap-3">
+              <Skeleton className="w-9 h-9 rounded-md" />
+              <div className="flex flex-col gap-1">
+                <Skeleton className="h-5 w-32" />
+                <Skeleton className="h-3 w-48" />
+              </div>
+            </div>
+            <div className="flex gap-2">
+              {[...Array(3)].map((_, i) => (
+                <div key={i} className="flex items-center gap-1">
+                  <Skeleton className="w-2.5 h-2.5 rounded-full" />
+                  <Skeleton className="h-3 w-16" />
+                </div>
+              ))}
             </div>
-            <Skeleton className="h-8 w-32 rounded-full" />
           </div>
         </CardHeader>
         <CardContent className="p-2">
diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx
index ce930c1..9523d5e 100644
--- a/src/components/ui/sidebar.tsx
+++ b/src/components/ui/sidebar.tsx
@@ -583,9 +583,7 @@ function SidebarMenuSkeleton({
   showIcon?: boolean;
 }) {
   // Random width between 50 to 90%.
-  const width = React.useMemo(() => {
-    return `${Math.floor(Math.random() * 40) + 50}%`;
-  }, []);
+  const width = '70%';
 
   return (
     <div