Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): stop warning about due dates on completed tasks

Andrej3f3dd1360bad
diff --git a/apps/site/components/project-private-list-view.tsx b/apps/site/components/project-private-list-view.tsx
index 4aad99009..cec150d6a 100644
--- a/apps/site/components/project-private-list-view.tsx
+++ b/apps/site/components/project-private-list-view.tsx
@@ -90,6 +90,7 @@ export function PrivateListView({
{isOpen && (
<div>
{column.tasks.map((task) => {
+ const taskIsCompleted = column.isFinal;
const taskWithLabels = task as Task & {
labels?: Array<{
id: string;
@@ -146,17 +147,22 @@ export function PrivateListView({
{/* Due date */}
{task.dueDate && (
<div
- className={`shrink-0 flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`shrink-0 flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && <CalendarX className="w-3 h-3" />}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && (
<CalendarClock className="w-3 h-3" />
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) ===
- "no-due-date") && (
+ {(getDueDateStatus(
+ task.dueDate,
+ taskIsCompleted,
+ ) === "far-future" ||
+ getDueDateStatus(
+ task.dueDate,
+ taskIsCompleted,
+ ) === "no-due-date") && (
<Calendar className="w-3 h-3" />
)}
<span>
diff --git a/apps/site/components/project-task-card.tsx b/apps/site/components/project-task-card.tsx
index 840ba1c4e..079829818 100644
--- a/apps/site/components/project-task-card.tsx
+++ b/apps/site/components/project-task-card.tsx
@@ -2,7 +2,11 @@ import { format } from "date-fns";
import { Calendar, CalendarClock, CalendarX } from "lucide-react";
import { useRef } from "react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
import type { ExternalLink } from "@/types/external-link";
import type Task from "@/types/task";
@@ -23,6 +27,7 @@ export function PublicTaskCard({
projectSlug,
onTaskClick,
}: PublicTaskCardProps) {
+ const taskIsCompleted = isTaskCompleted(task.status);
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
const touchStartRef = useRef<{ x: number; y: number; time: number } | null>(
@@ -121,18 +126,18 @@ export function PublicTaskCard({
{task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "overdue" && (
<CalendarX className="w-3 h-3" />
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "due-soon" && (
<CalendarClock className="w-3 h-3" />
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{format(new Date(task.dueDate), "MMM d")}</span>
</div>
)}
diff --git a/apps/site/lib/due-date-status.ts b/apps/site/lib/due-date-status.ts
index 2c410e5eb..870c57aab 100644
--- a/apps/site/lib/due-date-status.ts
+++ b/apps/site/lib/due-date-status.ts
@@ -4,8 +4,28 @@ export type DueDateStatus =
| "far-future"
| "no-due-date";
-export function getDueDateStatus(dueDate: string | null): DueDateStatus {
+type CompletionColumn = { slug: string; isFinal: boolean };
+
+// Columns are user-configurable, so completion comes from the column's isFinal
+// flag. The slug check is the fallback for surfaces that render before columns
+// load, or that never have them.
+export function isTaskCompleted(
+ status: string,
+ columns?: CompletionColumn[],
+): boolean {
+ if (columns?.length) {
+ return columns.find((column) => column.slug === status)?.isFinal ?? false;
+ }
+ return status === "done" || status === "archived";
+}
+
+export function getDueDateStatus(
+ dueDate: string | null,
+ isCompleted = false,
+): DueDateStatus {
if (!dueDate) return "no-due-date";
+ // A finished task cannot be late, so it keeps the neutral badge.
+ if (isCompleted) return "far-future";
const now = new Date();
const due = new Date(dueDate);
diff --git a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
index 66bc9ed84..95de5bd80 100644
--- a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
+++ b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
@@ -20,7 +20,11 @@ import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { cn } from "@/lib/cn";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
import { toast } from "@/lib/toast";
@@ -50,6 +54,7 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
} = useSortable({ id: task.id });
const { project } = useProjectStore();
+ const taskIsCompleted = isTaskCompleted(task.status, project?.columns);
const { data: workspace } = useActiveWorkspace();
const {
showAssignees,
@@ -179,18 +184,16 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
{showDueDates && task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded flex-shrink-0 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded flex-shrink-0 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && <CalendarX className="w-3 h-3" />}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && <CalendarClock className="w-3 h-3" />}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{format(new Date(task.dueDate), "MMM d")}</span>
</div>
)}
diff --git a/apps/web/src/components/kanban-board/task-card.tsx b/apps/web/src/components/kanban-board/task-card.tsx
index fb3ffeebd..d21cd5c10 100644
--- a/apps/web/src/components/kanban-board/task-card.tsx
+++ b/apps/web/src/components/kanban-board/task-card.tsx
@@ -29,7 +29,11 @@ import {
import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
import { toast } from "@/lib/toast";
@@ -59,6 +63,7 @@ function TaskCard({ task, disableDragDrop = false }: TaskCardProps) {
isDragging,
} = useSortable({ id: task.id, disabled: disableDragDrop });
const { project } = useProjectStore();
+ const taskIsCompleted = isTaskCompleted(task.status, project?.columns);
const { data: workspace } = useActiveWorkspace();
const { mutateAsync: deleteTask } = useDeleteTask();
const navigate = useNavigate();
@@ -260,18 +265,16 @@ function TaskCard({ task, disableDragDrop = false }: TaskCardProps) {
{showDueDates && task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && <CalendarX className="w-3 h-3" />}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && <CalendarClock className="w-3 h-3" />}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{format(new Date(task.dueDate), "MMM d")}</span>
</div>
)}
diff --git a/apps/web/src/components/list-view/task-row.tsx b/apps/web/src/components/list-view/task-row.tsx
index 96c83e28b..6ff49008d 100644
--- a/apps/web/src/components/list-view/task-row.tsx
+++ b/apps/web/src/components/list-view/task-row.tsx
@@ -31,7 +31,11 @@ import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { cn } from "@/lib/cn";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
import { toast } from "@/lib/toast";
@@ -62,6 +66,7 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
} = useSortable({ id: task.id });
const { project } = useProjectStore();
+ const taskIsCompleted = isTaskCompleted(task.status, project?.columns);
const { data: workspace } = useActiveWorkspace();
const {
showAssignees,
@@ -332,18 +337,16 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
{showDueDates && task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded flex-shrink-0 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded flex-shrink-0 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && <CalendarX className="w-3 h-3" />}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && <CalendarClock className="w-3 h-3" />}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{format(new Date(task.dueDate), "MMM d")}</span>
</div>
)}
diff --git a/apps/web/src/components/public-project/task-card.tsx b/apps/web/src/components/public-project/task-card.tsx
index 89b73c947..e4aaa8ad5 100644
--- a/apps/web/src/components/public-project/task-card.tsx
+++ b/apps/web/src/components/public-project/task-card.tsx
@@ -1,7 +1,11 @@
import { Calendar, CalendarClock, CalendarX } from "lucide-react";
import { useRef } from "react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { formatDateShort } from "@/lib/format";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
@@ -24,6 +28,7 @@ export function PublicTaskCard({
projectSlug,
onTaskClick,
}: PublicTaskCardProps) {
+ const taskIsCompleted = isTaskCompleted(task.status);
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
const touchStartRef = useRef<{ x: number; y: number; time: number } | null>(
@@ -122,18 +127,18 @@ export function PublicTaskCard({
{task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "overdue" && (
<CalendarX className="w-3 h-3" />
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "due-soon" && (
<CalendarClock className="w-3 h-3" />
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{formatDateShort(task.dueDate)}</span>
</div>
)}
diff --git a/apps/web/src/components/public-project/task-detail-modal.tsx b/apps/web/src/components/public-project/task-detail-modal.tsx
index df0d350ec..91a947ebe 100644
--- a/apps/web/src/components/public-project/task-detail-modal.tsx
+++ b/apps/web/src/components/public-project/task-detail-modal.tsx
@@ -12,7 +12,11 @@ import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Dialog, DialogClose, DialogPopup } from "@/components/ui/dialog";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { formatDateMedium, formatDateShort } from "@/lib/format";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
@@ -39,6 +43,7 @@ export function PublicTaskDetailModal({
open,
onOpenChange,
}: PublicTaskDetailModalProps) {
+ const taskIsCompleted = isTaskCompleted(task?.status ?? "");
const { t } = useTranslation();
const getPRStatus = useMemo(
@@ -124,18 +129,16 @@ export function PublicTaskDetailModal({
{task.dueDate && (
<div
- className={`flex items-center gap-1.5 px-2.5 py-1 text-xs rounded-md ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1.5 px-2.5 py-1 text-xs rounded-md ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && <CalendarX className="w-3 h-3" />}
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && <CalendarClock className="w-3 h-3" />}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>
{t("publicProject:taskDetail.dueWithDate", {
date: formatDateShort(task.dueDate),
diff --git a/apps/web/src/components/public-project/task-row.tsx b/apps/web/src/components/public-project/task-row.tsx
index 9ac59e477..2a2edf284 100644
--- a/apps/web/src/components/public-project/task-row.tsx
+++ b/apps/web/src/components/public-project/task-row.tsx
@@ -1,7 +1,11 @@
import { Calendar, CalendarClock, CalendarX } from "lucide-react";
import { useTranslation } from "react-i18next";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { formatDateShort } from "@/lib/format";
import { getInitials } from "@/lib/get-initials";
import { getPriorityIcon } from "@/lib/priority";
@@ -24,6 +28,7 @@ export function PublicTaskRow({
projectSlug,
onTaskClick,
}: PublicTaskRowProps) {
+ const taskIsCompleted = isTaskCompleted(task.status);
const { t } = useTranslation();
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
@@ -69,18 +74,18 @@ export function PublicTaskRow({
{task.dueDate && (
<div
- className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`flex items-center gap-1 text-[10px] px-2 py-1 rounded ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "overdue" && (
<CalendarX className="w-3 h-3" />
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) === "due-soon" && (
<CalendarClock className="w-3 h-3" />
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && <Calendar className="w-3 h-3" />}
<span>{formatDateShort(task.dueDate)}</span>
</div>
)}
diff --git a/apps/web/src/components/task/task-properties-sidebar.tsx b/apps/web/src/components/task/task-properties-sidebar.tsx
index 52b59e7c2..543081855 100644
--- a/apps/web/src/components/task/task-properties-sidebar.tsx
+++ b/apps/web/src/components/task/task-properties-sidebar.tsx
@@ -29,7 +29,11 @@ import useGetTask from "@/hooks/queries/task/use-get-task";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { cn } from "@/lib/cn";
import { getColumnIcon } from "@/lib/column";
-import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
+import {
+ dueDateStatusColors,
+ getDueDateStatus,
+ isTaskCompleted,
+} from "@/lib/due-date-status";
import { formatDateShort } from "@/lib/format";
import { getInitials } from "@/lib/get-initials";
import { getPriorityLabel, getStatusDisplayLabel } from "@/lib/i18n/domain";
@@ -84,6 +88,7 @@ export default function TaskPropertiesSidebar({
const { data: task } = useGetTask(taskId ?? "");
const { data: project } = useGetProject({ id: projectId, workspaceId });
const { data: columns = [] } = useGetColumns(projectId);
+ const taskIsCompleted = isTaskCompleted(task?.status ?? "", columns);
const { data: workspaceUsers } = useGetActiveWorkspaceUsers(workspaceId);
const { data: taskLabels = [] } = useGetLabelsByTask(taskId ?? "");
const { data: githubIntegration } = useGetGithubIntegration(projectId);
@@ -284,20 +289,24 @@ export default function TaskPropertiesSidebar({
>
{task.dueDate ? (
<>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && (
<CalendarX
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && (
<CalendarClock
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "no-due-date") && (
<Calendar
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
<span className="text-xs font-semibold">
@@ -471,21 +480,24 @@ export default function TaskPropertiesSidebar({
>
{task.dueDate ? (
<>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && (
<CalendarX
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && (
<CalendarClock
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) ===
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
"no-due-date") && (
<Calendar
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
<span className="text-xs font-semibold">
@@ -661,21 +673,24 @@ export default function TaskPropertiesSidebar({
>
{task.dueDate ? (
<>
- {getDueDateStatus(task.dueDate) === "overdue" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "overdue" && (
<CalendarX
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
+ {getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "due-soon" && (
<CalendarClock
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) ===
+ {(getDueDateStatus(task.dueDate, taskIsCompleted) ===
+ "far-future" ||
+ getDueDateStatus(task.dueDate, taskIsCompleted) ===
"no-due-date") && (
<Calendar
- className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ className={`w-3.5 h-3.5 ${dueDateStatusColors[getDueDateStatus(task.dueDate, taskIsCompleted)]}`}
/>
)}
<span className="text-xs font-semibold">
diff --git a/apps/web/src/lib/due-date-status.test.ts b/apps/web/src/lib/due-date-status.test.ts
new file mode 100644
index 000000000..fdc1b4244
--- /dev/null
+++ b/apps/web/src/lib/due-date-status.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from "vitest";
+import { getDueDateStatus, isTaskCompleted } from "./due-date-status";
+
+const YESTERDAY = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
+const TOMORROW = new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString();
+const NEXT_MONTH = new Date(
+ Date.now() + 30 * 24 * 60 * 60 * 1000,
+).toISOString();
+
+describe("getDueDateStatus", () => {
+ it("flags overdue and due-soon dates for open tasks", () => {
+ expect(getDueDateStatus(YESTERDAY)).toBe("overdue");
+ expect(getDueDateStatus(TOMORROW)).toBe("due-soon");
+ expect(getDueDateStatus(NEXT_MONTH)).toBe("far-future");
+ expect(getDueDateStatus(null)).toBe("no-due-date");
+ });
+
+ it("never warns about a completed task, however overdue", () => {
+ expect(getDueDateStatus(YESTERDAY, true)).toBe("far-future");
+ expect(getDueDateStatus(TOMORROW, true)).toBe("far-future");
+ });
+});
+
+describe("isTaskCompleted", () => {
+ const columns = [
+ { slug: "to-do", isFinal: false },
+ { slug: "shipped", isFinal: true },
+ ];
+
+ it("uses the column isFinal flag when columns are available", () => {
+ expect(isTaskCompleted("shipped", columns)).toBe(true);
+ expect(isTaskCompleted("to-do", columns)).toBe(false);
+ });
+
+ it("does not assume a column named done is final", () => {
+ expect(isTaskCompleted("done", [{ slug: "done", isFinal: false }])).toBe(
+ false,
+ );
+ });
+
+ it("falls back to the slug when columns are not loaded", () => {
+ expect(isTaskCompleted("done")).toBe(true);
+ expect(isTaskCompleted("archived")).toBe(true);
+ expect(isTaskCompleted("in-progress")).toBe(false);
+ expect(isTaskCompleted("done", [])).toBe(true);
+ });
+});
diff --git a/apps/web/src/lib/due-date-status.ts b/apps/web/src/lib/due-date-status.ts
index 2c410e5eb..870c57aab 100644
--- a/apps/web/src/lib/due-date-status.ts
+++ b/apps/web/src/lib/due-date-status.ts
@@ -4,8 +4,28 @@ export type DueDateStatus =
| "far-future"
| "no-due-date";
-export function getDueDateStatus(dueDate: string | null): DueDateStatus {
+type CompletionColumn = { slug: string; isFinal: boolean };
+
+// Columns are user-configurable, so completion comes from the column's isFinal
+// flag. The slug check is the fallback for surfaces that render before columns
+// load, or that never have them.
+export function isTaskCompleted(
+ status: string,
+ columns?: CompletionColumn[],
+): boolean {
+ if (columns?.length) {
+ return columns.find((column) => column.slug === status)?.isFinal ?? false;
+ }
+ return status === "done" || status === "archived";
+}
+
+export function getDueDateStatus(
+ dueDate: string | null,
+ isCompleted = false,
+): DueDateStatus {
if (!dueDate) return "no-due-date";
+ // A finished task cannot be late, so it keeps the neutral badge.
+ if (isCompleted) return "far-future";
const now = new Date();
const due = new Date(dueDate);