Skip to content
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

Jump to bottom

Prevent loops being created with junction nodes #4087

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Prevent loops being created with junction nodes #4087

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/node_modules/@node-red/editor-client/src/js/nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,11 @@ RED.nodes = (function() {
return false;
}

function getDownstreamNodes(node) {
const downstreamLinks = nodeLinks[node.id].out
const downstreamNodes = new Set(downstreamLinks.map(l => l.target))
return Array.from(downstreamNodes)
}
function getAllDownstreamNodes(node) {
return getAllFlowNodes(node,'down').filter(function(n) { return n !== node });
}
Expand Down Expand Up @@ -3086,6 +3091,7 @@ RED.nodes = (function() {
getAllFlowNodes: getAllFlowNodes,
getAllUpstreamNodes: getAllUpstreamNodes,
getAllDownstreamNodes: getAllDownstreamNodes,
getDownstreamNodes: getDownstreamNodes,
getNodeIslands: getNodeIslands,
createExportableNodeSet: createExportableNodeSet,
createCompleteNodeSet: createCompleteNodeSet,
Expand Down
6 changes: 3 additions & 3 deletions packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ RED.contextMenu = (function () {
dirty: true,
moved: true
}
const junction = RED.nodes.addJunction(nn);
const historyEvent = {
dirty: RED.nodes.dirty(),
t: 'add',
junctions: [nn]
junctions: [junction]
}
RED.nodes.addJunction(nn);
RED.history.push(historyEvent);
RED.nodes.dirty(true);
RED.view.select({nodes: [nn] });
RED.view.select({nodes: [junction] });
RED.view.redraw(true)
},
disabled: !canEdit
Expand Down
19 changes: 18 additions & 1 deletion packages/node_modules/@node-red/editor-client/src/js/ui/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3095,8 +3095,25 @@ RED.view = (function() {
(drag_line.portType === PORT_TYPE_INPUT && mouseup_node.type === "subflow" && (mouseup_node.direction === "status" || mouseup_node.direction === "out")) ||
(drag_line.portType === PORT_TYPE_OUTPUT && mouseup_node.type === "subflow" && mouseup_node.direction === "in")
)) {
let hasJunctionLoop = false
if (link.source.type === 'junction' && link.target.type === 'junction') {
// This is joining two junctions together. We want to avoid creating a loop
// of pure junction nodes as there is no way to break out of it.

const visited = new Set()
let toVisit = [link.target]
while (toVisit.length > 0) {
const next = toVisit.shift()
if (next === link.source) {
hasJunctionLoop = true
break
}
visited.add(next)
toVisit = toVisit.concat(RED.nodes.getDownstreamNodes(next).filter(n => n.type === 'junction' && !visited.has(n)))
}
}
var existingLink = RED.nodes.filterLinks({source:src,target:dst,sourcePort: src_port}).length !== 0;
if (!existingLink) {
if (!hasJunctionLoop && !existingLink) {
RED.nodes.addLink(link);
addedLinks.push(link);
}
Expand Down