Merge pull request #5650 from gitbutlerapp/upstream-integration-refactor

Upstream integration refactor

Author: Caleb-T-Owens

apps/desktop/src/lib/components/IntegrateUpstreamModal.svelte

@@ -29,7 +29,6 @@
 	import { pxToRem } from '@gitbutler/ui/utils/pxToRem';
 	import { tick } from 'svelte';
 	import { SvelteMap } from 'svelte/reactivity';
-	import type { Readable } from 'svelte/store';
 
 	type OperationState = 'inert' | 'loading' | 'completed';
 
@@ -41,7 +40,7 @@
 
 	const forge = getForge();
 	const upstreamIntegrationService = getContext(UpstreamIntegrationService);
-	let branchStatuses = $state<Readable<StackStatusesWithBranches | undefined>>();
+	let branchStatuses = $state<StackStatusesWithBranches | undefined>();
 	const baseBranchService = getContext(BaseBranchService);
 	const base = baseBranchService.base;
 
@@ -55,12 +54,12 @@
 	let isDivergedResolved = $derived($base?.diverged && !baseResolutionApproach);
 
 	$effect(() => {
-		if ($branchStatuses?.type !== 'updatesRequired') {
+		if (branchStatuses?.type !== 'updatesRequired') {
 			statuses = [];
 			return;
 		}
 
-		const statusesTmp = [...$branchStatuses.subject];
+		const statusesTmp = [...branchStatuses.subject];
 		statusesTmp.sort(sortStatusInfo);
 
 		// Side effect, refresh results
@@ -85,7 +84,9 @@
 	// Re-fetch upstream statuses if the target commit oid changes
 	$effect(() => {
 		if (targetCommitOid) {
-			branchStatuses = upstreamIntegrationService.upstreamStatuses(targetCommitOid);
+			upstreamIntegrationService.upstreamStatuses(targetCommitOid).then((statuses) => {
+				branchStatuses = statuses;
+			});
 		}
 	});
 
@@ -122,9 +123,9 @@
 
 	export async function show() {
 		integratingUpstream = 'inert';
-		branchStatuses = upstreamIntegrationService.upstreamStatuses();
-		await tick();
+		branchStatuses = undefined;
 		modal?.show();
+		branchStatuses = await upstreamIntegrationService.upstreamStatuses();
 	}
 
 	export const imports = {
@@ -286,8 +287,8 @@
 				type="submit"
 				style="pop"
 				kind="solid"
-				disabled={isDivergedResolved}
-				loading={integratingUpstream === 'loading'}>Update workspace</Button
+				disabled={isDivergedResolved || !branchStatuses}
+				loading={integratingUpstream === 'loading' || !branchStatuses}>Update workspace</Button
 			>
 		</div>
 	{/snippet}

apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts

@@ -1,7 +1,7 @@
 import { invoke } from '$lib/backend/ipc';
 import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
 import { isDefined } from '@gitbutler/ui/utils/typeguards';
-import { derived, readable, type Readable } from 'svelte/store';
+import { get } from 'svelte/store';
 import type { Project } from '$lib/backend/projects';
 import type { VirtualBranch } from '$lib/vbranches/types';
 
@@ -119,39 +119,34 @@ export class UpstreamIntegrationService {
 		private virtualBranchService: VirtualBranchService
 	) {}
 
-	upstreamStatuses(targetCommitOid?: string): Readable<StackStatusesWithBranches | undefined> {
-		const branchStatuses = readable<BranchStatusesResponse | undefined>(undefined, (set) => {
-			invoke<BranchStatusesResponse>('upstream_integration_statuses', {
-				projectId: this.project.id,
-				targetCommitOid
-			}).then(set);
+	async upstreamStatuses(targetCommitOid?: string): Promise<StackStatusesWithBranches | undefined> {
+		const branchStatuses = await invoke<BranchStatusesResponse>('upstream_integration_statuses', {
+			projectId: this.project.id,
+			targetCommitOid
 		});
 
-		const branchStatusesWithBranches = derived(
-			[branchStatuses, this.virtualBranchService.branches],
-			([branchStatuses, branches]): StackStatusesWithBranches | undefined => {
-				if (!branchStatuses || !branches) return;
-				if (branchStatuses.type === 'upToDate') return branchStatuses;
-
-				return {
-					type: 'updatesRequired',
-					subject: branchStatuses.subject
-						.map((status) => {
-							const stack = branches.find((appliedBranch) => appliedBranch.id === status[0]);
-
-							if (!stack) return;
-
-							return {
-								stack,
-								status: status[1]
-							};
-						})
-						.filter(isDefined)
-				};
-			}
-		);
-
-		return branchStatusesWithBranches;
+		const branches = get(this.virtualBranchService.branches);
+
+		if (!branchStatuses || !branches) return;
+		if (branchStatuses.type === 'upToDate') return branchStatuses;
+
+		const stackStatusesWithBranches: StackStatusesWithBranches = {
+			type: 'updatesRequired',
+			subject: branchStatuses.subject
+				.map((status) => {
+					const stack = branches.find((appliedBranch) => appliedBranch.id === status[0]);
+
+					if (!stack) return;
+
+					return {
+						stack,
+						status: status[1]
+					};
+				})
+				.filter(isDefined)
+		};
+
+		return stackStatusesWithBranches;
 	}
 
 	async integrateUpstream(resolutions: Resolution[], baseBranchResolution?: BaseBranchResolution) {