diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 31cba6724..22105e928 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -143,7 +143,7 @@ { diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index 25c0a8755..cbfd499de 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -20,7 +20,7 @@ import { onMount, setContext, type Component } from 'svelte'; import Bandwidth from './bandwidth.svelte'; import Requests from './requests.svelte'; - import { selectedTab, usage } from './store'; + import { usage } from './store'; import { formatNum } from '$lib/helpers/string'; import { periodToDates } from '$lib/layout/usage.svelte'; import { canWriteProjects } from '$lib/stores/roles'; @@ -52,7 +52,7 @@ } function isTabSelected(key: string) { - return $selectedTab === key; + return page.url.pathname.endsWith(`/${key}`); } $: $registerCommands([ diff --git a/src/routes/(console)/project-[region]-[project]/overview/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/+page.ts index 560e26412..088f87041 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/+page.ts @@ -1,23 +1,7 @@ import { base } from '$app/paths'; import { redirect } from '@sveltejs/kit'; -import { get } from 'svelte/store'; import type { PageLoad } from './$types'; -import { selectedTab } from './store'; export const load: PageLoad = async ({ params }) => { - const tab = get(selectedTab); - - switch (tab) { - case 'keys': - case 'dev-keys': - return redirect( - 302, - `${base}/project-${params.region}-${params.project}/overview/${tab}` - ); - default: - return redirect( - 302, - `${base}/project-${params.region}-${params.project}/overview/platforms` - ); - } + return redirect(302, `${base}/project-${params.region}-${params.project}/overview/platforms`); }; diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts index 5f7e3e623..2697e3618 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts @@ -1,9 +1,6 @@ -import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { selectedTab } from '../store'; import type { PageLoad } from './$types'; - -selectedTab.set('dev-keys'); +import { Dependencies } from '$lib/constants'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DEV_KEYS); diff --git a/src/routes/(console)/project-[region]-[project]/overview/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/header.svelte index 93915ac33..9766b5086 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/header.svelte @@ -14,7 +14,7 @@ function dismissOnboarding() { setHasOnboardingDismissed($project.$id, $user); trackEvent('onboarding_hub_platform_dismiss'); - goto(`${base}/project-${$project.region}-${$project.$id}/overview`); + goto(`${base}/project-${$project.region}-${$project.$id}/overview/platforms`); } diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts index 160a52560..ca0380979 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts @@ -1,10 +1,7 @@ import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { selectedTab } from '../store'; import type { PageLoad } from './$types'; -selectedTab.set('keys'); - export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEYS); return { diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts index 5ef5a94ed..1148a392e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts @@ -1,9 +1,6 @@ -import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { selectedTab } from '../store'; import type { PageLoad } from './$types'; - -selectedTab.set('platforms'); +import { Dependencies } from '$lib/constants'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.PLATFORMS); diff --git a/src/routes/(console)/project-[region]-[project]/overview/store.ts b/src/routes/(console)/project-[region]-[project]/overview/store.ts index aa98e893b..4c761859b 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/store.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/store.ts @@ -21,8 +21,6 @@ export const usage = cachedStore< }; }); -export const selectedTab: Writable<'platforms' | 'keys' | 'dev-keys'> = writable('platforms'); - export const showDevKeysCreateModal: Writable = writable(false); export const devKeyColumns = readable([