From d5a17d73f749b5c79699be6e146393a8979f19a5 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 00:55:45 +0400 Subject: [PATCH 1/7] fix: region logic in wizard --- src/lib/stores/organization.ts | 10 +++++++++- .../organization-[organization]/wizard/step2.svelte | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 6f22cbc96..5b07be926 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -50,6 +50,14 @@ export type BillingLimits = { budgetLimit: number; }; +type Region = Models.ConsoleRegion & { + available: boolean; +}; + +type RegionList = { + regions: Region[]; +}; + export const newOrgModal = writable(false); export const newMemberModal = writable(false); export const organizationList = derived( @@ -61,4 +69,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(undefined); diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 847dfd7ca..1fa88d915 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -84,7 +84,7 @@ name="region" bind:group={$createProject.region} value={region.$id} - disabled={region.disabled} + disabled={!region.available} autofocus={index === 0}>
From d7e2c2b2c41d9185a725d868c48cc7499e35fbc4 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 00:58:38 +0400 Subject: [PATCH 2/7] fix: region logic in wizard --- .../organization-[organization]/wizard/step2.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 1fa88d915..43d535b69 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -88,14 +88,16 @@ autofocus={index === 0}>
- {#if region.disabled} + {#if region.disabled || !region.available} -

{region.name}

+

+ {region.name} +

{#if !notifications.includes(region.$id)} Date: Wed, 16 Apr 2025 00:59:25 +0400 Subject: [PATCH 3/7] fix: region logic in wizard --- .../(console)/organization-[organization]/wizard/step2.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 43d535b69..4d48877db 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -92,7 +92,7 @@

From 1363db03834827911db1239c9745dadebb337316 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 01:09:11 +0400 Subject: [PATCH 4/7] chore: review comments --- src/lib/stores/organization.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 5b07be926..6f22cbc96 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -50,14 +50,6 @@ export type BillingLimits = { budgetLimit: number; }; -type Region = Models.ConsoleRegion & { - available: boolean; -}; - -type RegionList = { - regions: Region[]; -}; - export const newOrgModal = writable(false); export const newMemberModal = writable(false); export const organizationList = derived( @@ -69,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(undefined); From 043d63e43b11c80cca83700bb659a4774b291948 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 01:35:40 +0400 Subject: [PATCH 5/7] chore: review comments --- .../(console)/organization-[organization]/wizard/step2.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 4d48877db..3de7e9bfb 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -92,7 +92,9 @@

From 12f4088e249e093a4fb38b9cb28dc68a3149bd8c Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 01:44:59 +0400 Subject: [PATCH 6/7] chore: review comments --- .../(console)/organization-[organization]/wizard/step2.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 3de7e9bfb..4972a4219 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -130,14 +130,14 @@ name={region.name} /> {region.name} - {#if !region.available} + {/if}

From 803f90d2e867c229a09a62197a23fcd329707890 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Apr 2025 02:04:24 +0400 Subject: [PATCH 7/7] chore: review comments --- .../(console)/organization-[organization]/wizard/step2.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 4972a4219..907cc1f28 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -9,8 +9,8 @@ import type { Models } from '@appwrite.io/console'; import { page } from '$app/stores'; import { regions } from '$lib/stores/organization'; - import { goto } from '$app/navigation'; - import { upgradeURL } from '$lib/stores/billing'; + // import { goto } from '$app/navigation'; + // import { upgradeURL } from '$lib/stores/billing'; let prefs: Models.Preferences;