From 9e0ca577e0fdda19b46708f074aba6f82654bd5a Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 26 Aug 2022 12:12:52 +0200 Subject: [PATCH] refactor: move some redirection logic to store --- src/lib/stores/organization.ts | 20 ++++++++++ src/routes/__layout.svelte | 4 +- src/routes/console/__layout.svelte | 37 +++++++------------ .../organization-[organization]/index.svelte | 4 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 1bacf460f..61c892917 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -2,6 +2,8 @@ import { sdkForConsole } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { writable } from 'svelte/store'; import { browser } from '$app/env'; +import { get } from 'svelte/store'; +import { base } from '$app/paths'; function createOrganizationList() { const { subscribe, set } = writable( @@ -82,3 +84,21 @@ if (browser) { projectList.subscribe((n) => sessionStorage?.setItem('projectList', JSON.stringify(n ?? ''))); memberList.subscribe((n) => sessionStorage?.setItem('memberList', JSON.stringify(n ?? ''))); } + +export const redirectTo = async () => { + let org = get(organization); + if (org) { + return `${base}/console/organization-${org.$id}`; + } else { + await organizationList.load(); + const orgList = get(organizationList); + if (orgList?.total) { + await organization.load(orgList.teams[0].$id); + org = get(organization); + return `${base}/console/organization-${org.$id}`; + } else { + newOrgModal.set(true); + return `${base}/console`; + } + } +}; diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index e245db170..3e20f4d8c 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -7,6 +7,7 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { user } from '$lib/stores/user'; + import { redirectTo } from '$lib/stores/organization'; import { onMount } from 'svelte'; import { base } from '$app/paths'; import { browser } from '$app/env'; @@ -29,7 +30,8 @@ } if (!$page.url.pathname.startsWith('/console')) { - await goto(`${base}/console`); + const destination = await redirectTo(); + await goto(destination); } } catch (error) { await goto(`${base}/login`); diff --git a/src/routes/console/__layout.svelte b/src/routes/console/__layout.svelte index f6864108f..2eae37873 100644 --- a/src/routes/console/__layout.svelte +++ b/src/routes/console/__layout.svelte @@ -3,45 +3,36 @@ import SideNavigation from '$lib/layout/navigation.svelte'; import Header from '$lib/layout/header.svelte'; import { updateLayout } from '$lib/stores/layout'; - import { organization, organizationList, newOrgModal } from '$lib/stores/organization'; + import { + organization, + organizationList, + newOrgModal, + redirectTo + } from '$lib/stores/organization'; import Create from './_createOrganization.svelte'; import { page } from '$app/stores'; import { afterNavigate, goto } from '$app/navigation'; import { onMount } from 'svelte'; - let closable = true; - updateLayout({ title: $organization?.name ?? 'Projects', level: 0 }); onMount(async () => { - if ($page.url.pathname === '/console') { - await pageLoad(); + if ($page.url.pathname === '/console' && !$newOrgModal) { + const destination = await redirectTo(); + await goto(destination); } }); afterNavigate(async () => { - if ($page.url.pathname === '/console') { - await pageLoad(); + if ($page.url.pathname === '/console' && !$newOrgModal) { + console.log('test'); + const destination = await redirectTo(); + await goto(destination); } }); - - const pageLoad = async () => { - if (!$organization) { - await organizationList.load(); - if ($organizationList?.total) { - await organization.load($organizationList.teams[0].$id); - await goto(`/console/organization-${$organization.$id}`); - } else { - closable = false; - newOrgModal.set(true); - } - } else { - await goto(`/console/organization-${$organization.$id}`); - } - }; @@ -58,5 +49,5 @@ {#if $newOrgModal} - + {/if} diff --git a/src/routes/console/organization-[organization]/index.svelte b/src/routes/console/organization-[organization]/index.svelte index 9cc7f0b2f..e7a7c7614 100644 --- a/src/routes/console/organization-[organization]/index.svelte +++ b/src/routes/console/organization-[organization]/index.svelte @@ -17,7 +17,7 @@ onMount(async () => { await projectList.load(); - projects = $projectList?.projects.filter((n) => n.teamId === org); + projects = $projectList?.projects?.filter((n) => n.teamId === org); }); let showCreate = false; @@ -53,7 +53,7 @@ return { name, icon }; }; - $: projects = $projectList?.projects.filter((a) => a.teamId === org); + $: projects = $projectList?.projects?.filter((a) => a.teamId === org);