diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 6f22cbc96a..9ae54ea27f 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -61,4 +61,4 @@ export const organization = derived(page, ($page) => $page.data?.organization as export const currentPlan = derived(page, ($page) => $page.data?.currentPlan as Plan); export const members = derived(page, ($page) => $page.data.members as Models.MembershipList); -export const regions = writable(undefined); +export const regions = writable({ total: 0, regions: [] }); diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 089351e324..19090c22a4 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -38,7 +38,7 @@ } from '@appwrite.io/pink-icons-svelte'; import { getPlatformInfo } from '$lib/helpers/platform'; import CreateProjectCloud from './createProjectCloud.svelte'; - import { organization, regions as regionsStore } from '$lib/stores/organization'; + import { regions as regionsStore } from '$lib/stores/organization'; export let data; @@ -112,15 +112,11 @@ } }; onMount(async () => { - if (isCloud && $organization.$id) { - const regions = await sdk.forConsole.billing.listRegions($organization.$id); - regionsStore.set(regions); - checkPricingRefAndRedirect(page.url.searchParams); - } + checkPricingRefAndRedirect(page.url.searchParams); }); function findRegion(project: Models.Project) { - return $regionsStore?.regions?.find((region) => region.$id === project.region); + return $regionsStore.regions.find((region) => region.$id === project.region); } diff --git a/src/routes/(console)/regions.ts b/src/routes/(console)/regions.ts index 0ac4d4304c..b9e8633672 100644 --- a/src/routes/(console)/regions.ts +++ b/src/routes/(console)/regions.ts @@ -16,7 +16,7 @@ export async function loadAvailableRegions(orgId: string): Promise { try { const storedRegions = get(regions); - if (storedRegions?.regions && lastLoadedOrganization === orgId) { + if (storedRegions.regions && lastLoadedOrganization === orgId) { // already loaded for this organization, fast path return. return; }