Skip to content

fix(sockets): duplicate block op should go through debounced path #834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 1 commit into from
Jul 31, 2025
Merged

fix(sockets): duplicate block op should go through debounced path #834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 62 additions & 56 deletions apps/sim/hooks/use-collaborative-workflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,64 @@ export function useCollaborativeWorkflow() {
[executeQueuedOperation, workflowStore]
)

const collaborativeAddEdge = useCallback(
(edge: Edge) => {
executeQueuedOperation('add', 'edge', edge, () => workflowStore.addEdge(edge))
},
[executeQueuedOperation, workflowStore]
)

const collaborativeRemoveEdge = useCallback(
(edgeId: string) => {
executeQueuedOperation('remove', 'edge', { id: edgeId }, () =>
workflowStore.removeEdge(edgeId)
)
},
[executeQueuedOperation, workflowStore]
)

const collaborativeSetSubblockValue = useCallback(
(blockId: string, subblockId: string, value: any) => {
if (isApplyingRemoteChange.current) return

if (!currentWorkflowId || activeWorkflowId !== currentWorkflowId) {
logger.debug('Skipping subblock update - not in active workflow', {
currentWorkflowId,
activeWorkflowId,
blockId,
subblockId,
})
return
}

// Generate operation ID for queue tracking
const operationId = crypto.randomUUID()

// Add to queue for retry mechanism
addToQueue({
id: operationId,
operation: {
operation: 'subblock-update',
target: 'subblock',
payload: { blockId, subblockId, value },
},
workflowId: activeWorkflowId || '',
userId: session?.user?.id || 'unknown',
})

// Apply locally first (immediate UI feedback)
subBlockStore.setValue(blockId, subblockId, value)
},
[
subBlockStore,
emitSubblockUpdate,
currentWorkflowId,
activeWorkflowId,
addToQueue,
session?.user?.id,
]
)

const collaborativeDuplicateBlock = useCallback(
(sourceId: string) => {
const sourceBlock = workflowStore.blocks[sourceId]
Expand Down Expand Up @@ -737,69 +795,17 @@ export function useCollaborativeWorkflow() {
const subBlockValues = subBlockStore.workflowValues[activeWorkflowId || '']?.[sourceId]
if (subBlockValues && activeWorkflowId) {
Object.entries(subBlockValues).forEach(([subblockId, value]) => {
subBlockStore.setValue(newId, subblockId, value)
collaborativeSetSubblockValue(newId, subblockId, value)
Copy link
Collaborator Author

@icecrasher321 icecrasher321 Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

main change -- rest is just rearranging

})
}
})
},
[executeQueuedOperation, workflowStore, subBlockStore, activeWorkflowId]
)

const collaborativeAddEdge = useCallback(
(edge: Edge) => {
executeQueuedOperation('add', 'edge', edge, () => workflowStore.addEdge(edge))
},
[executeQueuedOperation, workflowStore]
)

const collaborativeRemoveEdge = useCallback(
(edgeId: string) => {
executeQueuedOperation('remove', 'edge', { id: edgeId }, () =>
workflowStore.removeEdge(edgeId)
)
},
[executeQueuedOperation, workflowStore]
)

const collaborativeSetSubblockValue = useCallback(
(blockId: string, subblockId: string, value: any) => {
if (isApplyingRemoteChange.current) return

if (!currentWorkflowId || activeWorkflowId !== currentWorkflowId) {
logger.debug('Skipping subblock update - not in active workflow', {
currentWorkflowId,
activeWorkflowId,
blockId,
subblockId,
})
return
}

// Generate operation ID for queue tracking
const operationId = crypto.randomUUID()

// Add to queue for retry mechanism
addToQueue({
id: operationId,
operation: {
operation: 'subblock-update',
target: 'subblock',
payload: { blockId, subblockId, value },
},
workflowId: activeWorkflowId || '',
userId: session?.user?.id || 'unknown',
})

// Apply locally first (immediate UI feedback)
subBlockStore.setValue(blockId, subblockId, value)
},
[
executeQueuedOperation,
workflowStore,
subBlockStore,
emitSubblockUpdate,
currentWorkflowId,
activeWorkflowId,
addToQueue,
session?.user?.id,
collaborativeSetSubblockValue,
]
)

Expand Down