feat: update base after integration of parent

Author: ndom91

apps/desktop/src/lib/branch/SeriesHeader.svelte

@@ -38,10 +38,11 @@
 	interface Props {
 		branch: PatchSeries;
 		isTopSeries: boolean;
+		isBottomSeries: boolean;
 		lastPush: Date | undefined;
 	}
 
-	const { branch, isTopSeries, lastPush }: Props = $props();
+	const { branch, isTopSeries, isBottomSeries, lastPush }: Props = $props();
 
 	let descriptionVisible = $state(!!branch.description);
 
@@ -163,6 +164,28 @@
 		}
 	});
 
+	/**
+	 * If the repository does not have "delete after merged" enabled, we need to manually update the base
+	 * of the bottom most branch to point to the projects baseBranch of choice after its parent has been integrated,
+	 * and  it now is the bottom-most series.
+	 */
+	$effect(() => {
+		const targetBase = $baseBranch.branchName.replace(`${$baseBranch.remoteName}/`, '');
+		if (
+			listedPr?.targetBranch !== targetBase &&
+			isBottomSeries &&
+			$prService &&
+			$forge?.name === 'github' &&
+			branch.prNumber &&
+			$pr?.state === 'open'
+		) {
+			$prService?.update(branch.prNumber, { targetBase }).then(async () => {
+				await $forgeListing?.refresh();
+				await updateStatusAndChecks();
+			});
+		}
+	});
+
 	function confirmCreatePR(close: () => void) {
 		close();
 		prDetailsModal?.show();

apps/desktop/src/lib/forge/github/githubPrService.ts

@@ -99,14 +99,18 @@ export class GitHubPrService implements ForgePrService {
 		return new GitHubPrMonitor(this, this.repo, prNumber, this.baseBranch);
 	}
 
-	async update(prNumber: number, details: { description?: string; state?: 'open' | 'closed' }) {
-		const { description, state } = details;
+	async update(
+		prNumber: number,
+		details: { description?: string; state?: 'open' | 'closed'; targetBase?: string }
+	) {
+		const { description, state, targetBase } = details;
 		await this.octokit.pulls.update({
 			owner: this.repo.owner,
 			repo: this.repo.name,
 			pull_number: prNumber,
 			body: description,
-			state: state
+			state: state,
+			base: targetBase
 		});
 	}
 }

apps/desktop/src/lib/forge/interface/forgePrService.ts

@@ -22,6 +22,6 @@ export interface ForgePrService {
 	prMonitor(prNumber: number): ForgePrMonitor;
 	update(
 		prNumber: number,
-		details: { description?: string; state?: 'open' | 'closed' }
+		details: { description?: string; state?: 'open' | 'closed'; targetBase?: string }
 	): Promise<void>;
 }

apps/desktop/src/lib/stack/SeriesList.svelte

@@ -62,7 +62,7 @@
 
 {#each nonArchivedSeries as currentSeries, idx ('name' in currentSeries ? currentSeries.name : undefined)}
 	{@const isTopSeries = idx === 0}
-	{@const isBottomSeries = idx === branch.series.length - 1}
+	{@const isBottomSeries = idx === nonArchivedSeries.length - 1}
 	{#if !isTopSeries}
 		<SeriesDividerLine
 			topPatchStatus={isPatchSeries(currentSeries) ? currentSeries?.patches?.[0]?.status : 'error'}
@@ -71,7 +71,7 @@
 
 	{#if !isError(currentSeries)}
 		<CurrentSeries {currentSeries}>
-			<SeriesHeader branch={currentSeries} {isTopSeries} {lastPush} />
+			<SeriesHeader branch={currentSeries} {isTopSeries} {isBottomSeries} {lastPush} />
 
 			{#if currentSeries.upstreamPatches.length === 0 && currentSeries.patches.length === 0}
 				<div>