Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,27 @@ export const Tasks = (
const [searchTerm, setSearchTerm] = useState('');
const [lastSyncTime, setLastSyncTime] = useState<number | null>(null);

const isOverdue = (due?: string) => {
if (!due) return false;

// Taskwarrior format: 20251115T183000Z
const parsed = new Date(
due.replace(
/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z$/,
'$1-$2-$3T$4:$5:$6Z'
)
);

// Convert to local date (ignore time)
const dueDate = new Date(parsed);
dueDate.setHours(0, 0, 0, 0);

const today = new Date();
today.setHours(0, 0, 0, 0);

return dueDate < today;
};

// Debounced search handler
const debouncedSearch = debounce((value: string) => {
if (!value) {
Expand All @@ -149,7 +170,7 @@ export const Tasks = (
(task.tags &&
task.tags.some((tag) => tag.toLowerCase().includes(lowerValue)))
);
setTempTasks(filtered);
setTempTasks(sortWithOverdueOnTop(filtered));
setCurrentPage(1);
}, 300);

Expand Down Expand Up @@ -536,6 +557,21 @@ export const Tasks = (
tags: newTask.tags.filter((tag) => tag !== tagToRemove),
});
};

const sortWithOverdueOnTop = (tasks: Task[]) => {
return [...tasks].sort((a, b) => {
const aOverdue = a.status === 'pending' && isOverdue(a.due);
const bOverdue = b.status === 'pending' && isOverdue(b.due);

// Overdue always on top
if (aOverdue && !bOverdue) return -1;
if (!aOverdue && bOverdue) return 1;

// Otherwise fall back to ID sort DESC (latest first)
return b.id - a.id;
});
};

useEffect(() => {
let filteredTasks = tasks;

Expand All @@ -561,6 +597,8 @@ export const Tasks = (
);
}

filteredTasks = sortWithOverdueOnTop(filteredTasks);

// Sort + set
setTempTasks(filteredTasks);
}, [selectedProjects, selectedTags, selectedStatuses, tasks]);
Expand Down Expand Up @@ -987,7 +1025,14 @@ export const Tasks = (
<TableRow key={index} className="border-b">
{/* Display task details */}
<TableCell className="py-2">
<span className="text-s text-foreground">
<span
className={`px-3 py-1 rounded-md font-semibold ${
task.status === 'pending' &&
isOverdue(task.due)
? 'bg-red-600/80 text-white'
: ''
}`}
>
{task.id}
</span>
</TableCell>
Expand Down Expand Up @@ -1050,7 +1095,15 @@ export const Tasks = (
<TableBody>
<TableRow>
<TableCell>ID:</TableCell>
<TableCell>{task.id}</TableCell>
<TableCell className="flex items-center gap-3">
{task.id}
{task.status === 'pending' &&
isOverdue(task.due) && (
<Badge className="bg-red-600 text-white shadow-lg shadow-red-700/40 animate-pulse">
Overdue
</Badge>
)}
</TableCell>
</TableRow>
<TableRow>
<TableCell>Description:</TableCell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jest.mock('../hooks', () => ({
project: i % 2 === 0 ? 'ProjectA' : 'ProjectB',
tags: i % 3 === 0 ? ['tag1'] : ['tag2'],
uuid: `uuid-${i + 1}`,
due: i === 0 ? '20200101T120000Z' : undefined,
}))
),
})),
Expand Down Expand Up @@ -144,4 +145,23 @@ describe('Tasks Component', () => {

expect(screen.getByTestId('current-page')).toHaveTextContent('1');
});

test('shows red background on task ID and Overdue badge for overdue tasks', async () => {
render(<Tasks {...mockProps} />);

await screen.findByText('Task 12');

const dropdown = screen.getByLabelText('Show:');
fireEvent.change(dropdown, { target: { value: '20' } });

const task1Description = screen.getByText('Task 1');
const row = task1Description.closest('tr');
const idElement = row?.querySelector('span');

expect(idElement).toHaveClass('bg-red-600/80');
fireEvent.click(idElement!);

const overdueBadge = await screen.findByText('Overdue');
expect(overdueBadge).toBeInTheDocument();
});
});
Loading