consolidate

Author: icecrasher321

apps/sim/hooks/use-collaborative-workflow.ts

@@ -22,7 +22,7 @@ import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
+import { filterNewEdges, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState, Loop, Parallel, Position } from '@/stores/workflows/workflow/types'
 
@@ -242,17 +242,7 @@ export function useCollaborativeWorkflow() {
             case EDGES_OPERATIONS.BATCH_ADD_EDGES: {
               const { edges } = payload
               if (Array.isArray(edges) && edges.length > 0) {
-                const currentEdges = workflowStore.edges
-                const newEdges = edges.filter((edge: Edge) => {
-                  if (edge.source === edge.target) return false
-                  return !currentEdges.some(
-                    (e) =>
-                      e.source === edge.source &&
-                      e.sourceHandle === edge.sourceHandle &&
-                      e.target === edge.target &&
-                      e.targetHandle === edge.targetHandle
-                  )
-                })
+                const newEdges = filterNewEdges(edges, workflowStore.edges)
                 if (newEdges.length > 0) {
                   workflowStore.batchAddEdges(newEdges)
                 }
@@ -989,22 +979,8 @@ export function useCollaborativeWorkflow() {
 
       if (edges.length === 0) return false
 
-      const currentEdges = workflowStore.edges
-      const newEdges = edges.filter((edge) => {
-        if (edge.source === edge.target) return false
-        return !currentEdges.some(
-          (e) =>
-            e.source === edge.source &&
-            e.sourceHandle === edge.sourceHandle &&
-            e.target === edge.target &&
-            e.targetHandle === edge.targetHandle
-        )
-      })
-
-      if (newEdges.length === 0) {
-        logger.debug('Skipping batch add edges - all edges already exist')
-        return false
-      }
+      const newEdges = filterNewEdges(edges, workflowStore.edges)
+      if (newEdges.length === 0) return false
 
       const operationId = crypto.randomUUID()
 

apps/sim/stores/workflows/utils.ts

@@ -1,5 +1,19 @@
 import type { Edge } from 'reactflow'
 import { v4 as uuidv4 } from 'uuid'
+
+export function filterNewEdges(edgesToAdd: Edge[], currentEdges: Edge[]): Edge[] {
+  return edgesToAdd.filter((edge) => {
+    if (edge.source === edge.target) return false
+    return !currentEdges.some(
+      (e) =>
+        e.source === edge.source &&
+        e.sourceHandle === edge.sourceHandle &&
+        e.target === edge.target &&
+        e.targetHandle === edge.targetHandle
+    )
+  })
+}
+
 import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { getBlock } from '@/blocks'
 import { normalizeName } from '@/executor/constants'

apps/sim/stores/workflows/workflow/store.ts

@@ -9,7 +9,12 @@ import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { getUniqueBlockName, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
+import {
+  filterNewEdges,
+  getUniqueBlockName,
+  mergeSubblockState,
+  normalizeName,
+} from '@/stores/workflows/utils'
 import type {
   Position,
   SubBlockState,
@@ -496,19 +501,11 @@ export const useWorkflowStore = create<WorkflowStore>()(
 
       batchAddEdges: (edges: Edge[]) => {
         const currentEdges = get().edges
+        const filtered = filterNewEdges(edges, currentEdges)
         const newEdges = [...currentEdges]
 
-        for (const edge of edges) {
-          const connectionExists = newEdges.some(
-            (e) =>
-              e.source === edge.source &&
-              e.sourceHandle === edge.sourceHandle &&
-              e.target === edge.target &&
-              e.targetHandle === edge.targetHandle
-          )
-          if (connectionExists) continue
+        for (const edge of filtered) {
           if (wouldCreateCycle([...newEdges], edge.source, edge.target)) continue
-
           newEdges.push({
             id: edge.id || crypto.randomUUID(),
             source: edge.source,