Merge pull request #622 from appwrite/fix-last-org

fix: move last org to account prefs
appwrite · Nov 16, 2023 · 6bf696a · 6bf696a · vercel · Nov 16, 2023
2 parents 49d039e + 83a0912
commit 6bf696a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -13,7 +13,7 @@ export const load: LayoutLoad = async ({ depends, url }) => {
     depends(Dependencies.ACCOUNT);
 
     try {
-        const account = await sdk.forConsole.account.get();
+        const account = await sdk.forConsole.account.get<{ organization?: string }>();
 
         LogRocket.identify(account.$id, {
             name: account.name,

diff --git a/src/routes/console/+page.ts b/src/routes/console/+page.ts
@@ -3,9 +3,9 @@ import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-    const { organizations } = await parent();
+    const { organizations, account } = await parent();
     if (organizations.total) {
-        const teamId = localStorage.getItem('organization') ?? organizations.teams[0].$id;
+        const teamId = account.prefs.organization ?? organizations.teams[0].$id;
         throw redirect(303, `${base}/console/organization-${teamId}`);
     } else {
         throw redirect(303, `${base}/console/onboarding`);

diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts
@@ -9,8 +9,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         const project = await sdk.forConsole.projects.get(params.project);
-        localStorage.setItem('project', project.$id);
-        localStorage.setItem('organization', project.teamId);
+        sdk.forConsole.account.updatePrefs({ organization: project.teamId });
         preferences.loadTeamPrefs(project.teamId);
 
         return {