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

feat(HAI-004): complete Step 1 — close modal immediately on merge

Browse Source
This commit is contained in:
Dustin Byrne
2026-03-25 20:35:46 -04:00
parent e946a34c59
commit 1f31cc22fa
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/dashboard/app/components/TaskDetailModal.tsx
View File

@@ -61,18 +61,20 @@ export function TaskDetailModal({
}
}, [task.id, onDeleteTask, onClose, addToast]);
const handleMerge = useCallback(async () => {
const handleMerge = useCallback(() => {
if (!confirm(`Merge ${task.id} into the current branch?`)) return;
try {
const result = await onMergeTask(task.id);
onClose();
const msg = result.merged
? `Merged ${task.id} (branch: ${result.branch})`
: `Closed ${task.id} (${result.error || "no branch to merge"})`;
addToast(msg, "success");
} catch (err: any) {
addToast(err.message, "error");
}
onClose();
addToast(`Merging ${task.id}...`, "info");
onMergeTask(task.id)
.then((result) => {
const msg = result.merged
? `Merged ${task.id} (branch: ${result.branch})`
: `Closed ${task.id} (${result.error || "no branch to merge"})`;
addToast(msg, "success");
})
.catch((err: any) => {
addToast(err.message, "error");
});
}, [task.id, onMergeTask, onClose, addToast]);
const transitions = VALID_TRANSITIONS[task.column] || [];