Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/stores/organization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Models.ConsoleRegionList | undefined>(undefined);
export const regions = writable<Models.ConsoleRegionList>({ total: 0, regions: [] });
10 changes: 3 additions & 7 deletions src/routes/(console)/organization-[organization]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
</script>

Expand Down
2 changes: 1 addition & 1 deletion src/routes/(console)/regions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function loadAvailableRegions(orgId: string): Promise<void> {
try {
const storedRegions = get(regions);

if (storedRegions?.regions && lastLoadedOrganization === orgId) {
if (storedRegions.regions && lastLoadedOrganization === orgId) {
// already loaded for this organization, fast path return.
return;
}
Expand Down