cleanup more code

Author: icecrasher321

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

@@ -199,39 +199,6 @@ export function useCollaborativeWorkflow() {
       try {
         if (target === 'block') {
           switch (operation) {
-            case 'add':
-              workflowStore.addBlock(
-                payload.id,
-                payload.type,
-                payload.name,
-                payload.position,
-                payload.data,
-                payload.parentId,
-                payload.extent,
-                {
-                  enabled: payload.enabled,
-                  horizontalHandles: payload.horizontalHandles,
-                  advancedMode: payload.advancedMode,
-                  triggerMode: payload.triggerMode ?? false,
-                  height: payload.height,
-                }
-              )
-              if (payload.autoConnectEdge) {
-                workflowStore.addEdge(payload.autoConnectEdge)
-              }
-              // Apply subblock values if present in payload
-              if (payload.subBlocks && typeof payload.subBlocks === 'object') {
-                Object.entries(payload.subBlocks).forEach(([subblockId, subblock]) => {
-                  if (WEBHOOK_SUBBLOCK_FIELDS.includes(subblockId)) {
-                    return
-                  }
-                  const value = (subblock as any)?.value
-                  if (value !== undefined && value !== null) {
-                    subBlockStore.setValue(payload.id, subblockId, value)
-                  }
-                })
-              }
-              break
             case 'update-position': {
               const blockId = payload.id
 
@@ -263,40 +230,6 @@ export function useCollaborativeWorkflow() {
             case 'update-name':
               workflowStore.updateBlockName(payload.id, payload.name)
               break
-            case 'remove': {
-              const blockId = payload.id
-              const blocksToRemove = new Set<string>([blockId])
-
-              const findAllDescendants = (parentId: string) => {
-                Object.entries(workflowStore.blocks).forEach(([id, block]) => {
-                  if (block.data?.parentId === parentId) {
-                    blocksToRemove.add(id)
-                    findAllDescendants(id)
-                  }
-                })
-              }
-              findAllDescendants(blockId)
-
-              workflowStore.removeBlock(blockId)
-              lastPositionTimestamps.current.delete(blockId)
-
-              const updatedBlocks = useWorkflowStore.getState().blocks
-              const updatedEdges = useWorkflowStore.getState().edges
-              const graph = {
-                blocksById: updatedBlocks,
-                edgesById: Object.fromEntries(updatedEdges.map((e) => [e.id, e])),
-              }
-
-              const undoRedoStore = useUndoRedoStore.getState()
-              const stackKeys = Object.keys(undoRedoStore.stacks)
-              stackKeys.forEach((key) => {
-                const [workflowId, userId] = key.split(':')
-                if (workflowId === activeWorkflowId) {
-                  undoRedoStore.pruneInvalidEntries(workflowId, userId, graph)
-                }
-              })
-              break
-            }
             case 'toggle-enabled':
               workflowStore.toggleBlockEnabled(payload.id)
               break
@@ -316,40 +249,6 @@ export function useCollaborativeWorkflow() {
               }
               break
             }
-            case 'duplicate':
-              workflowStore.addBlock(
-                payload.id,
-                payload.type,
-                payload.name,
-                payload.position,
-                payload.data,
-                payload.parentId,
-                payload.extent,
-                {
-                  enabled: payload.enabled,
-                  horizontalHandles: payload.horizontalHandles,
-                  advancedMode: payload.advancedMode,
-                  triggerMode: payload.triggerMode ?? false,
-                  height: payload.height,
-                }
-              )
-              // Handle auto-connect edge if present
-              if (payload.autoConnectEdge) {
-                workflowStore.addEdge(payload.autoConnectEdge)
-              }
-              // Apply subblock values from duplicate payload so collaborators see content immediately
-              if (payload.subBlocks && typeof payload.subBlocks === 'object') {
-                Object.entries(payload.subBlocks).forEach(([subblockId, subblock]) => {
-                  if (WEBHOOK_SUBBLOCK_FIELDS.includes(subblockId)) {
-                    return
-                  }
-                  const value = (subblock as any)?.value
-                  if (value !== undefined) {
-                    subBlockStore.setValue(payload.id, subblockId, value)
-                  }
-                })
-              }
-              break
           }
         } else if (target === 'blocks') {
           switch (operation) {

apps/sim/socket/tests/socket-server.test.ts

@@ -103,18 +103,26 @@ describe('Socket Server Integration Tests', () => {
 
       const operationPromise = new Promise<void>((resolve) => {
         client2.once('workflow-operation', (data) => {
-          expect(data.operation).toBe('add')
-          expect(data.target).toBe('block')
-          expect(data.payload.id).toBe('block-123')
+          expect(data.operation).toBe('batch-add-blocks')
+          expect(data.target).toBe('blocks')
+          expect(data.payload.blocks[0].id).toBe('block-123')
           resolve()
         })
       })
 
       clientSocket.emit('workflow-operation', {
         workflowId,
-        operation: 'add',
-        target: 'block',
-        payload: { id: 'block-123', type: 'action', name: 'Test Block' },
+        operation: 'batch-add-blocks',
+        target: 'blocks',
+        payload: {
+          blocks: [
+            { id: 'block-123', type: 'action', name: 'Test Block', position: { x: 0, y: 0 } },
+          ],
+          edges: [],
+          loops: {},
+          parallels: {},
+          subBlockValues: {},
+        },
         timestamp: Date.now(),
       })
 
@@ -170,9 +178,17 @@ describe('Socket Server Integration Tests', () => {
 
       clients[0].emit('workflow-operation', {
         workflowId,
-        operation: 'add',
-        target: 'block',
-        payload: { id: 'stress-block', type: 'action' },
+        operation: 'batch-add-blocks',
+        target: 'blocks',
+        payload: {
+          blocks: [
+            { id: 'stress-block', type: 'action', name: 'Stress Block', position: { x: 0, y: 0 } },
+          ],
+          edges: [],
+          loops: {},
+          parallels: {},
+          subBlockValues: {},
+        },
         timestamp: Date.now(),
       })
 
@@ -211,7 +227,7 @@ describe('Socket Server Integration Tests', () => {
       const operationsPromise = new Promise<void>((resolve) => {
         client2.on('workflow-operation', (data) => {
           receivedCount++
-          receivedOperations.add(data.payload.id)
+          receivedOperations.add(data.payload.blocks[0].id)
 
           if (receivedCount === numOperations) {
             resolve()
@@ -222,9 +238,22 @@ describe('Socket Server Integration Tests', () => {
       for (let i = 0; i < numOperations; i++) {
         clientSocket.emit('workflow-operation', {
           workflowId,
-          operation: 'add',
-          target: 'block',
-          payload: { id: `rapid-block-${i}`, type: 'action' },
+          operation: 'batch-add-blocks',
+          target: 'blocks',
+          payload: {
+            blocks: [
+              {
+                id: `rapid-block-${i}`,
+                type: 'action',
+                name: `Rapid Block ${i}`,
+                position: { x: 0, y: 0 },
+              },
+            ],
+            edges: [],
+            loops: {},
+            parallels: {},
+            subBlockValues: {},
+          },
           timestamp: Date.now(),
         })
       }

apps/sim/stores/operation-queue/store.ts

@@ -375,15 +375,31 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
   cancelOperationsForBlock: (blockId: string) => {
     logger.debug('Canceling all operations for block', { blockId })
 
-    // No debounced timeouts to cancel (moved to server-side)
-
-    // Find and cancel operation timeouts for operations related to this block
     const state = get()
-    const operationsToCancel = state.operations.filter(
-      (op) =>
-        (op.operation.target === 'block' && op.operation.payload?.id === blockId) ||
-        (op.operation.target === 'subblock' && op.operation.payload?.blockId === blockId)
-    )
+    const operationsToCancel = state.operations.filter((op) => {
+      const { target, payload, operation } = op.operation
+
+      // Single block property updates (update-position, toggle-enabled, update-name, etc.)
+      if (target === 'block' && payload?.id === blockId) return true
+
+      // Subblock updates for this block
+      if (target === 'subblock' && payload?.blockId === blockId) return true
+
+      // Batch block operations
+      if (target === 'blocks') {
+        if (operation === 'batch-add-blocks' && Array.isArray(payload?.blocks)) {
+          return payload.blocks.some((b: { id: string }) => b.id === blockId)
+        }
+        if (operation === 'batch-remove-blocks' && Array.isArray(payload?.ids)) {
+          return payload.ids.includes(blockId)
+        }
+        if (operation === 'batch-update-positions' && Array.isArray(payload?.updates)) {
+          return payload.updates.some((u: { id: string }) => u.id === blockId)
+        }
+      }
+
+      return false
+    })
 
     // Cancel timeouts for these operations
     operationsToCancel.forEach((op) => {
@@ -401,13 +417,30 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
     })
 
     // Remove all operations for this block (both pending and processing)
-    const newOperations = state.operations.filter(
-      (op) =>
-        !(
-          (op.operation.target === 'block' && op.operation.payload?.id === blockId) ||
-          (op.operation.target === 'subblock' && op.operation.payload?.blockId === blockId)
-        )
-    )
+    const newOperations = state.operations.filter((op) => {
+      const { target, payload, operation } = op.operation
+
+      // Single block property updates (update-position, toggle-enabled, update-name, etc.)
+      if (target === 'block' && payload?.id === blockId) return false
+
+      // Subblock updates for this block
+      if (target === 'subblock' && payload?.blockId === blockId) return false
+
+      // Batch block operations
+      if (target === 'blocks') {
+        if (operation === 'batch-add-blocks' && Array.isArray(payload?.blocks)) {
+          if (payload.blocks.some((b: { id: string }) => b.id === blockId)) return false
+        }
+        if (operation === 'batch-remove-blocks' && Array.isArray(payload?.ids)) {
+          if (payload.ids.includes(blockId)) return false
+        }
+        if (operation === 'batch-update-positions' && Array.isArray(payload?.updates)) {
+          if (payload.updates.some((u: { id: string }) => u.id === blockId)) return false
+        }
+      }
+
+      return true
+    })
 
     set({
       operations: newOperations,