root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-2958): merge fusion/fn-2958

Browse Source 
- test(FN-2958): complete Step 2 — cover merging pinning sort behavior

Fusion-Task-Id: FN-2958
This commit is contained in:
Fusion
2026-04-29 09:20:01 -07:00
committed by gsxdsm
parent 91f9f208ad
commit 2c160a7f78
2 changed files with 130 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/dashboard/app/components/Board.tsx
View File

@@ -53,8 +53,16 @@ interface BoardProps {
lastFetchTimeMs?: number;
}
function sortTasksForColumn(tasks: Task[]): Task[] {
function sortTasksForColumn(tasks: Task[], column: ColumnType): Task[] {
return [...tasks].sort((a, b) => {
if (column === "in-review") {
const aIsMerging = a.status === "merging" || a.status === "merging-pr";
const bIsMerging = b.status === "merging" || b.status === "merging-pr";
if (aIsMerging !== bIsMerging) {
return aIsMerging ? -1 : 1;
}
}
if (a.columnMovedAt && b.columnMovedAt) {
return b.columnMovedAt.localeCompare(a.columnMovedAt);
}
@@ -124,7 +132,7 @@ export function Board({ tasks, projectId, maxConcurrent, onMoveTask, onPauseTask
const stableGrouped = {} as Record<ColumnType, Task[]>;
for (const column of COLUMNS) {
const sortedTasks = sortTasksForColumn(nextGrouped[column]);
const sortedTasks = sortTasksForColumn(nextGrouped[column], column);
stableGrouped[column] = areTaskArraysEqual(previousGrouped[column], sortedTasks)
? previousGrouped[column]
: sortedTasks;