Merge pull request #1898 from appwrite/fix-regions

Re-add: available regions filtering on project creations

Author: ItzNotABug

src/lib/layout/createProject.svelte

@@ -28,7 +28,7 @@
                     label: region.name,
                     value: region.$id,
                     leadingHtml: `<img src='${getFlagUrl(region.flag)}' alt='Region flag'/>`,
-                    disabled: region.disabled
+                    disabled: region.disabled || !region.available
                 };
             });
     }
@@ -39,6 +39,7 @@
         <link rel="preload" as="image" href={getFlagUrl(region.flag)} />
     {/each}
 </svelte:head>
+
 <form on:submit|preventDefault>
     <Layout.Stack direction="column" gap="xxl">
         {#if showTitle}

src/routes/(console)/onboarding/create-project/+page.svelte

@@ -10,6 +10,8 @@
     import { base } from '$app/paths';
     import { addNotification } from '$lib/stores/notifications';
     import CreateProject from '$lib/layout/createProject.svelte';
+    import { loadAvailableRegions } from '$routes/(console)/regions';
+    import { regions as regionsStore } from '$lib/stores/organization';
 
     let isLoading = false;
     let id: string;
@@ -49,6 +51,9 @@
             });
         }
     }
+
+    // safe side!
+    loadAvailableRegions(data.organization.$id);
 </script>
 
 <svelte:head>
@@ -74,7 +79,7 @@
             alt="Appwrite Logo" />
         <Card.Base variant="primary" padding="l">
             <CreateProject
-                regions={isCloud ? data.regions.regions : []}
+                regions={$regionsStore.regions}
                 bind:projectName
                 bind:id
                 bind:region

src/routes/(console)/onboarding/create-project/+page.ts

@@ -8,8 +8,10 @@ import { BillingPlan } from '$lib/constants';
 import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 
+// TODO: this needs to be cleaned up!
 export const load: PageLoad = async ({ parent }) => {
     const { organizations } = await parent();
+
     try {
         if (!organizations?.total) {
             try {
@@ -29,8 +31,7 @@ export const load: PageLoad = async ({ parent }) => {
 
                     if (isOrganization(org)) {
                         return {
-                            organization: org,
-                            regions: await sdk.forConsole.billing.listRegions(org.$id)
+                            organization: org
                         };
                     } else {
                         const e = new Error(org.message, {
@@ -43,8 +44,7 @@ export const load: PageLoad = async ({ parent }) => {
                         organization: await sdk.forConsole.teams.create(
                             ID.unique(),
                             'Personal projects'
-                        ),
-                        regions: null
+                        )
                     };
                 }
             } catch (e) {
@@ -57,10 +57,8 @@ export const load: PageLoad = async ({ parent }) => {
                 Query.limit(1)
             ]);
             if (!projects.total) {
-                const regions = isCloud ? await sdk.forConsole.billing.listRegions(org.$id) : null;
                 return {
-                    organization: org,
-                    regions
+                    organization: org
                 };
             } else {
                 redirect(303, `${base}/console/organization-${org.$id}`);

src/routes/(console)/organization-[organization]/+page.svelte

@@ -120,9 +120,7 @@
     });
 
     function findRegion(project: Models.Project) {
-        return $regionsStore?.regions?.find(
-            (region) => region.$id === (project as Models.Project & { region: string }).region
-        );
+        return $regionsStore?.regions?.find((region) => region.$id === project.region);
     }
 </script>