starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-10-30 16:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
centdix
2026-02-22 14:11:44 +00:00
parent ed6aaeeea3
commit 98ac164ac8
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-dashboard/frontend/src/App.svelte
+10 -16
View File
@@ -75,18 +75,19 @@
}
}
function selectNeighborOf(branch: string) {
if (selectedBranch !== branch) return;
const idx = visibleWorktrees.findIndex((w) => w.branch === branch);
const neighbor = visibleWorktrees[idx - 1] ?? visibleWorktrees[idx + 1];
const isNeighborMain = neighbor && (neighbor.path === "(here)" || neighbor.branch === "main");
selectedBranch = neighbor && !isNeighborMain ? neighbor.branch : null;
}
async function handleRemove() {
const branch = removeBranch;
if (!branch) return;
removeBranch = null;
// Select neighbor before starting the async removal
if (selectedBranch === branch) {
const idx = visibleWorktrees.findIndex((w) => w.branch === branch);
const neighbor = visibleWorktrees[idx - 1] ?? visibleWorktrees[idx + 1];
const isNeighborMain = neighbor && (neighbor.path === "(here)" || neighbor.branch === "main");
selectedBranch = neighbor && !isNeighborMain ? neighbor.branch : null;
}
selectNeighborOf(branch);
removingBranches = new Set([...removingBranches, branch]);
try {
@@ -108,14 +109,7 @@
try {
await api.mergeWorktree(branch);
mergeBranch = null;
if (selectedBranch === branch) {
const idx = visibleWorktrees.findIndex((w) => w.branch === branch);
const neighbor = visibleWorktrees[idx - 1] ?? visibleWorktrees[idx + 1];
const isNeighborMain = neighbor && (neighbor.path === "(here)" || neighbor.branch === "main");
selectedBranch = neighbor && !isNeighborMain ? neighbor.branch : null;
}
selectNeighborOf(branch);
await refresh();
} catch (err) {
mergeError = err instanceof Error ? err.message : String(err);