Merge pull request #9448 from gitbutlerapp/desktop-ui-excl-action-update

Update branch rename logic and add exclusiveAction branch helper

Author: estib-vega

apps/desktop/src/components/MultiStackView.svelte

@@ -146,11 +146,9 @@
 		{#each mutableStacks as stack, i (stack.id)}
 			{@const stackState = uiState.stack(stack.id)}
 			{@const selection = stackState.selection}
-			{@const laneWraperMinWidth = laneWidths[i] ?? 0}
 			<div
 				class="reorderable-stack"
 				role="presentation"
-				style:min-width="{laneWraperMinWidth}px"
 				animate:flip={{ duration: 150 }}
 				onmousedown={onReorderMouseDown}
 				ondragstart={(e) => {

apps/desktop/src/lib/stacks/stackService.svelte.ts

@@ -12,6 +12,7 @@ import {
 	providesList,
 	ReduxTag
 } from '$lib/state/tags';
+import { replaceBranchInExclusiveAction, type UiState } from '$lib/state/uiState.svelte';
 import { isDefined } from '@gitbutler/ui/utils/typeguards';
 import {
 	createEntityAdapter,
@@ -28,7 +29,6 @@ import type { TreeChange, TreeChanges } from '$lib/hunks/change';
 import type { DiffSpec, Hunk } from '$lib/hunks/hunk';
 import type { BranchDetails, Stack, StackDetails } from '$lib/stacks/stack';
 import type { PropertiesFn } from '$lib/state/customHooks.svelte';
-import type { UiState } from '$lib/state/uiState.svelte';
 import type { User } from '$lib/user/user';
 
 type BranchParams = {
@@ -622,15 +622,26 @@ export class StackService {
 
 	get updateBranchName() {
 		return this.api.endpoints.updateBranchName.useMutation({
-			preEffect: (args) => {
-				const state = this.uiState.stack(args.stackId);
-				state.selection.set(undefined);
-			},
 			sideEffect: (_, args) => {
-				const state = this.uiState.stack(args.stackId);
-				state.selection.set({
+				// Immediately update the selection and the exclusive action.
+				const stackState = this.uiState.stack(args.stackId);
+				const projectState = this.uiState.project(args.projectId);
+				const exclusiveAction = projectState.exclusiveAction.current;
+				const previousSelection = stackState.selection.current ?? {};
+
+				stackState.selection.set({
+					...previousSelection,
 					branchName: args.newName
 				});
+
+				if (exclusiveAction) {
+					const updatedExclusiveAction = replaceBranchInExclusiveAction(
+						exclusiveAction,
+						args.branchName,
+						args.newName
+					);
+					projectState.exclusiveAction.set(updatedExclusiveAction);
+				}
 			},
 			onError: (_, args) => {
 				const state = this.uiState.stack(args.stackId);

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

@@ -246,3 +246,24 @@ export type GlobalProperty<T> = {
 type GlobalStore<T extends DefaultConfig> = {
 	[K in keyof T]: GlobalProperty<T[K]>;
 };
+
+export function replaceBranchInExclusiveAction(
+	action: ExclusiveAction,
+	oldBranchName: string,
+	branchName: string
+): ExclusiveAction {
+	switch (action.type) {
+		case 'commit':
+			if (action.branchName === oldBranchName) {
+				return { ...action, branchName };
+			}
+			return action;
+		case 'edit-commit-message':
+			return action; // No change needed
+		case 'create-pr':
+			if (action.branchName === oldBranchName) {
+				return { ...action, branchName };
+			}
+			return action;
+	}
+}