working leantime widget 9

app/api/leantime/status-labels/route.ts

@@ -107,38 +107,31 @@ export async function GET() {
     
     if (!data.result) {
       console.log('No result in Leantime response');
-      return NextResponse.json({ statusLabels: [] });
+      return NextResponse.json({ projects: [] });
     }
 
-    // Create a map to store unique status labels
-    const uniqueLabels = new Map();
+    // Transform the response into a more structured format while maintaining project grouping
+    const transformedProjects = Object.entries(data.result as Record<string, Record<string, any>>).map(([projectId, labels]) => {
+      // Convert the labels object to an array and sort by sortKey
+      const sortedLabels = Object.entries(labels).map(([id, label]) => ({
+        id,
+        name: label.name,
+        statusType: label.statusType,
+        class: label.class,
+        sortKey: Number(label.sortKey) || 0,
+        kanbanCol: label.kanbanCol
+      })).sort((a, b) => a.sortKey - b.sortKey);
 
-    // Transform and deduplicate status labels
-    Object.entries(data.result as Record<string, Record<string, any>>).forEach(([projectId, labels]) => {
-      Object.entries(labels).forEach(([id, label]) => {
-        const key = label.name;
-        if (!uniqueLabels.has(key)) {
-          uniqueLabels.set(key, {
-            id,
-            name: label.name,
-            statusType: label.statusType,
-            class: label.class,
-            sortKey: Number(label.sortKey) || 0, // Convert to number, default to 0 if invalid
-            projects: []
-          });
-        }
-        uniqueLabels.get(key).projects.push({
-          id: projectId,
-          name: projectId // You might want to fetch project names separately
-        });
-      });
+      return {
+        projectId,
+        labels: sortedLabels
+      };
     });
 
-    // Convert the map to an array and sort by sortKey numerically
-    const transformedLabels = Array.from(uniqueLabels.values())
-      .sort((a, b) => a.sortKey - b.sortKey);
+    // Sort projects by ID for consistency
+    transformedProjects.sort((a, b) => a.projectId.localeCompare(b.projectId));
 
-    return NextResponse.json({ statusLabels: transformedLabels });
+    return NextResponse.json({ projects: transformedProjects });
   } catch (error) {
     console.error('Detailed error in status labels fetch:', error);
     return NextResponse.json(

components/flow.tsx

@@ -7,22 +7,22 @@ import { RefreshCw } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useSession } from "next-auth/react";
 
-interface Project {
-  id: string;
-  name: string;
-}
-
 interface StatusLabel {
   id: string;
   name: string;
   statusType: string;
   class: string;
-  sortKey: string;
-  projects: Project[];
+  sortKey: number;
+  kanbanCol: boolean;
+}
+
+interface Project {
+  projectId: string;
+  labels: StatusLabel[];
 }
 
 export function Flow() {
-  const [statusLabels, setStatusLabels] = useState<StatusLabel[]>([]);
+  const [projects, setProjects] = useState<Project[]>([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [refreshing, setRefreshing] = useState(false);
@@ -50,7 +50,7 @@ export function Flow() {
       }
 
       const data = await response.json();
-      setStatusLabels(data.statusLabels);
+      setProjects(data.projects);
       setError(null);
     } catch (err) {
       console.error('Error fetching status labels:', err);
@@ -110,38 +110,31 @@ export function Flow() {
         )}
         {!loading && !error && (
           <div className="space-y-4 max-h-[300px] overflow-y-auto">
-            {statusLabels.length === 0 ? (
+            {projects.length === 0 ? (
               <p className="text-center text-muted-foreground">No status labels found</p>
             ) : (
-              <div className="space-y-2">
-                {statusLabels.map((label) => (
-                  <div 
-                    key={label.id}
-                    className="flex items-start space-x-2 hover:bg-gray-50 p-2 rounded-lg transition-colors"
-                  >
-                    <div className="flex-1 min-w-0">
-                      <div className="flex items-baseline justify-between">
-                        <p className="text-sm font-medium truncate">{label.name}</p>
-                        <span className={`text-xs px-2 py-1 rounded ${label.class}`}>
-                          {label.statusType}
-                        </span>
-                      </div>
-                      {label.projects.length > 0 && (
-                        <div className="mt-1 flex flex-wrap gap-1">
-                          {label.projects.map((project) => (
-                            <span 
-                              key={project.id}
-                              className="text-xs bg-gray-100 text-gray-600 px-1.5 py-0.5 rounded"
-                            >
-                              {project.name}
+              projects.map((project) => (
+                <div key={project.projectId} className="space-y-2">
+                  <h3 className="text-sm font-medium text-gray-500">Project {project.projectId}</h3>
+                  <div className="space-y-1">
+                    {project.labels.map((label) => (
+                      <div 
+                        key={`${project.projectId}-${label.id}`}
+                        className="flex items-start space-x-2 hover:bg-gray-50 p-2 rounded-lg transition-colors"
+                      >
+                        <div className="flex-1 min-w-0">
+                          <div className="flex items-baseline justify-between">
+                            <p className="text-sm font-medium truncate">{label.name}</p>
+                            <span className={`text-xs px-2 py-1 rounded ${label.class}`}>
+                              {label.statusType}
                             </span>
-                          ))}
+                          </div>
                         </div>
-                      )}
-                    </div>
+                      </div>
+                    ))}
                   </div>
-                ))}
-              </div>
+                </div>
+              ))
             )}
           </div>
         )}