From 5b42e6e9e6d7230e6333dfc740a159fc24a14c81 Mon Sep 17 00:00:00 2001
From: Caleb Owens <caleb@gitbutler.com>
Date: Wed, 3 Jul 2024 17:18:11 +0200
Subject: [PATCH] Remove virtual flag from front end

---
 app/src/lib/branch/ActiveBranchStatus.svelte  | 11 +--
 app/src/lib/branch/BranchCard.svelte          | 26 ++++---
 app/src/lib/branch/BranchHeader.svelte        | 52 +++++++-------
 app/src/lib/branch/BranchLanePopupMenu.svelte |  3 +-
 app/src/lib/branches/service.ts               |  2 +-
 app/src/lib/branches/types.ts                 |  3 +-
 app/src/lib/commit/CommitCard.svelte          |  2 +-
 .../lib/components/PullRequestPreview.svelte  | 13 +---
 app/src/lib/navigation/BranchItem.svelte      |  3 +-
 app/src/lib/testing/fixtures.ts               |  1 -
 app/src/lib/vbranches/types.ts                |  2 -
 app/src/lib/vbranches/virtualBranch.ts        | 47 ++++++------
 .../stashed/[branchId]/+page.svelte           | 71 -------------------
 13 files changed, 64 insertions(+), 172 deletions(-)
 delete mode 100644 app/src/routes/[projectId]/stashed/[branchId]/+page.svelte

