Merge pull request #11151 from gitbutlerapp/cleanup-stale-selection

Branch selection: If the branch is not part of the listing, remove it

Author: estib-vega

apps/desktop/src/lib/bootstrap/deps.ts

@@ -191,7 +191,7 @@ export function initDependencies(args: {
 
 	const gitService = new GitService(backend, clientState.backendApi);
 	const baseBranchService = new BaseBranchService(clientState.backendApi);
-	const branchService = new BranchService(clientState['backendApi']);
+	const branchService = new BranchService(clientState['backendApi'], uiState);
 	const cherryApplyService = new CherryApplyService(clientState.backendApi);
 	const remotesService = new RemotesService(backend);
 	const hooksService = new HooksService(clientState.backendApi);

apps/desktop/src/lib/branches/branchService.svelte.ts

@@ -1,4 +1,5 @@
 import { invalidatesList, providesList, ReduxTag } from '$lib/state/tags';
+import { retainBranchSelectionInBranchesView, type UiState } from '$lib/state/uiState.svelte';
 import { InjectionToken } from '@gitbutler/core/context';
 import type { BranchListing, BranchListingDetails } from '$lib/branches/branchListing';
 import type { BackendApi, ClientState } from '$lib/state/clientState.svelte';
@@ -8,8 +9,8 @@ export const BRANCH_SERVICE = new InjectionToken<BranchService>('BranchService')
 export class BranchService {
 	private api: ReturnType<typeof injectEndpoints>;
 
-	constructor(backendApi: BackendApi) {
-		this.api = injectEndpoints(backendApi);
+	constructor(backendApi: BackendApi, uiState: UiState) {
+		this.api = injectEndpoints(backendApi, uiState);
 	}
 
 	list(projectId: string) {
@@ -25,13 +26,18 @@ export class BranchService {
 	}
 }
 
-function injectEndpoints(api: ClientState['backendApi']) {
+function injectEndpoints(api: ClientState['backendApi'], uiState: UiState) {
 	return api.injectEndpoints({
 		endpoints: (build) => ({
 			listBranches: build.query<BranchListing[], { projectId: string }>({
 				extraOptions: { command: 'list_branches' },
 				query: (args) => args,
-				providesTags: [providesList(ReduxTag.BranchListing)]
+				providesTags: [providesList(ReduxTag.BranchListing)],
+				transformResponse: (response: BranchListing[], _, { projectId }) => {
+					const branches = response.map((branch) => branch.name);
+					retainBranchSelectionInBranchesView(uiState, projectId, branches);
+					return response;
+				}
 			}),
 			branchDetails: build.query<BranchListingDetails, { projectId: string; branchName: string }>({
 				extraOptions: { command: 'get_branch_listing_details' },

apps/desktop/src/lib/state/uiState.svelte.ts

@@ -528,7 +528,7 @@ export function updateStalePrSelection(uiState: UiState, projectId: string, prs:
 	}
 }
 
-export function updateStaleStackSelectionInBranchesView(
+export function updateStaleBranchSelectionInBranchesView(
 	uiState: UiState,
 	projectId: string,
 	deletedBranches: string[]
@@ -539,3 +539,15 @@ export function updateStaleStackSelectionInBranchesView(
 		projectState.branchesSelection.set({});
 	}
 }
+
+export function retainBranchSelectionInBranchesView(
+	uiState: UiState,
+	projectId: string,
+	branches: string[]
+) {
+	const projectState = uiState.project(projectId);
+	const selection = projectState.branchesSelection.current;
+	if (selection.branchName && !branches.includes(selection.branchName)) {
+		projectState.branchesSelection.set({});
+	}
+}

apps/desktop/src/lib/upstream/upstreamIntegrationService.svelte.ts

@@ -1,5 +1,5 @@
 import { invalidatesList, providesList, ReduxTag } from '$lib/state/tags';
-import { updateStaleStackSelectionInBranchesView, type UiState } from '$lib/state/uiState.svelte';
+import { updateStaleBranchSelectionInBranchesView, type UiState } from '$lib/state/uiState.svelte';
 import { InjectionToken } from '@gitbutler/core/context';
 import { isDefined } from '@gitbutler/ui/utils/typeguards';
 import type { StackService } from '$lib/stacks/stackService.svelte';
@@ -103,7 +103,7 @@ function injectEndpoints(api: ClientState['backendApi'], uiState: UiState) {
 					invalidatesList(ReduxTag.BranchListing)
 				],
 				transformResponse: (response: IntegrationOutcome, _, { projectId }) => {
-					updateStaleStackSelectionInBranchesView(uiState, projectId, response.deletedBranches);
+					updateStaleBranchSelectionInBranchesView(uiState, projectId, response.deletedBranches);
 					return response;
 				}
 			}),