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.

Preserve new cards and virtual bucket moves during reorders

Tinc7c99e682e70
diff --git a/apps/web/src/components/kanban-board/apply-reorder.ts b/apps/web/src/components/kanban-board/apply-reorder.ts
index c4bd93dd9..4637bc03f 100644
--- a/apps/web/src/components/kanban-board/apply-reorder.ts
+++ b/apps/web/src/components/kanban-board/apply-reorder.ts
@@ -7,40 +7,40 @@ export function applyBoardReorder(
): ProjectWithTasks {
const changes = new Map(tasks.map((task) => [task.id, task]));
return produce(project, (draft) => {
- for (const bucket of [draft.plannedTasks, draft.archivedTasks]) {
- for (const task of bucket) {
- const change = changes.get(task.id);
- if (change) task.position = change.position;
- }
- bucket.sort((a, b) => (a.position ?? 0) - (b.position ?? 0));
- }
+ const buckets = [
+ ...draft.columns.map((column) => ({
+ slug: column.slug,
+ columnId: column.id,
+ tasks: column.tasks,
+ })),
+ { slug: "planned", columnId: null, tasks: draft.plannedTasks },
+ { slug: "archived", columnId: null, tasks: draft.archivedTasks },
+ ];
const moved: Array<{
task: (typeof draft.columns)[number]["tasks"][number];
slug: string;
}> = [];
- for (const column of draft.columns) {
- column.tasks = column.tasks.filter((task) => {
+ for (const bucket of buckets) {
+ for (let index = bucket.tasks.length - 1; index >= 0; index--) {
+ const task = bucket.tasks[index];
const change = changes.get(task.id);
- if (!change) return true;
+ if (!change) continue;
task.position = change.position;
- if (change.status && change.status !== column.slug) {
- const destination = draft.columns.find(
- (column) => column.slug === change.status,
- );
- if (destination) {
- task.status = change.status;
- task.columnId = destination.id;
- moved.push({ task, slug: change.status });
- return false;
- }
+ const destination =
+ change.status &&
+ buckets.find((bucket) => bucket.slug === change.status);
+ if (destination && destination !== bucket) {
+ task.status = destination.slug;
+ task.columnId = destination.columnId;
+ bucket.tasks.splice(index, 1);
+ moved.push({ task, slug: destination.slug });
}
- return true;
- });
+ }
}
for (const { task, slug } of moved)
- draft.columns.find((column) => column.slug === slug)?.tasks.push(task);
- for (const column of draft.columns)
- column.tasks.sort((a, b) => (a.position ?? 0) - (b.position ?? 0));
+ buckets.find((bucket) => bucket.slug === slug)?.tasks.push(task);
+ for (const bucket of buckets)
+ bucket.tasks.sort((a, b) => (a.position ?? 0) - (b.position ?? 0));
});
}
diff --git a/apps/web/src/components/kanban-board/move-task.test.ts b/apps/web/src/components/kanban-board/move-task.test.ts
index a1257afc2..714415367 100644
--- a/apps/web/src/components/kanban-board/move-task.test.ts
+++ b/apps/web/src/components/kanban-board/move-task.test.ts
@@ -139,3 +139,38 @@ it("patches and sorts planned and archived task reorders", () => {
expect(updated.plannedTasks.map((task) => task.id)).toEqual(["p2", "p1"]);
expect(updated.archivedTasks.map((task) => task.id)).toEqual(["a2", "a1"]);
});
+
+it("moves cards between ordinary, planned and archived buckets while preserving metadata", () => {
+ const project = board();
+ project.plannedTasks = [
+ { id: "p", status: "planned", position: 0, title: "planned title" },
+ ] as typeof project.plannedTasks;
+ project.archivedTasks = [
+ { id: "z", status: "archived", position: 0 },
+ ] as typeof project.archivedTasks;
+ const updated = applyBoardReorder(project, [
+ { id: "a", position: 1, status: "planned" },
+ { id: "p", position: 2, status: "archived" },
+ { id: "z", position: 3, status: "doing" },
+ ]);
+ expect(updated.plannedTasks).toEqual([
+ expect.objectContaining({
+ id: "a",
+ status: "planned",
+ columnId: null,
+ title: "keep a",
+ }),
+ ]);
+ expect(updated.archivedTasks).toEqual([
+ expect.objectContaining({
+ id: "p",
+ status: "archived",
+ columnId: null,
+ title: "planned title",
+ }),
+ ]);
+ expect(updated.columns[1].tasks).toContainEqual(
+ expect.objectContaining({ id: "z", status: "doing", columnId: "doing" }),
+ );
+ expect(updated.columns[0].tasks.some((task) => task.id === "a")).toBe(false);
+});
diff --git a/apps/web/src/components/kanban-board/select-reorder-board.test.ts b/apps/web/src/components/kanban-board/select-reorder-board.test.ts
index d41ed5386..200dffba7 100644
--- a/apps/web/src/components/kanban-board/select-reorder-board.test.ts
+++ b/apps/web/src/components/kanban-board/select-reorder-board.test.ts
@@ -27,7 +27,9 @@ it("includes a newly created local card without replacing newer cached metadata"
expect(
selectReorderBoard("p", "created", cached, stored)?.columns[0].tasks,
).toEqual([cached.columns[0].tasks[0], stored.columns[0].tasks[1]]);
- expect(selectReorderBoard("p", "old", cached, stored)).toBe(cached);
+ expect(
+ selectReorderBoard("p", "old", cached, stored)?.columns[0].tasks,
+ ).toEqual([cached.columns[0].tasks[0], stored.columns[0].tasks[1]]);
expect(
selectReorderBoard("p", "created", cached, { ...stored, id: "other" }),
).toBe(cached);
diff --git a/apps/web/src/components/kanban-board/select-reorder-board.ts b/apps/web/src/components/kanban-board/select-reorder-board.ts
index 1fd0a262e..2bcd6333e 100644
--- a/apps/web/src/components/kanban-board/select-reorder-board.ts
+++ b/apps/web/src/components/kanban-board/select-reorder-board.ts
@@ -2,33 +2,29 @@ import type { ProjectWithTasks } from "@/types/project";
export function selectReorderBoard(
projectId: string,
- taskId: string,
+ _taskId: string,
cached: ProjectWithTasks | undefined,
stored: ProjectWithTasks | null | undefined,
) {
const current = cached?.id === projectId ? cached : undefined;
const local = stored?.id === projectId ? stored : undefined;
if (!current) return local;
- if (
- current.columns.some((column) =>
- column.tasks.some((task) => task.id === taskId),
- )
- )
- return current;
- const created = local?.columns
+ if (!local) return current;
+ const ids = new Set(
+ current.columns.flatMap((column) => column.tasks.map((task) => task.id)),
+ );
+ const created = local.columns
.flatMap((column) => column.tasks)
- .find((task) => task.id === taskId);
- if (
- !created ||
- !current.columns.some((column) => column.slug === created.status)
- )
- return current;
+ .filter((task) => !ids.has(task.id));
+ if (!created.length) return current;
return {
...current,
- columns: current.columns.map((column) =>
- column.slug === created.status
- ? { ...column, tasks: [...column.tasks, created] }
- : column,
- ),
+ columns: current.columns.map((column) => ({
+ ...column,
+ tasks: [
+ ...column.tasks,
+ ...created.filter((task) => task.status === column.slug),
+ ],
+ })),
};
}