chore: merge main into release for new releases

Author: Marfuen

apps/app/src/app/(app)/[orgId]/tasks/components/TaskCard.tsx

@@ -14,7 +14,7 @@ export const ItemTypes = {
 };
 
 // Type representing valid task status IDs.
-export type StatusId = 'todo' | 'in_progress' | 'done';
+export type StatusId = 'todo' | 'in_progress' | 'done' | 'failed' | 'not_relevant';
 
 // Interface for the data transferred during drag operations.
 export interface DragItem {

apps/app/src/app/(app)/[orgId]/tasks/components/TaskFilterHeader.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { Button } from '@comp/ui/button';
-import { Check, Circle, List, Loader2, Plus } from 'lucide-react';
+import { Check, Circle, List, Loader2, Plus, X, XCircle } from 'lucide-react';
 import { useQueryState } from 'nuqs';
 import React from 'react';
 
@@ -10,6 +10,8 @@ const statuses = [
   { id: 'in_progress', title: 'In Progress' },
   { id: 'todo', title: 'Todo' },
   { id: 'done', title: 'Done' },
+  { id: 'failed', title: 'Failed' },
+  { id: 'not_relevant', title: 'Not Relevant' },
 ] as const;
 type StatusId = (typeof statuses)[number]['id'];
 
@@ -32,6 +34,8 @@ export function TaskFilterHeader() {
     in_progress: Loader2,
     todo: Circle,
     done: Check,
+    failed: XCircle,
+    not_relevant: X,
   };
 
   // Helper function to determine button styling based on active state.

apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx

@@ -20,10 +20,12 @@ const statuses = [
   { id: 'in_progress', title: 'In Progress' },
   { id: 'todo', title: 'Todo' },
   { id: 'done', title: 'Done' },
+  { id: 'failed', title: 'Failed' },
+  { id: 'not_relevant', title: 'Not Relevant' },
 ] as const;
 
 // Parser for validating StatusId from URL query parameters.
-const statusIdParser = parseAsStringLiteral<StatusId>(['in_progress', 'todo', 'done']);
+const statusIdParser = parseAsStringLiteral<StatusId>(['in_progress', 'todo', 'done', 'failed', 'not_relevant']);
 
 /**
  * Renders the main task list view, including filtering and drag-and-drop capabilities.
@@ -54,15 +56,21 @@ export function TaskList({
       in_progress: [],
       todo: [],
       done: [],
+      failed: [],
+      not_relevant: [],
     };
-    // Sort tasks by the server-provided order before grouping.
-    const sortedTasks = [...initialTasks].sort((a, b) => a.order - b.order);
-    for (const task of sortedTasks) {
-      // Group tasks into the appropriate status array.
+    // Group tasks by status first
+    for (const task of initialTasks) {
       if (grouped[task.status as StatusId]) {
         grouped[task.status as StatusId].push(task);
       }
     }
+    // Sort each group alphabetically by title (A-Z)
+    for (const status in grouped) {
+      grouped[status as StatusId].sort((a, b) => 
+        a.title.localeCompare(b.title, undefined, { sensitivity: 'base' })
+      );
+    }
     return grouped;
   }, [initialTasks]);
 
@@ -75,32 +83,11 @@ export function TaskList({
         hoverIndex,
       });
       if (item.status !== targetStatus && updateTaskStatus !== 'executing') {
-        // Find the target group tasks and calculate new order
-        const targetGroup = tasksByStatus[targetStatus] || [];
-        // Find the order of the task we are hovering over (if any)
-        // Note: This assumes tasks are already sorted by order in tasksByStatus
-        const hoverTaskOrder =
-          hoverIndex < targetGroup.length ? targetGroup[hoverIndex].order : null;
-
-        let newOrder: number;
-        if (hoverTaskOrder !== null) {
-          // Simple approach: take the order of the hovered item
-          // More complex: calculate midpoint between hoverItem and item before/after
-          newOrder = hoverTaskOrder;
-        } else {
-          // Dropped at the end, find max order + 1
-          newOrder = targetGroup.length > 0 ? Math.max(...targetGroup.map((t) => t.order)) + 1 : 0;
-        }
-
-        // TODO: Update the server action (updateTask) to accept and set the 'order'
-        // For now, just updating status
+        // Update task status (tasks will be sorted alphabetically on next render)
         updateTaskExecute({
           id: item.id,
-          status: targetStatus /*, order: newOrder */,
+          status: targetStatus,
         });
-
-        // Optional: Re-index orders in the source and target groups if needed
-        // (Requires another server action or more complex update logic)
       }
     },
     [updateTaskExecute, updateTaskStatus, tasksByStatus],

apps/app/src/app/(app)/[orgId]/tasks/page.tsx

@@ -63,7 +63,7 @@ const getTasks = async (statusParam?: string) => {
 
   const tasks = await db.task.findMany({
     where: whereClause,
-    orderBy: [{ status: 'asc' }, { order: 'asc' }, { createdAt: 'asc' }],
+    orderBy: [{ status: 'asc' }, { title: 'asc' }],
   });
   return tasks;
 };