Skip to content

fix: Loop node deletion without deleting loop body #4090

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
shaohuzhang1 merged 1 commit into from
Sep 23, 2025
Merged

fix: Loop node deletion without deleting loop body #4090

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
8 changes: 8 additions & 0 deletions ui/src/workflow/common/NodeContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,14 @@ const deleteNode = () => {
confirmButtonText: t('common.confirm'),
confirmButtonClass: 'danger',
}).then(() => {
if (props.nodeModel.type === WorkflowType.LoopNode) {
const next = props.nodeModel.graphModel.getNodeOutgoingNode(props.nodeModel.id)
next.forEach((n: any) => {
if (n.type === 'loop-body-node') {
props.nodeModel.graphModel.deleteNode(n.id)
}
})
}
props.nodeModel.graphModel.deleteNode(props.nodeModel.id)
})
props.nodeModel.graphModel.eventCenter.emit('delete_node')
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Sep 23, 2025

Choose a reason for hiding this comment

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

There are a few adjustments to ensure the code is more efficient and readable:

const deleteNode = () => {
  confirmAlert({
    title: t('common.confirm'),
    message: t('workflow.remove_node_confirm.message'), // Assuming you have a message string
    confirmButtonText: t('common.confirm'),
    confirmButtonClass: 'danger',
  }).then(() => {
    const nodeModel = props.nodeModel;
    
    if (!nodeModel || !(nodeModel.type && nodeModel.graphModel)) {
      console.error("Node model or its graph model is not properly set.");
      return;
    }

    if (nodeModel.type !== WorkflowType.LoopNode) {
      nodeModel.graphModel.deleteNode(nodeModel.id);
      props.nodeModel.graphModel.eventCenter.emit('delete_node');
      return;
    }

    const { id } = nodeModel,
          outNodes = props.nodeModel.graphModel.getAllOutgoingNodesById(id),
          loopBodyNodeId = outNodes.find(no => no.nodeType === "loop-body-node");

    if (loopBodyNodeId) {
      nodeModel.graphModel.deleteNode(loopBodyNodeId);
    }

    nodeModel.graphModel.deleteNode(id);
    props.nodeModel.graphModel.eventCenter.emit('delete_node');
  });
};

Potential Improvements:

  1. Error Handling: Added checks to see if nodeModel exists and has both type and graphModel.
  2. Message String: Assumed there's a translation function for displaying confirmation messages. Replace 'workflow.remove_node_confirm.message' with your actual message key.
  3. Simplified Loop Body Deletion Logic: Used ES6 syntax (...) for better readability, but this was initially suggested mistakenly.

This version improves the robustness of error handling and makes the logic clearer without changing functionality significantly.

Expand Down
Loading