improvement(workflows): remove dead complexity, fix mutation edge cases

waleedlatif1 · waleedlatif1 · commit c73ee9e7eca3 · 2026-03-30T20:33:01.000-07:00
- Throw on state PUT failure in useCreateWorkflow instead of swallowing
- Use Map for O(1) lookups in duplicate/export loops (3 hooks)
- Broaden invalidation scope in update/delete mutations to lists()
- Switch workflow-block to useWorkflowMap for direct ID lookup
- Consolidate use-workflow-operations to single useWorkflowMap hook
- Remove workspace transition guard (sync body, unreachable timeout)
- Make switchToWorkspace synchronous (remove async/try-catch/finally)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -46,7 +46,7 @@ import { useCredentialName } from '@/hooks/queries/oauth/oauth-credentials'
 import { useReactivateSchedule, useScheduleInfo } from '@/hooks/queries/schedules'
 import { useSkills } from '@/hooks/queries/skills'
 import { useTablesList } from '@/hooks/queries/tables'
-import { useWorkflows } from '@/hooks/queries/workflows'
+import { useWorkflowMap } from '@/hooks/queries/workflows'
 import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/panel'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
@@ -600,11 +600,11 @@ const SubBlockRow = memo(function SubBlockRow({
   )
   const knowledgeBaseDisplayName = kbForDisplayName?.name ?? null
 
-  const { data: workflowListForLookup } = useWorkflows(workspaceId)
+  const { data: workflowMapForLookup = {} } = useWorkflowMap(workspaceId)
   const workflowSelectionName = useMemo(() => {
     if (subBlock?.id !== 'workflowId' || typeof rawValue !== 'string') return null
-    return (workflowListForLookup ?? []).find((w) => w.id === rawValue)?.name ?? null
-  }, [workflowListForLookup, subBlock?.id, rawValue])
+    return workflowMapForLookup[rawValue]?.name ?? null
+  }, [workflowMapForLookup, subBlock?.id, rawValue])
 
   const { data: mcpServers = [] } = useMcpServers(workspaceId || '')
   const mcpServerDisplayName = useMemo(() => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
-import { useCreateWorkflow, useWorkflowMap, useWorkflows } from '@/hooks/queries/workflows'
+import { useCreateWorkflow, useWorkflowMap } from '@/hooks/queries/workflows'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { generateCreativeWorkflowName } from '@/stores/workflows/registry/utils'
 
@@ -14,19 +14,15 @@ interface UseWorkflowOperationsProps {
 
 export function useWorkflowOperations({ workspaceId }: UseWorkflowOperationsProps) {
   const router = useRouter()
-  const workflowsQuery = useWorkflows(workspaceId)
-  const { data: workflowList = [] } = workflowsQuery
-  const { data: workflows = {} } = useWorkflowMap(workspaceId)
+  const { data: workflows = {}, isLoading: workflowsLoading } = useWorkflowMap(workspaceId)
   const createWorkflowMutation = useCreateWorkflow()
 
   const regularWorkflows = useMemo(
     () =>
-      workflowList
+      Object.values(workflows)
         .filter((workflow) => workflow.workspaceId === workspaceId)
-        .sort((a, b) => {
-          return b.createdAt.getTime() - a.createdAt.getTime()
-        }),
-    [workflowList, workspaceId]
+        .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()),
+    [workflows, workspaceId]
   )
 
   const handleCreateWorkflow = useCallback(async (): Promise<string | null> => {
@@ -58,7 +54,7 @@ export function useWorkflowOperations({ workspaceId }: UseWorkflowOperationsProp
   return {
     workflows,
     regularWorkflows,
-    workflowsLoading: workflowsQuery.isLoading,
+    workflowsLoading,
     isCreatingWorkflow: createWorkflowMutation.isPending,
 
     handleCreateWorkflow,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
@@ -110,7 +110,7 @@ export function useWorkspaceManagement({
       }
 
       try {
-        await switchToWorkspace(workspace.id)
+        switchToWorkspace(workspace.id)
         routerRef.current?.push(`/workspace/${workspace.id}/home`)
         logger.info(`Switched to workspace: ${workspace.name} (${workspace.id})`)
       } catch (error) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts
@@ -61,7 +61,7 @@ export function useDuplicateSelection({ workspaceId, onSuccess }: UseDuplicateSe
 
       setIsDuplicating(true)
       try {
-        const workflows = getWorkflows(workspaceIdRef.current)
+        const workflowMap = new Map(getWorkflows(workspaceIdRef.current).map((w) => [w.id, w]))
         const folderStore = useFolderStore.getState()
 
         const duplicatedWorkflowIds: string[] = []
@@ -96,7 +96,7 @@ export function useDuplicateSelection({ workspaceId, onSuccess }: UseDuplicateSe
         }
 
         for (const workflowId of workflowIds) {
-          const workflow = workflows.find((w) => w.id === workflowId)
+          const workflow = workflowMap.get(workflowId)
           if (!workflow) {
             logger.warn(`Workflow ${workflowId} not found, skipping`)
             continue
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
@@ -60,10 +60,10 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
       const duplicatedIds: string[] = []
 
       try {
-        const workflows = getWorkflows(workspaceIdRef.current)
+        const workflowMap = new Map(getWorkflows(workspaceIdRef.current).map((w) => [w.id, w]))
 
         for (const sourceId of workflowIdsToDuplicate) {
-          const sourceWorkflow = workflows.find((w) => w.id === sourceId)
+          const sourceWorkflow = workflowMap.get(sourceId)
           if (!sourceWorkflow) {
             logger.warn(`Workflow ${sourceId} not found, skipping`)
             continue
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
@@ -58,11 +58,11 @@ export function useExportWorkflow({ onSuccess }: UseExportWorkflowProps = {}) {
           count: workflowIdsToExport.length,
         })
 
-        const workflows = getWorkflows(workspaceIdRef.current)
+        const workflowMap = new Map(getWorkflows(workspaceIdRef.current).map((w) => [w.id, w]))
         const exportedWorkflows = []
 
         for (const workflowId of workflowIdsToExport) {
-          const workflowMeta = workflows.find((w) => w.id === workflowId)
+          const workflowMeta = workflowMap.get(workflowId)
           if (!workflowMeta) {
             logger.warn(`Workflow ${workflowId} not found in registry`)
             continue
diff --git a/apps/sim/hooks/queries/workflows.ts b/apps/sim/hooks/queries/workflows.ts
@@ -61,9 +61,7 @@ async function fetchWorkflowState(
 export function useWorkflowState(workflowId: string | undefined) {
   return useQuery({
     queryKey: workflowKeys.state(workflowId),
-    queryFn: workflowId
-      ? ({ signal }) => fetchWorkflowState(workflowId, signal)
-      : skipToken,
+    queryFn: workflowId ? ({ signal }) => fetchWorkflowState(workflowId, signal) : skipToken,
     staleTime: 30 * 1000,
   })
 }
@@ -118,9 +116,7 @@ export function useWorkflows(workspaceId?: string, options?: { scope?: WorkflowQ
 
   return useQuery({
     queryKey: workflowKeys.list(workspaceId, scope),
-    queryFn: workspaceId
-      ? ({ signal }) => fetchWorkflows(workspaceId, scope, signal)
-      : skipToken,
+    queryFn: workspaceId ? ({ signal }) => fetchWorkflows(workspaceId, scope, signal) : skipToken,
     placeholderData: keepPreviousData,
     staleTime: 60 * 1000,
   })
@@ -136,9 +132,7 @@ export function useWorkflowMap(workspaceId?: string, options?: { scope?: Workflo
 
   return useQuery({
     queryKey: workflowKeys.list(workspaceId, scope),
-    queryFn: workspaceId
-      ? ({ signal }) => fetchWorkflows(workspaceId, scope, signal)
-      : skipToken,
+    queryFn: workspaceId ? ({ signal }) => fetchWorkflows(workspaceId, scope, signal) : skipToken,
     placeholderData: keepPreviousData,
     staleTime: 60 * 1000,
     select: (data) => Object.fromEntries(data.map((w) => [w.id, w])),
@@ -213,9 +207,7 @@ export function useCreateWorkflow() {
 
       if (!stateResponse.ok) {
         const text = await stateResponse.text()
-        logger.error('Failed to persist default Start block:', text)
-      } else {
-        logger.info('Successfully persisted default Start block')
+        throw new Error(`Failed to persist default workflow state: ${text}`)
       }
 
       return {
@@ -570,7 +562,7 @@ export function useUpdateWorkflow() {
     },
     onSettled: (_data, _error, variables) => {
       queryClient.invalidateQueries({
-        queryKey: workflowKeys.list(variables.workspaceId, 'active'),
+        queryKey: workflowKeys.lists(),
       })
     },
   })
@@ -623,7 +615,7 @@ export function useDeleteWorkflowMutation() {
     },
     onSettled: (_data, _error, variables) => {
       queryClient.invalidateQueries({
-        queryKey: workflowKeys.list(variables.workspaceId, 'active'),
+        queryKey: workflowKeys.lists(),
       })
     },
   })
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
@@ -27,9 +27,6 @@ const initialHydration: HydrationState = {
 
 const createRequestId = () => `${Date.now()}-${Math.random().toString(16).slice(2)}`
 
-let isWorkspaceTransitioning = false
-const TRANSITION_TIMEOUT = 5000
-
 function resetWorkflowStores() {
   useWorkflowStore.setState({
     blocks: {},
@@ -45,19 +42,6 @@ function resetWorkflowStores() {
   })
 }
 
-function setWorkspaceTransitioning(isTransitioning: boolean): void {
-  isWorkspaceTransitioning = isTransitioning
-
-  if (isTransitioning) {
-    setTimeout(() => {
-      if (isWorkspaceTransitioning) {
-        logger.warn('Forcing workspace transition to complete due to timeout')
-        isWorkspaceTransitioning = false
-      }
-    }, TRANSITION_TIMEOUT)
-  }
-}
-
 export const useWorkflowRegistry = create<WorkflowRegistry>()(
   devtools(
     (set, get) => ({
@@ -68,53 +52,24 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       clipboard: null,
       pendingSelection: null,
 
-      switchToWorkspace: async (workspaceId: string) => {
-        if (isWorkspaceTransitioning) {
-          logger.warn(
-            `Ignoring workspace switch to ${workspaceId} - transition already in progress`
-          )
-          return
-        }
-
-        setWorkspaceTransitioning(true)
+      switchToWorkspace: (workspaceId: string) => {
+        logger.info(`Switching to workspace: ${workspaceId}`)
 
-        try {
-          logger.info(`Switching to workspace: ${workspaceId}`)
-
-          resetWorkflowStores()
-
-          // Invalidate the old workspace workflow cache so a fresh fetch happens
-          getQueryClient().invalidateQueries({ queryKey: workflowKeys.lists() })
+        resetWorkflowStores()
+        getQueryClient().invalidateQueries({ queryKey: workflowKeys.lists() })
 
-          set({
-            activeWorkflowId: null,
-            deploymentStatuses: {},
+        set({
+          activeWorkflowId: null,
+          deploymentStatuses: {},
+          error: null,
+          hydration: {
+            phase: 'idle',
+            workspaceId,
+            workflowId: null,
+            requestId: null,
             error: null,
-            hydration: {
-              phase: 'idle',
-              workspaceId,
-              workflowId: null,
-              requestId: null,
-              error: null,
-            },
-          })
-
-          logger.info(`Successfully switched to workspace: ${workspaceId}`)
-        } catch (error) {
-          logger.error(`Error switching to workspace ${workspaceId}:`, { error })
-          set({
-            error: `Failed to switch workspace: ${error instanceof Error ? error.message : 'Unknown error'}`,
-            hydration: {
-              phase: 'error',
-              workspaceId,
-              workflowId: null,
-              requestId: null,
-              error: error instanceof Error ? error.message : 'Unknown error',
-            },
-          })
-        } finally {
-          setWorkspaceTransitioning(false)
-        }
+          },
+        })
       },
 
       getWorkflowDeploymentStatus: (workflowId: string | null): DeploymentStatus | null => {
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
@@ -54,7 +54,7 @@ export interface WorkflowRegistryState {
 export interface WorkflowRegistryActions {
   setActiveWorkflow: (id: string) => Promise<void>
   loadWorkflowState: (workflowId: string) => Promise<void>
-  switchToWorkspace: (id: string) => Promise<void>
+  switchToWorkspace: (id: string) => void
   getWorkflowDeploymentStatus: (workflowId: string | null) => DeploymentStatus | null
   setDeploymentStatus: (
     workflowId: string | null,

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export function useWorkspaceManagement({`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`try {`
`113`		`- await switchToWorkspace(workspace.id)`
	`113`	`+ switchToWorkspace(workspace.id)`
`114`	`114`	routerRef.current?.push(`/workspace/${workspace.id}/home`)
`115`	`115`	logger.info(`Switched to workspace: ${workspace.name} (${workspace.id})`)
`116`	`116`	`} catch (error) {`