Merge pull request #1946 from appwrite/fix-org-loop

Always redirect to create-org after onboarding is completed once

Author: TorstenDittmann

src/routes/(console)/onboarding/create-project/+page.svelte

@@ -12,14 +12,27 @@
     import CreateProject from '$lib/layout/createProject.svelte';
     import { loadAvailableRegions } from '$routes/(console)/regions';
     import { regions as regionsStore } from '$lib/stores/organization';
+    import { user } from '$lib/stores/user';
 
     let isLoading = false;
     let id: string;
     let startAnimation = false;
     let projectName = 'Appwrite project';
     let region = Region.Fra;
+
     export let data;
 
+    function markOnboardingComplete() {
+        const currentPrefs = data.accountPrefs ?? $user.prefs;
+
+        const newPrefs = {
+            ...currentPrefs,
+            newOnboardingCompleted: true
+        };
+
+        sdk.forConsole.account.updatePrefs(newPrefs);
+    }
+
     async function createProject() {
         isLoading = true;
 
@@ -31,6 +44,9 @@
                 teamId,
                 isCloud ? region : undefined
             );
+
+            markOnboardingComplete();
+
             trackEvent(Submit.ProjectCreate, {
                 customId: !!id,
                 teamId

src/routes/(console)/onboarding/create-project/+page.ts

@@ -10,7 +10,17 @@ import { base } from '$app/paths';
 
 // TODO: this needs to be cleaned up!
 export const load: PageLoad = async ({ parent }) => {
-    const { organizations } = await parent();
+    const { account, organizations } = await parent();
+
+    const accountPrefs = account.prefs;
+    const hasCompletedOnboarding = accountPrefs['newOnboardingCompleted'] ?? false;
+
+    // user has already seen it, lets redirect now!
+    if (hasCompletedOnboarding && !organizations?.total) {
+        redirect(303, `${base}/onboarding/create-organization`);
+    } else if (hasCompletedOnboarding && organizations?.total) {
+        redirect(303, `${base}/organization-${organizations.teams[0].$id}`);
+    }
 
     if (!organizations?.total) {
         try {
@@ -30,6 +40,7 @@ export const load: PageLoad = async ({ parent }) => {
 
                 if (isOrganization(org)) {
                     return {
+                        accountPrefs,
                         organization: org
                     };
                 } else {
@@ -40,6 +51,7 @@ export const load: PageLoad = async ({ parent }) => {
                 }
             } else {
                 return {
+                    accountPrefs,
                     organization: await sdk.forConsole.teams.create(
                         ID.unique(),
                         'Personal projects'
@@ -62,6 +74,7 @@ export const load: PageLoad = async ({ parent }) => {
         }
         if (!projects?.total) {
             return {
+                accountPrefs,
                 organization: org
             };
         } else {