Skip to content

fix: onboarding redirection #1922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2025
Merged

fix: onboarding redirection #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c61e23
fix: onboarding redirection
ArmanNik May 28, 2025
641eb82
remove extra store
ArmanNik May 28, 2025
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/routes/(console)/onboarding/create-project/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}
// safe side!
loadAvailableRegions(data.organization.$id);
loadAvailableRegions(data.organization?.$id);
</script>

<svelte:head>
Expand Down
95 changes: 48 additions & 47 deletions src/routes/(console)/onboarding/create-project/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { isCloud } from '$lib/system';
import { sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { isOrganization, tierToPlan } from '$lib/stores/billing';
import { ID, Query } from '@appwrite.io/console';
import { ID, Query, type Models } from '@appwrite.io/console';
import { BillingPlan } from '$lib/constants';
import { redirect } from '@sveltejs/kit';
import { base } from '$app/paths';
Expand All @@ -12,61 +12,62 @@ import { base } from '$app/paths';
export const load: PageLoad = async ({ parent }) => {
const { organizations } = await parent();

try {
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 (!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
};
} else {
const e = new Error(org.message, {
cause: org
});
trackError(e, Submit.OrganizationCreate);
}
} else {
if (isOrganization(org)) {
return {
organization: await sdk.forConsole.teams.create(
ID.unique(),
'Personal projects'
)
organization: org
};
} else {
const e = new Error(org.message, {
cause: org
});
trackError(e, Submit.OrganizationCreate);
}
} catch (e) {
trackError(e, Submit.OrganizationCreate);
} else {
return {
organization: await sdk.forConsole.teams.create(
ID.unique(),
'Personal projects'
)
};
}
} else if (organizations?.total === 1) {
const org = organizations.teams[0];
const projects = await sdk.forConsole.projects.list([
} catch (e) {
trackError(e, Submit.OrganizationCreate);
}
} else if (organizations?.total === 1) {
const org = organizations.teams[0];
let projects: Models.ProjectList = null;
try {
projects = await sdk.forConsole.projects.list([
Query.equal('teamId', org.$id),
Query.limit(1)
]);
if (!projects.total) {
return {
organization: org
};
} else {
redirect(303, `${base}/console/organization-${org.$id}`);
}
} catch (e) {
redirect(303, `${base}/organization-${org.$id}`);
}
if (!projects?.total) {
return {
organization: org
};
} else {
redirect(303, `${base}/console/organization-${organizations.teams[0].$id}`);
redirect(303, `${base}/organization-${org.$id}`);
}
} catch (error) {
console.error(error);
} else {
redirect(303, `${base}/organization-${organizations.teams[0].$id}`);
}
};
2 changes: 1 addition & 1 deletion src/routes/(console)/regions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let lastLoadedOrganization = null;
* Prevents unnecessary API calls if the regions are already loaded for the same organization.
*/
export async function loadAvailableRegions(orgId: string): Promise<void> {
if (!isCloud) return;
if (!isCloud || !orgId) return;

try {
const storedRegions = get(regions);
Expand Down