Skip to content

Commit 6bf696a

Browse files
Merge pull request #622 from appwrite/fix-last-org
fix: move last org to account prefs
2 parents 49d039e + 83a0912 commit 6bf696a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/routes/+layout.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const load: LayoutLoad = async ({ depends, url }) => {
1313
depends(Dependencies.ACCOUNT);
1414

1515
try {
16-
const account = await sdk.forConsole.account.get();
16+
const account = await sdk.forConsole.account.get<{ organization?: string }>();
1717

1818
LogRocket.identify(account.$id, {
1919
name: account.name,

src/routes/console/+page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { redirect } from '@sveltejs/kit';
33
import type { PageLoad } from './$types';
44

55
export const load: PageLoad = async ({ parent }) => {
6-
const { organizations } = await parent();
6+
const { organizations, account } = await parent();
77
if (organizations.total) {
8-
const teamId = localStorage.getItem('organization') ?? organizations.teams[0].$id;
8+
const teamId = account.prefs.organization ?? organizations.teams[0].$id;
99
throw redirect(303, `${base}/console/organization-${teamId}`);
1010
} else {
1111
throw redirect(303, `${base}/console/onboarding`);

src/routes/console/project-[project]/+layout.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
99

1010
try {
1111
const project = await sdk.forConsole.projects.get(params.project);
12-
localStorage.setItem('project', project.$id);
13-
localStorage.setItem('organization', project.teamId);
12+
sdk.forConsole.account.updatePrefs({ organization: project.teamId });
1413
preferences.loadTeamPrefs(project.teamId);
1514

1615
return {

0 commit comments

Comments
 (0)