ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-01 20:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Include remote branches in PR base selection even when local branch exists

Browse Source 
The branch listing logic now correctly shows remote branches (e.g., "origin/main") even if a local branch with the same base name exists, since users need remote branches as PR base targets. Also extracted duplicate state reset logic in create-pr-dialog into a reusable function.
This commit is contained in:
Shirone
2026-01-14 18:36:14 +01:00
parent 07593f8704
commit 0898578c11
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/server/src/routes/worktree/routes/list-branches.ts
View File

@@ -92,12 +92,12 @@ export function createListBranchesHandler() {
// Skip HEAD pointers like "origin/HEAD"
if (cleanName.includes('/HEAD')) return;
// Extract the branch name without the remote prefix for deduplication
// e.g., "origin/main" -> "main"
const branchNameWithoutRemote = cleanName.replace(/^[^/]+\//, '');
// Only add remote branches that don't exist locally (to avoid duplicates)
if (!localBranchNames.has(branchNameWithoutRemote)) {
// Only add remote branches if a branch with the exact same name isn't already
// in the list. This avoids duplicates if a local branch is named like a remote one.
// Note: We intentionally include remote branches even when a local branch with the
// same base name exists (e.g., show "origin/main" even if local "main" exists),
// since users need to select remote branches as PR base targets.
if (!localBranchNames.has(cleanName)) {
branches.push({
name: cleanName, // Keep full name like "origin/main"
isCurrent: false,

49
apps/ui/src/components/views/board-view/dialogs/create-pr-dialog.tsx
View File

@@ -59,6 +59,21 @@ export function CreatePRDialog({
// Track whether an operation completed that warrants a refresh
const operationCompletedRef = useRef(false);
// Common state reset function to avoid duplication
const resetState = useCallback(() => {
setTitle('');
setBody('');
setCommitMessage('');
setBaseBranch(defaultBaseBranch);
setIsDraft(false);
setError(null);
setPrUrl(null);
setBrowserUrl(null);
setShowBrowserFallback(false);
operationCompletedRef.current = false;
setBranches([]);
}, [defaultBaseBranch]);
// Fetch branches for autocomplete
const fetchBranches = useCallback(async () => {
if (!worktree?.path) return;
@@ -87,39 +102,13 @@ export function CreatePRDialog({
// Reset state when dialog opens or worktree changes
useEffect(() => {
// Reset all state on both open and close
resetState();
if (open) {
// Reset form fields
setTitle('');
setBody('');
setCommitMessage('');
setBaseBranch(defaultBaseBranch);
setIsDraft(false);
setError(null);
// Also reset result states when opening for a new worktree
// This prevents showing stale PR URLs from previous worktrees
setPrUrl(null);
setBrowserUrl(null);
setShowBrowserFallback(false);
// Reset operation tracking
operationCompletedRef.current = false;
// Reset branches and fetch fresh ones
setBranches([]);
// Fetch fresh branches when dialog opens
fetchBranches();
} else {
// Reset everything when dialog closes
setTitle('');
setBody('');
setCommitMessage('');
setBaseBranch(defaultBaseBranch);
setIsDraft(false);
setError(null);
setPrUrl(null);
setBrowserUrl(null);
setShowBrowserFallback(false);
operationCompletedRef.current = false;
setBranches([]);
}
}, [open, worktree?.path, defaultBaseBranch, fetchBranches]);
}, [open, worktree?.path, resetState, fetchBranches]);
const handleCreate = async () => {
if (!worktree) return;