Merge branch 'main' into feat-GRO-1113-Console-Notification-Bulk-Api

Author: ItzNotABug

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5",
+        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@8836b0c",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

@@ -90,5 +90,5 @@
 </Fieldset>
 
 {#if show}
-    <SelectRootModal bind:show bind:rootDir {product} />
+    <SelectRootModal bind:show bind:rootDir {product} {branch} />
 {/if}

src/lib/components/git/productionBranchFieldset.svelte

@@ -22,6 +22,7 @@
     export let show = false;
     export let rootDir: string;
     export let product: 'sites' | 'functions' = 'functions';
+    export let branch: string;
 
     let isLoading = true;
     let directories: Directory[] = [
@@ -42,7 +43,7 @@
         try {
             const content = await sdk
                 .forProject(page.params.region, page.params.project)
-                .vcs.getRepositoryContents($installation.$id, $repository.id, currentPath);
+                .vcs.getRepositoryContents($installation.$id, $repository.id, currentPath, branch);
             directories[0].fileCount = content.contents?.length ?? 0;
             directories[0].children = content.contents
                 .filter((e) => e.isDirectory)
@@ -82,7 +83,7 @@
             try {
                 const content = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .vcs.getRepositoryContents($installation.$id, $repository.id, path);
+                    .vcs.getRepositoryContents($installation.$id, $repository.id, path, branch);
 
                 const fileCount = content.contents?.length ?? 0;
                 const contentDirectories = content.contents.filter((e) => e.isDirectory);

src/lib/components/git/selectRootModal.svelte

@@ -274,5 +274,9 @@
     <DisconnectRepo bind:show={showDisconnect} on:success={loadRepository} />
 {/if}
 {#if showSelectRoot}
-    <SelectRootModal bind:show={showSelectRoot} product="sites" bind:rootDir={selectedDir} />
+    <SelectRootModal
+        bind:show={showSelectRoot}
+        product="sites"
+        bind:rootDir={selectedDir}
+        branch={selectedBranch} />
 {/if}

src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRepository.svelte

@@ -269,5 +269,9 @@
 {/if}
 
 {#if showSelectRoot}
-    <SelectRootModal bind:show={showSelectRoot} product="sites" bind:rootDir={selectedDir} />
+    <SelectRootModal
+        bind:show={showSelectRoot}
+        product="sites"
+        bind:rootDir={selectedDir}
+        branch={selectedBranch} />
 {/if}