Skip to content

Refactor: Extract branch loading logic into shared function #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2025
Merged

Refactor: Extract branch loading logic into shared function #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a17e094
Refactor directory selection to extract branch loading logic
built-by-as Oct 20, 2025
aacd68f
Simplify loadAndPopulateBranches to use module-level variable
built-by-as Oct 20, 2025
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
53 changes: 24 additions & 29 deletions renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,28 @@ let terminalSettings: TerminalSettings = { ...DEFAULT_SETTINGS };
// Track activity timers for each session
const activityTimers = new Map<string, NodeJS.Timeout>();

async function loadAndPopulateBranches(
directory: string,
selectedBranch?: string
): Promise<void> {
const branches = await ipcRenderer.invoke("get-branches", directory);
parentBranchSelect.innerHTML = "";

if (branches.length === 0) {
parentBranchSelect.innerHTML = '<option value="">No git repository found</option>';
} else {
branches.forEach((branch: string) => {
const option = document.createElement("option");
option.value = branch;
option.textContent = branch;
if (branch === selectedBranch) {
option.selected = true;
}
parentBranchSelect.appendChild(option);
});
}
}

function createTerminalUI(sessionId: string) {
const themeColors = THEME_PRESETS[terminalSettings.theme] || THEME_PRESETS["macos-dark"];

Expand Down Expand Up @@ -805,22 +827,7 @@ document.getElementById("new-session")?.addEventListener("click", async () => {
projectDirInput.value = lastSettings.projectDir;

// Load git branches for the last directory
const branches = await ipcRenderer.invoke("get-branches", lastSettings.projectDir);
parentBranchSelect.innerHTML = "";

if (branches.length === 0) {
parentBranchSelect.innerHTML = '<option value="">No git repository found</option>';
} else {
branches.forEach((branch: string) => {
const option = document.createElement("option");
option.value = branch;
option.textContent = branch;
if (branch === lastSettings.parentBranch) {
option.selected = true;
}
parentBranchSelect.appendChild(option);
});
}
await loadAndPopulateBranches(lastSettings.projectDir, lastSettings.parentBranch);
}

// Set last used coding agent
Expand Down Expand Up @@ -855,19 +862,7 @@ browseDirBtn?.addEventListener("click", async () => {
projectDirInput.value = dir;

// Load git branches
const branches = await ipcRenderer.invoke("get-branches", dir);
parentBranchSelect.innerHTML = "";

if (branches.length === 0) {
parentBranchSelect.innerHTML = '<option value="">No git repository found</option>';
} else {
branches.forEach((branch: string) => {
const option = document.createElement("option");
option.value = branch;
option.textContent = branch;
parentBranchSelect.appendChild(option);
});
}
await loadAndPopulateBranches(dir);
}
});

Expand Down