Skip to content

Commit ee4665d

Browse files
committed
fix: prevent crash when listBranches omits remote fields
- Default remoteBranches/remoteBranchGroups/recommendedTrunk in useCreationWorkspace - Update Storybook ORPC mock to include required branch fields Change-Id: Ia717febfc7f3f460c138ec96aaf73843a200a76b Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent 2dfb968 commit ee4665d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.storybook/mocks/orpc.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ export function createMockORPCClient(options: MockORPCClientOptions = {}): APICl
162162
pickDirectory: async () => null,
163163
listBranches: async () => ({
164164
branches: ["main", "develop", "feature/new-feature"],
165+
remoteBranches: [],
166+
remoteBranchGroups: [],
165167
recommendedTrunk: "main",
166168
}),
167169
remove: async (input: { projectPath: string }) => {

src/browser/components/ChatInput/useCreationWorkspace.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,11 @@ export function useCreationWorkspace({
184184
const loadBranches = async () => {
185185
try {
186186
const result = await api.projects.listBranches({ projectPath });
187-
setBranches(result.branches);
188-
setRemoteBranches(result.remoteBranches);
189-
setRemoteBranchGroups(result.remoteBranchGroups);
190-
setRecommendedTrunk(result.recommendedTrunk);
187+
// Defensive: tolerate older backends/mocks that may omit newer fields.
188+
setBranches(result.branches ?? []);
189+
setRemoteBranches(result.remoteBranches ?? []);
190+
setRemoteBranchGroups(result.remoteBranchGroups ?? []);
191+
setRecommendedTrunk(result.recommendedTrunk ?? null);
191192
} catch (err) {
192193
console.error("Failed to load branches:", err);
193194
} finally {

0 commit comments

Comments
 (0)