diff --git a/app/src/lib/branch/ActiveBranchStatus.svelte b/app/src/lib/branch/ActiveBranchStatus.svelte
index 1e0b60e73..9666daa8f 100644
--- a/app/src/lib/branch/ActiveBranchStatus.svelte
+++ b/app/src/lib/branch/ActiveBranchStatus.svelte
@@ -15,16 +15,7 @@
 </script>
 
 {#if !remoteExists}
-	{#if !$branch.active}
-		<Button
-			clickable={false}
-			size="tag"
-			icon="virtual-branch-small"
-			style="neutral"
-			help="These changes are stashed away from your working directory."
-			reversedDirection>unapplied</Button
-		>
-	{:else if hasIntegratedCommits}
+	{#if hasIntegratedCommits}
 		<Button
 			clickable={false}
 			size="tag"
diff --git a/app/src/lib/branch/BranchCard.svelte b/app/src/lib/branch/BranchCard.svelte
index 086a2e08d..393217beb 100644
--- a/app/src/lib/branch/BranchCard.svelte
+++ b/app/src/lib/branch/BranchCard.svelte
@@ -110,7 +110,7 @@
 		<div
 			class="branch-card hide-native-scrollbar"
 			data-tauri-drag-region
-			class:target-branch={branch.active && branch.selectedForChanges}
+			class:target-branch={branch.selectedForChanges}
 		>
 			<ScrollableContainer
 				wide
@@ -148,7 +148,7 @@
 										showCheckboxes={$commitBoxOpen}
 										allowMultiple
 									/>
-									{#if branch.active && branch.conflicted}
+									{#if branch.conflicted}
 										<div class="card-notifications">
 											<InfoMessage filled outlined={false} style="error">
 												<svelte:fragment slot="title">
@@ -164,18 +164,16 @@
 									{/if}
 								</Dropzones>
 
-								{#if branch.active}
-									<CommitDialog
-										projectId={project.id}
-										expanded={commitBoxOpen}
-										hasSectionsAfter={branch.commits.length > 0}
-										on:action={(e) => {
-											if (e.detail === 'generate-branch-name') {
-												generateBranchName();
-											}
-										}}
-									/>
-								{/if}
+								<CommitDialog
+									projectId={project.id}
+									expanded={commitBoxOpen}
+									hasSectionsAfter={branch.commits.length > 0}
+									on:action={(e) => {
+										if (e.detail === 'generate-branch-name') {
+											generateBranchName();
+										}
+									}}
+								/>
 							</div>
 						{:else if branch.commits.length === 0}
 							<Dropzones>
diff --git a/app/src/lib/branch/BranchHeader.svelte b/app/src/lib/branch/BranchHeader.svelte
index 93bdeb4a0..179e3b174 100644
--- a/app/src/lib/branch/BranchHeader.svelte
+++ b/app/src/lib/branch/BranchHeader.svelte
@@ -182,33 +182,31 @@
 
 			<div class="header__actions">
 				<div class="header__buttons">
-					{#if branch.active}
-						{#if branch.selectedForChanges}
-							<Button
-								style="pop"
-								kind="soft"
-								help="New changes will land here"
-								icon="target"
-								clickable={false}
-								disabled={isUnapplied}
-							>
-								Default branch
-							</Button>
-						{:else}
-							<Button
-								style="ghost"
-								outline
-								help="When selected, new changes will land here"
-								icon="target"
-								disabled={isUnapplied}
-								on:click={async () => {
-									isTargetBranchAnimated = true;
-									await branchController.setSelectedForChanges(branch.id);
-								}}
-							>
-								Set as default
-							</Button>
-						{/if}
+					{#if branch.selectedForChanges}
+						<Button
+							style="pop"
+							kind="soft"
+							help="New changes will land here"
+							icon="target"
+							clickable={false}
+							disabled={isUnapplied}
+						>
+							Default branch
+						</Button>
+					{:else}
+						<Button
+							style="ghost"
+							outline
+							help="When selected, new changes will land here"
+							icon="target"
+							disabled={isUnapplied}
+							on:click={async () => {
+								isTargetBranchAnimated = true;
+								await branchController.setSelectedForChanges(branch.id);
+							}}
+						>
+							Set as default
+						</Button>
 					{/if}
 				</div>
 
diff --git a/app/src/lib/branch/BranchLanePopupMenu.svelte b/app/src/lib/branch/BranchLanePopupMenu.svelte
index 2a5aa4c30..edc6e6a44 100644
--- a/app/src/lib/branch/BranchLanePopupMenu.svelte
+++ b/app/src/lib/branch/BranchLanePopupMenu.svelte
@@ -191,8 +191,7 @@
 				}}
 				disabled={isUnapplied ||
 					!($aiGenEnabled && aiConfigurationValid) ||
-					branch.files?.length === 0 ||
-					!branch.active}
+					branch.files?.length === 0}
 			/>
 		</ContextMenuSection>
 
diff --git a/app/src/lib/branches/service.ts b/app/src/lib/branches/service.ts
index 5e548c262..bf68a6430 100644
--- a/app/src/lib/branches/service.ts
+++ b/app/src/lib/branches/service.ts
@@ -137,7 +137,7 @@ function mergeBranchesAndPrs(
 
 	// This should be everything considered a branch in one list
 	const filtered = contributions
-		.filter((b) => !b.vbranch || !b.vbranch.active)
+		.filter((b) => !b.vbranch)
 		.sort((a, b) => {
 			return (a.modifiedAt || new Date(0)) < (b.modifiedAt || new Date(0)) ? 1 : -1;
 		});
diff --git a/app/src/lib/branches/types.ts b/app/src/lib/branches/types.ts
index 8cd1439ad..b373678ee 100644
--- a/app/src/lib/branches/types.ts
+++ b/app/src/lib/branches/types.ts
@@ -64,10 +64,9 @@ export class CombinedBranch {
 	}
 
 	// GH colors reference https://github.blog/changelog/2021-06-08-new-issue-and-pull-request-state-icons
-	get color(): 'neutral' | 'success' | 'pop' | 'purple' | undefined {
+	get color(): 'neutral' | 'success' | 'purple' | undefined {
 		if (this.pr?.mergedAt) return 'purple'; // merged PR
 		if (this.pr) return 'success'; // open PR
-		if (this.vbranch && this.vbranch.active === false) return 'pop'; // stashed virtual branches
 		// if (this.remoteBranch?.isMergeable) return 'success'; // remote branches
 		return 'neutral';
 	}
diff --git a/app/src/lib/commit/CommitCard.svelte b/app/src/lib/commit/CommitCard.svelte
index e6c02209a..0d13d59c1 100644
--- a/app/src/lib/commit/CommitCard.svelte
+++ b/app/src/lib/commit/CommitCard.svelte
@@ -74,7 +74,7 @@
 		branchController.undoCommit(branch.id, commit.id);
 	}
 
-	let isUndoable = !!branch?.active && commit instanceof Commit;
+	let isUndoable = commit instanceof Commit;
 
 	const hasCommitUrl = !commit.isLocal && commitUrl;
 
diff --git a/app/src/lib/components/PullRequestPreview.svelte b/app/src/lib/components/PullRequestPreview.svelte
index 86f15d1a1..b32e22507 100644
--- a/app/src/lib/components/PullRequestPreview.svelte
+++ b/app/src/lib/components/PullRequestPreview.svelte
@@ -70,20 +70,9 @@
 				`refs/remotes/${remoteName}/${pullrequest.sourceBranch}`
 			);
 			await virtualBranchService.reload();
-			const vbranch = await virtualBranchService.getByUpstreamSha(pullrequest.sha);
 
 			// This is a little absurd, but it makes it soundly typed
-			if (!vbranch) {
-				goto(`/${project.id}/board`);
-				return;
-			}
-
-			// Active seems to be a more reliable metric to determine whether to go to the branch page
-			if (vbranch.active) {
-				goto(`/${project.id}/board`);
-			} else {
-				goto(`/${project.id}/stashed/${vbranch.id}`);
-			}
+			goto(`/${project.id}/board`);
 
 			createRemoteModal?.close();
 		} finally {
diff --git a/app/src/lib/navigation/BranchItem.svelte b/app/src/lib/navigation/BranchItem.svelte
index a7e9f09e2..ed2925bf9 100644
--- a/app/src/lib/navigation/BranchItem.svelte
+++ b/app/src/lib/navigation/BranchItem.svelte
@@ -9,8 +9,7 @@
 	export let branch: CombinedBranch;
 
 	function getBranchLink(b: CombinedBranch): string | undefined {
-		if (b.vbranch?.active) return `/${projectId}/board/`;
-		if (b.vbranch) return `/${projectId}/stashed/${b.vbranch.id}`;
+		if (b.vbranch) return `/${projectId}/board/`;
 		if (b.remoteBranch) return `/${projectId}/remote/${branch?.remoteBranch?.displayName}`;
 		if (b.pr) return `/${projectId}/pull/${b.pr.number}`;
 	}
diff --git a/app/src/lib/testing/fixtures.ts b/app/src/lib/testing/fixtures.ts
index ca95b09e2..d7a800a3c 100644
--- a/app/src/lib/testing/fixtures.ts
+++ b/app/src/lib/testing/fixtures.ts
@@ -156,7 +156,6 @@ export const file1 = {
 };
 
 export const virtualBranch = {
-	active: true,
 	baseCurrent: true,
 	commits: [],
 	conflicted: false,
diff --git a/app/src/lib/vbranches/types.ts b/app/src/lib/vbranches/types.ts
index ee4d13890..0d37e631c 100644
--- a/app/src/lib/vbranches/types.ts
+++ b/app/src/lib/vbranches/types.ts
@@ -99,8 +99,6 @@ export class Branch {
 	id!: string;
 	name!: string;
 	notes!: string;
-	// Active means the branch has been applied to the workspace
-	active!: boolean;
 	@Type(() => LocalFile)
 	files!: LocalFile[];
 	@Type(() => Commit)
diff --git a/app/src/lib/vbranches/virtualBranch.ts b/app/src/lib/vbranches/virtualBranch.ts
index 56ee16b9e..a91c07875 100644
--- a/app/src/lib/vbranches/virtualBranch.ts
+++ b/app/src/lib/vbranches/virtualBranch.ts
@@ -24,7 +24,6 @@ import { writable, type Readable } from 'svelte/store';
 
 export class VirtualBranchService {
 	branches$: Observable<Branch[] | undefined>;
-	stashedBranches$: Observable<Branch[] | undefined>;
 	activeBranches$: Observable<Branch[] | undefined>;
 	branchesError = writable<any>();
 	private reload$ = new BehaviorSubject<void>(undefined);
@@ -67,10 +66,6 @@ export class VirtualBranchService {
 			shareReplay(1)
 		);
 
-		this.stashedBranches$ = this.branches$.pipe(
-			map((branches) => branches?.filter((b) => !b.active))
-		);
-
 		// We need upstream data to be part of the branch without delay since the way we render
 		// commits depends on it.
 		// TODO: Move this async behavior into the rust code.
@@ -80,29 +75,27 @@ export class VirtualBranchService {
 			switchMap((branches) => {
 				if (!branches) return of();
 				return Promise.all(
-					branches
-						.filter((b) => b.active)
-						.map(async (b) => {
-							const upstreamName = b.upstream?.name;
-							if (upstreamName) {
-								try {
-									const data = await getRemoteBranchData(projectId, upstreamName);
-									const commits = data.commits;
-									commits.forEach((uc) => {
-										const match = b.commits.find((c) => commitCompare(uc, c));
-										if (match) {
-											match.relatedTo = uc;
-											uc.relatedTo = match;
-										}
-									});
-									linkAsParentChildren(commits);
-									b.upstreamData = data;
-								} catch (e: any) {
-									console.log(e);
-								}
+					branches.map(async (b) => {
+						const upstreamName = b.upstream?.name;
+						if (upstreamName) {
+							try {
+								const data = await getRemoteBranchData(projectId, upstreamName);
+								const commits = data.commits;
+								commits.forEach((uc) => {
+									const match = b.commits.find((c) => commitCompare(uc, c));
+									if (match) {
+										match.relatedTo = uc;
+										uc.relatedTo = match;
+									}
+								});
+								linkAsParentChildren(commits);
+								b.upstreamData = data;
+							} catch (e: any) {
+								console.log(e);
 							}
-							return b;
-						})
+						}
+						return b;
+					})
 				);
 			})
 		);
diff --git a/app/src/routes/[projectId]/stashed/[branchId]/+page.svelte b/app/src/routes/[projectId]/stashed/[branchId]/+page.svelte
deleted file mode 100644
index b2aaf43ff..000000000
--- a/app/src/routes/[projectId]/stashed/[branchId]/+page.svelte
+++ /dev/null
@@ -1,71 +0,0 @@
-<script lang="ts">
-	// This page is displayed when:
-	// - A vbranch is found
-	// It may also display details about a cooresponding remote and/or pr if they exist
-	import BranchLane from '$lib/branch/BranchLane.svelte';
-	import FullviewLoading from '$lib/components/FullviewLoading.svelte';
-	import Button from '$lib/shared/Button.svelte';
-	import Modal from '$lib/shared/Modal.svelte';
-	import type { PageData } from './$types';
-	import { goto } from '$app/navigation';
-	import { page } from '$app/stores';
-
-	export let data: PageData;
-
-	let applyConflictedModal: Modal;
-	let deleteBranchModal: Modal;
-
-	$: ({ projectId, branchController, vbranchService } = data);
-	$: branches$ = vbranchService.branches$;
-	$: error = vbranchService.branchesError;
-
-	$: branch = $branches$?.find((b) => b.id === $page.params.branchId);
-</script>
-
-{#if $error}
-	<p>{JSON.stringify($error)}</p>
-{:else if !$branches$}
-	<FullviewLoading />
-{:else if branch}
-	<BranchLane {branch} isUnapplied={!branch.active} />
-{:else}
-	<p>Branch no longer exists</p>
-{/if}
-
-<Modal width="small" title="Merge conflicts" bind:this={applyConflictedModal}>
-	<p>Applying this branch will introduce merge conflicts.</p>
-	{#snippet controls(close, item)}
-		<Button style="ghost" outline on:click={close}>Cancel</Button>
-		<Button
-			style="pop"
-			kind="solid"
-			on:click={() => {
-				branchController.applyBranch(item.id);
-				close();
-				goto(`/${projectId}/board`);
-			}}
-		>
-			Update
-		</Button>
-	{/snippet}
-</Modal>
-
-<Modal width="small" title="Delete branch" bind:this={deleteBranchModal}>
-	{#snippet children(item)}
-		Deleting <code class="code-string">{item.name}</code> cannot be undone.
-	{/snippet}
-	{#snippet controls(close, item)}
-		<Button style="ghost" outline on:mousedown={close}>Cancel</Button>
-		<Button
-			style="error"
-			kind="solid"
-			on:click={() => {
-				branchController.deleteBranch(item.id);
-				close();
-				goto(`/${projectId}/board`);
-			}}
-		>
-			Delete
-		</Button>
-	{/snippet}
-</Modal>