Merge pull request #2367 from appwrite/fix-repo-url

Author: ItzNotABug

src/lib/helpers/github.ts

@@ -3,7 +3,9 @@ export function getNestedRootDirectory(repository: string): string | null {
     return match ? match[1] : null;
 }
 
-export function getRepositoryInfo(repository: string): { owner: string; name: string } | null {
+export function getRepositoryInfo(
+    repository: string
+): { owner: string; name: string; url: string } | null {
     const match = repository
         .trim()
         .match(/(?:^|\/\/|@)github\.com[/:]([^/]+)\/([^/]+?)(?:\.git)?(?:$|[/?#])/i);
@@ -13,7 +15,9 @@ export function getRepositoryInfo(repository: string): { owner: string; name: st
     const owner = decodeURIComponent(match[1]);
     const name = decodeURIComponent(match[2].replace(/\.git$/i, ''));
 
-    return { owner, name };
+    const url = `https://github.com/${owner}/${name}`;
+
+    return { owner, name, url };
 }
 
 export async function getLatestTag(owner: string, name: string): Promise<string | null> {

src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte

@@ -270,7 +270,12 @@
                     href={`${base}/project-${page.params.region}-${page.params.project}/functions`}>
                     Cancel
                 </Button>
-                <Button submit disabled={!name || !runtime || !specification}>
+                <Button
+                    submit
+                    fullWidthMobile
+                    submissionLoader
+                    forceShowLoader={$isSubmitting}
+                    disabled={!name || !runtime || !specification || $isSubmitting}>
                     Deploy function
                 </Button>
             </Layout.Stack>

src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.ts

@@ -13,7 +13,7 @@ export const load: PageLoad = async ({ url, params, parent }) => {
         redirect(302, `${base}/project-${params.region}-${params.project}/functions`);
     }
 
-    const info = getRepositoryInfo(repository!);
+    const info = getRepositoryInfo(repository);
     if (!info) {
         redirect(302, `${base}/project-${params.region}-${params.project}/functions`);
     }
@@ -41,8 +41,8 @@ export const load: PageLoad = async ({ url, params, parent }) => {
         installations,
         specificationsList,
         repository: {
-            url: repository,
-            name: info.owner,
+            url: info.url,
+            name: info.name,
             owner: info.owner,
             rootDirectory: getNestedRootDirectory(repository)
         }

src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte

@@ -315,8 +315,10 @@
             Cancel
         </Button>
         <Button
-            fullWidthMobile
             size="s"
+            fullWidthMobile
+            submissionLoader
+            forceShowLoader={$isSubmitting}
             on:click={() => formComponent.triggerSubmit()}
             disabled={$isSubmitting || !domainIsValid || !domain}>
             Deploy

src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.ts

@@ -11,7 +11,7 @@ export const load: PageLoad = async ({ url, params }) => {
         redirect(302, `${base}/project-${params.region}-${params.project}/sites`);
     }
 
-    const info = getRepositoryInfo(repository!);
+    const info = getRepositoryInfo(repository);
     if (!info) {
         redirect(302, `${base}/project-${params.region}-${params.project}/sites`);
     }
@@ -32,10 +32,10 @@ export const load: PageLoad = async ({ url, params }) => {
         frameworks,
         installations,
         repository: {
-            url: repository,
+            url: info.url,
             name: info.name,
             owner: info.owner,
-            rootDirectory: getNestedRootDirectory(repository!)
+            rootDirectory: getNestedRootDirectory(repository)
         }
     };
 };

src/routes/(public)/functions/deploy/+page.ts

@@ -54,7 +54,7 @@ export const load: PageLoad = async ({ parent, url }) => {
     // Get available runtimes
     const runtimesList = await sdk.forConsole.functions.listRuntimes();
 
-    const info = getRepositoryInfo(repository!);
+    const info = getRepositoryInfo(repository);
     if (!info) {
         redirect(302, base + '/');
     }

src/routes/(public)/sites/deploy/+page.ts

@@ -62,9 +62,8 @@ export const load: PageLoad = async ({ parent, url }) => {
             error(404, `Template "${templateKey}" not found`);
         }
     } else {
-        const info = getRepositoryInfo(repository!);
+        const info = getRepositoryInfo(repository);
         if (!info) {
-            console.log(info);
             redirect(302, base + '/');
         }