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): use column isFinal for due-date badges on public views

Emre Kocaca8c8274ec76
diff --git a/apps/site/components/project-private-kanban-view.tsx b/apps/site/components/project-private-kanban-view.tsx
index b81cd2a15..1a1a639e1 100644
--- a/apps/site/components/project-private-kanban-view.tsx
+++ b/apps/site/components/project-private-kanban-view.tsx
@@ -60,6 +60,7 @@ export function PrivateKanbanView({
key={task.id}
task={task}
projectSlug={project.slug}
+ isCompleted={column.isFinal}
onTaskClick={onTaskClick}
/>
))}
diff --git a/apps/site/components/project-task-card.tsx b/apps/site/components/project-task-card.tsx
index 079829818..cffd8b358 100644
--- a/apps/site/components/project-task-card.tsx
+++ b/apps/site/components/project-task-card.tsx
@@ -19,15 +19,19 @@ type PublicTaskCardProps = {
externalLinks?: Array<ExternalLink>;
};
projectSlug: string;
+ // Passed by views that hold the column, so completion comes from isFinal
+ // rather than the slug fallback.
+ isCompleted?: boolean;
onTaskClick: (task: Task) => void;
};
export function PublicTaskCard({
task,
projectSlug,
+ isCompleted,
onTaskClick,
}: PublicTaskCardProps) {
- const taskIsCompleted = isTaskCompleted(task.status);
+ const taskIsCompleted = isCompleted ?? isTaskCompleted(task.status);
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
const touchStartRef = useRef<{ x: number; y: number; time: number } | null>(
diff --git a/apps/web/src/components/public-project/kanban-view.tsx b/apps/web/src/components/public-project/kanban-view.tsx
index 076216199..b9932044e 100644
--- a/apps/web/src/components/public-project/kanban-view.tsx
+++ b/apps/web/src/components/public-project/kanban-view.tsx
@@ -45,6 +45,7 @@ export function PublicKanbanView({
key={task.id}
task={task}
projectSlug={project.slug}
+ isCompleted={column.isFinal}
onTaskClick={onTaskClick}
/>
))}
diff --git a/apps/web/src/components/public-project/list-view.tsx b/apps/web/src/components/public-project/list-view.tsx
index 8803894a1..a12305ac2 100644
--- a/apps/web/src/components/public-project/list-view.tsx
+++ b/apps/web/src/components/public-project/list-view.tsx
@@ -35,6 +35,7 @@ export function PublicListView({ project, onTaskClick }: PublicListViewProps) {
key={task.id}
task={task}
projectSlug={project.slug}
+ isCompleted={column.isFinal}
onTaskClick={onTaskClick}
/>
))}
diff --git a/apps/web/src/components/public-project/task-card.tsx b/apps/web/src/components/public-project/task-card.tsx
index e4aaa8ad5..fc9e89d18 100644
--- a/apps/web/src/components/public-project/task-card.tsx
+++ b/apps/web/src/components/public-project/task-card.tsx
@@ -20,15 +20,19 @@ type PublicTaskCardProps = {
externalLinks?: Array<ExternalLink>;
};
projectSlug: string;
+ // Passed by views that hold the column, so completion comes from isFinal
+ // rather than the slug fallback.
+ isCompleted?: boolean;
onTaskClick: (task: Task) => void;
};
export function PublicTaskCard({
task,
projectSlug,
+ isCompleted,
onTaskClick,
}: PublicTaskCardProps) {
- const taskIsCompleted = isTaskCompleted(task.status);
+ const taskIsCompleted = isCompleted ?? isTaskCompleted(task.status);
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
const touchStartRef = useRef<{ x: number; y: number; time: number } | null>(
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 91a947ebe..d1cd14d41 100644
--- a/apps/web/src/components/public-project/task-detail-modal.tsx
+++ b/apps/web/src/components/public-project/task-detail-modal.tsx
@@ -33,6 +33,9 @@ type PublicTaskDetailModalProps = {
})
| null;
projectSlug: string;
+ // The modal is opened from any column, so it resolves completion by slug
+ // rather than being told; without these it falls back to the slug heuristic.
+ columns?: Array<{ slug: string; isFinal: boolean }>;
open: boolean;
onOpenChange: (open: boolean) => void;
};
@@ -40,10 +43,11 @@ type PublicTaskDetailModalProps = {
export function PublicTaskDetailModal({
task,
projectSlug,
+ columns,
open,
onOpenChange,
}: PublicTaskDetailModalProps) {
- const taskIsCompleted = isTaskCompleted(task?.status ?? "");
+ const taskIsCompleted = isTaskCompleted(task?.status ?? "", columns);
const { t } = useTranslation();
const getPRStatus = useMemo(
diff --git a/apps/web/src/components/public-project/task-row.tsx b/apps/web/src/components/public-project/task-row.tsx
index 2a2edf284..7dd6c02d3 100644
--- a/apps/web/src/components/public-project/task-row.tsx
+++ b/apps/web/src/components/public-project/task-row.tsx
@@ -20,15 +20,19 @@ type PublicTaskRowProps = {
externalLinks?: Array<ExternalLink>;
};
projectSlug: string;
+ // Passed by views that hold the column, so completion comes from isFinal
+ // rather than the slug fallback.
+ isCompleted?: boolean;
onTaskClick: (task: Task) => void;
};
export function PublicTaskRow({
task,
projectSlug,
+ isCompleted,
onTaskClick,
}: PublicTaskRowProps) {
- const taskIsCompleted = isTaskCompleted(task.status);
+ const taskIsCompleted = isCompleted ?? isTaskCompleted(task.status);
const { t } = useTranslation();
const labels = task.labels || [];
const externalLinks = task.externalLinks || [];
diff --git a/apps/web/src/lib/due-date-status.test.ts b/apps/web/src/lib/due-date-status.test.ts
index fdc1b4244..68ef9c886 100644
--- a/apps/web/src/lib/due-date-status.test.ts
+++ b/apps/web/src/lib/due-date-status.test.ts
@@ -44,4 +44,21 @@ describe("isTaskCompleted", () => {
expect(isTaskCompleted("in-progress")).toBe(false);
expect(isTaskCompleted("done", [])).toBe(true);
});
+
+ // The public views hold the column, so they must not take the slug path: a
+ // project whose final column is named anything else warned on finished tasks.
+ it("resolves a final column that is not named done", () => {
+ const columns = [
+ { slug: "in-progress", isFinal: false },
+ { slug: "shipped", isFinal: true },
+ ];
+
+ expect(isTaskCompleted("shipped", columns)).toBe(true);
+ expect(
+ getDueDateStatus(YESTERDAY, isTaskCompleted("shipped", columns)),
+ ).toBe("far-future");
+ expect(getDueDateStatus(YESTERDAY, isTaskCompleted("shipped"))).toBe(
+ "overdue",
+ );
+ });
});
diff --git a/apps/web/src/routes/public-project.$projectId.tsx b/apps/web/src/routes/public-project.$projectId.tsx
index 1100a6fe7..4e6036ce5 100644
--- a/apps/web/src/routes/public-project.$projectId.tsx
+++ b/apps/web/src/routes/public-project.$projectId.tsx
@@ -144,6 +144,7 @@ function RouteComponent() {
<PublicTaskDetailModal
task={selectedTask}
projectSlug={project.slug}
+ columns={project.columns}
open={isTaskModalOpen}
onOpenChange={handleTaskModalClose}
/>