frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4857 from GogoVega/refix-4749

Browse Source 
Fix subflow outbound-link filter
This commit is contained in:
Nick O'Leary 2024-09-11 16:12:30 +01:00 committed by GitHub
commit 163c1c5b98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/node_modules/@node-red/editor-client/src/js/nodes.js vendored
View File

@ -2406,11 +2406,24 @@ RED.nodes = (function() {
} else { } else {
delete n.g delete n.g
} }
// If importing into a subflow, ensure an outbound-link doesn't get added // If importing a link node, ensure both ends of each link are either:
if (activeSubflow && /^link /.test(n.type) && n.links) { // - not in a subflow
// - both in the same subflow
if (/^link /.test(n.type) && n.links) {
n.links = n.links.filter(function(id) { n.links = n.links.filter(function(id) {
const otherNode = node_map[id] || RED.nodes.node(id); const otherNode = node_map[id] || RED.nodes.node(id);
return (otherNode && otherNode.z === activeWorkspace); if (!otherNode) {
// Cannot find other end - remove the link
return false
}
if (otherNode.z === n.z) {
// Both ends in the same flow/subflow
return true
} else if (!!getSubflow(n.z) || !!getSubflow(otherNode.z)) {
// One end is in a subflow - remove the link
return false
}
return true
}); });
} }
for (var d3 in n._def.defaults) { for (var d3 in n._def.defaults) {