Skip to content
Open
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
50 changes: 36 additions & 14 deletions frontend/app/components/kanban/KanbanBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,31 @@ export function KanbanBoard() {
);
}

function reconcileTaskPositions(
tasks: Task[],
status: TaskStatus
) {
return tasks
.filter((task) => task.status === status)
.sort((a, b) => a.position - b.position)
.map((task, index) => ({
...task,
position: index,
}));
}

function shouldSyncTaskUpdate(
originalTask: Task,
updatedTask: Task
) {
return (
originalTask.status !==
updatedTask.status ||
originalTask.position !==
updatedTask.position
);
}

const handleDragEnd = async (event: DragEndEvent) => {
if (isSyncingRef.current) return;

Expand Down Expand Up @@ -258,27 +283,24 @@ export function KanbanBoard() {
);

// Get tasks of affected column
const columnTasks = updatedTasks
.filter((task) => task.status === newStatus)
.sort((a, b) => a.position - b.position);

// Reassign positions sequentially
const reorderedTasks = columnTasks
.map((task, index) => ({
...task,
position: index,
}))
.filter((task) => {
const reconciledTasks =
reconcileTaskPositions(
updatedTasks,
newStatus
);

const reorderedTasks =
reconciledTasks.filter(
(task) => {
const originalTask = tasks.find(
(t) => t.id === task.id
);

return Boolean(
originalTask &&
hasTaskPositionChanged(
shouldSyncTaskUpdate(
originalTask,
task.status,
task.position
task
)
);
});
Expand Down
Loading