diff --git a/components/flow.tsx b/components/flow.tsx index d67d446f..c0fc016b 100644 --- a/components/flow.tsx +++ b/components/flow.tsx @@ -91,27 +91,18 @@ export function Flow() { setLoading(true); try { const response = await fetch('/api/leantime/tasks'); - if (!response.ok) { - throw new Error('Failed to fetch tasks'); - } - const tasks = await response.json(); + const data = await response.json(); - if (!Array.isArray(tasks)) { - console.warn('No tasks found in response', tasks as unknown); + if (!Array.isArray(data)) { + console.warn('No tasks found in response', data as unknown); setTasks([]); return; } // Filter out completed tasks (status 3) and sort by dateToFinish - const sortedTasks = tasks + const sortedTasks = data .filter((task: Task) => task.status !== 3) .sort((a: Task, b: Task) => { - // First sort by status (4 before 3) - if (a.status !== b.status) { - return b.status - a.status; - } - - // Then sort by dateToFinish const dateA = getValidDate(a); const dateB = getValidDate(b); @@ -122,7 +113,7 @@ export function Flow() { return new Date(dateA).getTime() - new Date(dateB).getTime(); }); - console.log('Sorted tasks:', sortedTasks); + console.log('Sorted tasks by dateToFinish:', sortedTasks); setTasks(sortedTasks.slice(0, 6)); } catch (error) { console.error('Error fetching tasks:', error);