From fe9c630572fe9432fd6de6ff968c5a1905f79e2d Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 1 Nov 2022 11:42:40 +0000 Subject: [PATCH] Prevent deleting subflow if instance on locked tab --- packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +- .../node_modules/@node-red/editor-client/src/js/ui/subflow.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index 715ae9c49..bbb6eb82f 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -616,7 +616,7 @@ RED.nodes = (function() { var subflowId = n.type.substring(8); var sf = RED.nodes.subflow(subflowId); if (sf) { - sf.instances.push(sf); + sf.instances.push(newNode); } n["_"] = RED._; } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js index 9ba4cb0bf..110533c1e 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js @@ -450,6 +450,9 @@ RED.subflow = (function() { return } if (subflow.instances.length > 0) { + if (subflow.instances.some(sf => { const ws = RED.nodes.workspace(sf.z); return ws?ws.locked:false })) { + return + } const msg = $('
') $('

').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg); $('

').text(RED._("subflow.confirmDelete")).appendTo(msg);