From de36cf5229dc7bacb7fdfcac234554bcc0066846 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 16 May 2025 13:56:05 +0200 Subject: [PATCH] fix: onboarding --- .../onboarding/create-project/+page.svelte | 3 +- .../onboarding/create-project/+page.ts | 105 +++++++++--------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index 84664082f..3b7bd52ad 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -21,13 +21,14 @@ async function createProject() { isLoading = true; + console.log(data); try { const teamId = data.organization.$id; const project = await sdk.forConsole.projects.create( id ?? ID.unique(), projectName, teamId, - region + region ?? Region.Fra ); trackEvent(Submit.ProjectCreate, { customId: !!id, diff --git a/src/routes/(console)/onboarding/create-project/+page.ts b/src/routes/(console)/onboarding/create-project/+page.ts index 4190e0892..d67315cdc 100644 --- a/src/routes/(console)/onboarding/create-project/+page.ts +++ b/src/routes/(console)/onboarding/create-project/+page.ts @@ -10,60 +10,65 @@ import { base } from '$app/paths'; export const load: PageLoad = async ({ parent }) => { const { organizations } = await parent(); - if (!organizations?.total) { - try { - if (isCloud) { - const org = await sdk.forConsole.billing.createOrganization( - ID.unique(), - 'Personal projects', - BillingPlan.FREE, - null, - null - ); - trackEvent(Submit.OrganizationCreate, { - plan: tierToPlan(BillingPlan.FREE)?.name, - budget_cap_enabled: false, - members_invited: 0 - }); - - if (isOrganization(org)) { - return { - organization: org, - regions: await sdk.forConsole.billing.listRegions(org.$id) - }; - } else { - const e = new Error(org.message, { - cause: org - }); - trackError(e, Submit.OrganizationCreate); - } - } else { - return { - organization: await sdk.forConsole.teams.create( + try { + if (!organizations?.total) { + try { + if (isCloud) { + const org = await sdk.forConsole.billing.createOrganization( ID.unique(), - 'Personal projects' - ), - regions: null + 'Personal projects', + BillingPlan.FREE, + null, + null + ); + trackEvent(Submit.OrganizationCreate, { + plan: tierToPlan(BillingPlan.FREE)?.name, + budget_cap_enabled: false, + members_invited: 0 + }); + + if (isOrganization(org)) { + return { + organization: org, + regions: await sdk.forConsole.billing.listRegions(org.$id) + }; + } else { + const e = new Error(org.message, { + cause: org + }); + trackError(e, Submit.OrganizationCreate); + } + } else { + return { + organization: await sdk.forConsole.teams.create( + ID.unique(), + 'Personal projects' + ), + regions: null + }; + } + } catch (e) { + trackError(e, Submit.OrganizationCreate); + } + } else if (organizations?.total === 1) { + const org = organizations.teams[0]; + const projects = await sdk.forConsole.projects.list([ + Query.equal('teamId', org.$id), + Query.limit(1) + ]); + if (!projects.total) { + const regions = isCloud ? await sdk.forConsole.billing.listRegions(org.$id) : null; + return { + organization: org, + regions }; + } else { + redirect(303, `${base}/console/organization-${org.$id}`); } - } catch (e) { - trackError(e, Submit.OrganizationCreate); - } - } else if (organizations?.total === 1) { - const org = organizations.teams[0]; - const projects = await sdk.forConsole.projects.list([ - Query.equal('teamId', org.$id), - Query.limit(1) - ]); - if (!projects.total) { - return { - organization: org, - regions: await sdk.forConsole.billing.listRegions(org.$id) - }; } else { - redirect(303, `${base}/console/organization-${org.$id}`); + redirect(303, `${base}/console/organization-${organizations.teams[0].$id}`); } - } else { - redirect(303, `${base}/console/organization-${organizations.teams[0].$id}`); + } catch (error) { + console.error(error); } };