Merge pull request #2899 from appwrite/fix-reconnect-repo

HarshMN2345 · web-flow · commit 0c763d70278e · 2026-03-02T19:36:23.000+05:30
fix(sites): reconnect repo flow and branch selection
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -89,6 +89,6 @@
     },
     "overrides": {
         "vite": "npm:rolldown-vite@latest",
-        "minimatch": "10.2.1"
+        "minimatch": "10.2.3"
     }
 }
diff --git a/src/lib/components/git/connectRepoModal.svelte b/src/lib/components/git/connectRepoModal.svelte
@@ -52,6 +52,12 @@
         }
     });
 
+    $effect(() => {
+        if ($installation?.$id) {
+            selectedInstallationId = $installation.$id;
+        }
+    });
+
     async function connectRepo() {
         try {
             if (repositoryBehaviour === 'new') {
@@ -105,13 +111,29 @@
                     {product}
                     action="button"
                     {callbackState}
-                    connect={(e) => {
+                    connect={async (e) => {
                         trackEvent(Click.ConnectRepositoryClick, {
                             from: product
                         });
                         repository.set(e);
                         repositoryName = e.name;
                         selectedRepository = e.id;
+                        if (!selectedInstallationId && $installation?.$id) {
+                            selectedInstallationId = $installation.$id;
+                        }
+                        try {
+                            await connect(selectedInstallationId, e.id);
+                            show = false;
+                            addNotification({
+                                type: 'success',
+                                message: 'Repository connected successfully'
+                            });
+                        } catch (error) {
+                            addNotification({
+                                type: 'error',
+                                message: error?.message ?? 'Failed to connect repository'
+                            });
+                        }
                     }} />
             {/if}
         </Layout.Stack>
diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte
@@ -20,6 +20,7 @@
     import { Query, VCSDetectionType, type Models } from '@appwrite.io/console';
     import { getFrameworkIcon } from '$lib/stores/sites';
     import { connectGitHub } from '$lib/stores/git';
+    import { addNotification } from '$lib/stores/notifications';
     import { page } from '$app/state';
     import Card from '../card.svelte';
     import SkeletonRepoList from './skeletonRepoList.svelte';
@@ -274,9 +275,20 @@
                                             variant="secondary"
                                             style="flex-shrink: 0;"
                                             disabled={!!connectingRepositoryId}
-                                            on:click={() => {
+                                            on:click={async () => {
                                                 connectingRepositoryId = repo.id;
-                                                connect(repo);
+                                                try {
+                                                    await Promise.resolve(connect(repo));
+                                                } catch (error) {
+                                                    addNotification({
+                                                        type: 'error',
+                                                        message:
+                                                            error?.message ??
+                                                            'Failed to connect repository'
+                                                    });
+                                                } finally {
+                                                    connectingRepositoryId = null;
+                                                }
                                             }}>
                                             Connect
                                         </PinkButton.Button>
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte
@@ -14,6 +14,7 @@
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import { onMount } from 'svelte';
     import { realtime, sdk } from '$lib/stores/sdk';
+    import { sortBranches } from '$lib/stores/vcs';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import CreateCliModal from './createCliModal.svelte';
@@ -40,28 +41,45 @@
     });
 
     async function connect(selectedInstallationId: string, selectedRepository: string) {
+        let nextBranch = data.site?.providerBranch ?? 'main';
         try {
-            await sdk.forProject(page.params.region, page.params.project).sites.update({
-                siteId: data.site.$id,
-                name: data.site.name,
-                framework: data.site.framework as Framework,
-                enabled: data.site.enabled,
-                logging: data.site.logging || undefined,
-                timeout: data.site.timeout,
-                installCommand: data.site.installCommand,
-                buildCommand: data.site.buildCommand,
-                outputDirectory: data.site.outputDirectory,
-                buildRuntime: data.site.buildRuntime as BuildRuntime,
-                adapter: data.site.adapter as Adapter,
-                fallbackFile: data.site.fallbackFile,
-                installationId: selectedInstallationId,
-                providerRepositoryId: selectedRepository,
-                providerBranch: 'main'
-            });
-            invalidate(Dependencies.SITE);
+            const branchList = await sdk
+                .forProject(page.params.region, page.params.project)
+                .vcs.listRepositoryBranches({
+                    installationId: selectedInstallationId,
+                    providerRepositoryId: selectedRepository
+                });
+            const sorted = sortBranches(branchList.branches);
+            nextBranch =
+                sorted.find((branch) => branch.name === data.site?.providerBranch)?.name ??
+                sorted.find((branch) => branch.name === 'main' || branch.name === 'master')?.name ??
+                sorted[0]?.name ??
+                nextBranch;
         } catch {
-            return;
+            // Ignore branch lookup failures; fallback to default.
         }
+
+        await sdk.forProject(page.params.region, page.params.project).sites.update({
+            siteId: data.site.$id,
+            name: data.site.name,
+            framework: data.site.framework as Framework,
+            enabled: data.site.enabled,
+            logging: data.site.logging || undefined,
+            timeout: data.site.timeout,
+            installCommand: data.site.installCommand,
+            buildCommand: data.site.buildCommand,
+            outputDirectory: data.site.outputDirectory,
+            buildRuntime: data.site.buildRuntime as BuildRuntime,
+            adapter: data.site.adapter as Adapter,
+            fallbackFile: data.site.fallbackFile,
+            installationId: selectedInstallationId,
+            providerRepositoryId: selectedRepository,
+            providerBranch: nextBranch,
+            providerSilentMode: data.site?.providerSilentMode ?? undefined,
+            providerRootDirectory: data.site?.providerRootDirectory ?? undefined,
+            specification: data.site?.specification || undefined
+        });
+        invalidate(Dependencies.SITE);
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte
@@ -116,30 +116,46 @@
     }
 
     async function connect(selectedInstallationId: string, selectedRepository: string) {
+        let nextBranch = site?.providerBranch ?? 'main';
         try {
-            await sdk.forProject(page.params.region, page.params.project).sites.update({
-                siteId: site.$id,
-                name: site.name,
-                framework: site.framework as Framework,
-                enabled: site?.enabled,
-                logging: site?.logging || undefined,
-                timeout: site?.timeout,
-                installCommand: site?.installCommand,
-                buildCommand: site?.buildCommand,
-                outputDirectory: site?.outputDirectory,
-                buildRuntime: site?.buildRuntime as BuildRuntime,
-                adapter: site.adapter as Adapter,
-                fallbackFile: site?.fallbackFile,
-                installationId: selectedInstallationId,
-                providerRepositoryId: selectedRepository,
-                providerBranch: 'main',
-                specification: site?.specification || undefined
-            });
-
-            invalidate(Dependencies.SITE);
+            const branchList = await sdk
+                .forProject(page.params.region, page.params.project)
+                .vcs.listRepositoryBranches({
+                    installationId: selectedInstallationId,
+                    providerRepositoryId: selectedRepository
+                });
+            const sorted = sortBranches(branchList.branches);
+            nextBranch =
+                sorted.find((branch) => branch.name === site?.providerBranch)?.name ??
+                sorted.find((branch) => branch.name === 'main' || branch.name === 'master')?.name ??
+                sorted[0]?.name ??
+                nextBranch;
         } catch {
-            return;
+            // Ignore branch lookup failures; fallback to default.
         }
+
+        await sdk.forProject(page.params.region, page.params.project).sites.update({
+            siteId: site.$id,
+            name: site.name,
+            framework: site.framework as Framework,
+            enabled: site?.enabled,
+            logging: site?.logging || undefined,
+            timeout: site?.timeout,
+            installCommand: site?.installCommand,
+            buildCommand: site?.buildCommand,
+            outputDirectory: site?.outputDirectory,
+            buildRuntime: site?.buildRuntime as BuildRuntime,
+            adapter: site.adapter as Adapter,
+            fallbackFile: site?.fallbackFile,
+            installationId: selectedInstallationId,
+            providerRepositoryId: selectedRepository,
+            providerBranch: nextBranch,
+            providerSilentMode: site?.providerSilentMode ?? undefined,
+            providerRootDirectory: site?.providerRootDirectory ?? undefined,
+            specification: site?.specification || undefined
+        });
+
+        invalidate(Dependencies.SITE);
     }
 
     $: if (site?.installationId && site?.providerRepositoryId) {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,6 @@`
`89`	`89`	`},`
`90`	`90`	`"overrides": {`
`91`	`91`	`"vite": "npm:rolldown-vite@latest",`
`92`		`- "minimatch": "10.2.1"`
	`92`	`+ "minimatch": "10.2.3"`
`93`	`93`	`}`
`94`	`94`	`}`