Skip to content

fix: the edges between the nodes inside the copied iteration node are… #12692

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.

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
merged 1 commit into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 31 additions & 1 deletion web/app/components/workflow/hooks/use-nodes-interactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1117,9 +1117,12 @@ export const useNodesInteractions = () => {
const {
getNodes,
setNodes,
edges,
setEdges,
} = store.getState()

const nodesToPaste: Node[] = []
const edgesToPaste: Edge[] = []
const nodes = getNodes()

if (clipboardElements.length) {
Expand All @@ -1128,6 +1131,7 @@ export const useNodesInteractions = () => {
const currentPosition = screenToFlowPosition({ x: mousePosition.pageX, y: mousePosition.pageY })
const offsetX = currentPosition.x - x
const offsetY = currentPosition.y - y
let idMapping: Record<string, string> = {}
clipboardElements.forEach((nodeToPaste, index) => {
const nodeType = nodeToPaste.data.type

Expand Down Expand Up @@ -1159,7 +1163,13 @@ export const useNodesInteractions = () => {
newIterationStartNode!.parentId = newNode.id;
(newNode.data as IterationNodeType).start_node_id = newIterationStartNode!.id

newChildren = handleNodeIterationChildrenCopy(nodeToPaste.id, newNode.id)
const oldIterationStartNode = nodes
.find(n => n.parentId === nodeToPaste.id && n.type === CUSTOM_ITERATION_START_NODE)
idMapping[oldIterationStartNode!.id] = newIterationStartNode!.id

const { copyChildren, newIdMapping } = handleNodeIterationChildrenCopy(nodeToPaste.id, newNode.id, idMapping)
newChildren = copyChildren
idMapping = newIdMapping
newChildren.forEach((child) => {
newNode.data._children?.push(child.id)
})
Expand All @@ -1172,7 +1182,27 @@ export const useNodesInteractions = () => {
nodesToPaste.push(...newChildren)
})

edges.forEach((edge) => {
const sourceId = idMapping[edge.source]
const targetId = idMapping[edge.target]

if (sourceId && targetId) {
const newEdge: Edge = {
...edge,
id: `${sourceId}-${edge.sourceHandle}-${targetId}-${edge.targetHandle}`,
source: sourceId,
target: targetId,
data: {
...edge.data,
_connectedNodeIsSelected: false,
},
}
edgesToPaste.push(newEdge)
}
})

setNodes([...nodes, ...nodesToPaste])
setEdges([...edges, ...edgesToPaste])
saveStateToHistory(WorkflowHistoryEvent.NodePaste)
handleSyncWorkflowDraft()
}
Expand Down
11 changes: 9 additions & 2 deletions web/app/components/workflow/nodes/iteration/use-interactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,13 @@ export const useNodeIterationInteractions = () => {
handleNodeIterationRerender(parentId)
}, [store, handleNodeIterationRerender])

const handleNodeIterationChildrenCopy = useCallback((nodeId: string, newNodeId: string) => {
const handleNodeIterationChildrenCopy = useCallback((nodeId: string, newNodeId: string, idMapping: Record<string, string>) => {
const { getNodes } = store.getState()
const nodes = getNodes()
const childrenNodes = nodes.filter(n => n.parentId === nodeId && n.type !== CUSTOM_ITERATION_START_NODE)
const newIdMapping = { ...idMapping }

return childrenNodes.map((child, index) => {
const copyChildren = childrenNodes.map((child, index) => {
const childNodeType = child.data.type as BlockEnum
const nodesWithSameType = nodes.filter(node => node.data.type === childNodeType)
const { newNode } = generateNewNode({
Expand All @@ -131,8 +132,14 @@ export const useNodeIterationInteractions = () => {
zIndex: child.zIndex,
})
newNode.id = `${newNodeId}${newNode.id + index}`
newIdMapping[child.id] = newNode.id
return newNode
})

return {
copyChildren,
newIdMapping,
}
}, [store, t])

return {
Expand Down
Loading