From 13fb2f2aaeb5a67bdb8bf562044b12de69efe5e1 Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle Date: Wed, 16 Apr 2025 14:13:46 +0100 Subject: [PATCH] Dont check for creation state in middleware --- .../frontend-2/middleware/004-onboarding.global.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/frontend-2/middleware/004-onboarding.global.ts b/packages/frontend-2/middleware/004-onboarding.global.ts index fca1b2e4a..a9c8b380f 100644 --- a/packages/frontend-2/middleware/004-onboarding.global.ts +++ b/packages/frontend-2/middleware/004-onboarding.global.ts @@ -140,12 +140,6 @@ export default defineNuxtRouteMiddleware(async (to) => { // Mark as initialized for future navigations isAppInitialized.value = true - const workspacesWithCompletedCreationState = workspaces.filter( - (w) => w.creationState?.completed !== false - ) - const hasCompletedCreationStateWorkspaces = - workspacesWithCompletedCreationState.length > 0 - const { data: navigationCheckData } = await client .query({ query: activeUserActiveWorkspaceCheckQuery @@ -156,16 +150,16 @@ export default defineNuxtRouteMiddleware(async (to) => { const activeUserActiveWorkspaceSlug = navigationCheckData?.activeUser?.activeWorkspace?.slug const belongsToWorkspace = (slug: string) => - workspacesWithCompletedCreationState.find((workspace) => workspace.slug === slug) + workspaces.find((workspace) => workspace.slug === slug) // 4.2 If going to legacy projects, set it active if (to.path === projectsRoute) { if (hasLegacyProjects) { mutateIsProjectsActive(true) } else { - if (hasCompletedCreationStateWorkspaces) { - mutateActiveWorkspaceSlug(workspacesWithCompletedCreationState[0].slug) - navigateTo(workspaceRoute(workspacesWithCompletedCreationState[0].slug)) + if (hasWorkspaces) { + mutateActiveWorkspaceSlug(workspaces[0].slug) + navigateTo(workspaceRoute(workspaces[0].slug)) } } return