fix worksapce switch

Author: icecrasher321

apps/sim/app/api/workflows/route.test.ts

@@ -87,6 +87,18 @@ vi.mock('@/lib/core/telemetry', () => ({
   },
 }))
 
+vi.mock('@/lib/workflows/defaults', () => ({
+  buildDefaultWorkflowArtifacts: vi.fn().mockReturnValue({
+    workflowState: { blocks: {}, edges: [], loops: {}, parallels: {} },
+    subBlockValues: {},
+    startBlockId: 'start-block-id',
+  }),
+}))
+
+vi.mock('@/lib/workflows/persistence/utils', () => ({
+  saveWorkflowToNormalizedTables: vi.fn().mockResolvedValue({ success: true }),
+}))
+
 import { POST } from '@/app/api/workflows/route'
 
 describe('Workflows API Route - POST ordering', () => {

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts

@@ -39,6 +39,7 @@ export function useWorkspaceManagement({
   const {
     data: workspaces = [],
     isLoading: isWorkspacesLoading,
+    isFetching: isWorkspacesFetching,
     refetch: refetchWorkspaces,
   } = useWorkspacesQuery(Boolean(sessionUserId))
 
@@ -71,14 +72,17 @@ export function useWorkspaceManagement({
     const matchingWorkspace = workspaces.find((w) => w.id === currentWorkspaceId)
 
     if (!matchingWorkspace) {
+      if (isWorkspacesFetching) {
+        return
+      }
       logger.warn(`Workspace ${currentWorkspaceId} not found in user's workspaces`)
       const fallbackWorkspace = workspaces[0]
       logger.info(`Redirecting to fallback workspace: ${fallbackWorkspace.id}`)
       routerRef.current?.push(`/workspace/${fallbackWorkspace.id}/home`)
     }
 
     hasValidatedRef.current = true
-  }, [workspaces, isWorkspacesLoading])
+  }, [workspaces, isWorkspacesLoading, isWorkspacesFetching])
 
   const refreshWorkspaceList = useCallback(async () => {
     await queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })

apps/sim/hooks/queries/workspace.ts

@@ -65,7 +65,8 @@ interface CreateWorkspaceParams {
 
 /**
  * Creates a new workspace.
- * Automatically invalidates the workspace list cache on success.
+ * Merges the created row into the active list cache before invalidation so navigation
+ * cannot race a stale list (see workspace validation fallback in use-workspace-management).
  */
 export function useCreateWorkspace() {
   const queryClient = useQueryClient()
@@ -86,7 +87,16 @@ export function useCreateWorkspace() {
       const data = await response.json()
       return data.workspace as Workspace
     },
-    onSuccess: () => {
+    onSuccess: (newWorkspace) => {
+      queryClient.setQueryData<Workspace[]>(workspaceKeys.list('active'), (previous) => {
+        if (!previous?.length) {
+          return [newWorkspace]
+        }
+        if (previous.some((w) => w.id === newWorkspace.id)) {
+          return previous
+        }
+        return [newWorkspace, ...previous]
+      })
       queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
       queryClient.invalidateQueries({ queryKey: workspaceKeys.adminLists() })
     },