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

Handle users of env config nodes when saving subflow node config

Browse Source
This commit is contained in:
GogoVega 2024-11-07 21:59:14 +01:00
parent 3d9bc265dd
commit f2d72b1050
No known key found for this signature in database
GPG Key ID: E1E048B63AC5AC2B
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js vendored
View File

@ -20,10 +20,31 @@
apply: function(editState) { apply: function(editState) {
var old_env = node.env; var old_env = node.env;
var new_env = []; var new_env = [];
if (/^subflow:/.test(node.type)) { if (/^subflow:/.test(node.type)) {
// Get the list of environment variables from the node properties
new_env = RED.subflow.exportSubflowInstanceEnv(node); new_env = RED.subflow.exportSubflowInstanceEnv(node);
} }
if (old_env && old_env.length) {
old_env.forEach(function (prop) {
if (prop.type === "conf-type" && prop.value) {
const stillInUse = new_env?.some((p) => p.type === "conf-type" && p.name === prop.name && p.value === prop.value);
if (!stillInUse) {
// Remove the node from the config node users
// Only for empty value or modified
const configNode = RED.nodes.node(prop.value);
if (configNode) {
if (configNode.users.indexOf(node) !== -1) {
configNode.users.splice(configNode.users.indexOf(node), 1);
RED.events.emit('nodes:change', configNode)
}
}
}
}
});
}
// Get the values from the Properties table tab // Get the values from the Properties table tab
var items = this.list.editableList('items'); var items = this.list.editableList('items');
items.each(function (i,el) { items.each(function (i,el) {
@ -41,7 +62,6 @@
} }
}); });
if (new_env && new_env.length > 0) { if (new_env && new_env.length > 0) {
new_env.forEach(function(prop) { new_env.forEach(function(prop) {
if (prop.type === "cred") { if (prop.type === "cred") {
@ -52,6 +72,15 @@
editState.changed = true; editState.changed = true;
} }
delete prop.value; delete prop.value;
} else if (prop.type === "conf-type" && prop.value) {
const configNode = RED.nodes.node(prop.value);
if (configNode) {
if (configNode.users.indexOf(node) === -1) {
// Add the node to the config node users
configNode.users.push(node);
RED.events.emit('nodes:change', configNode);
}
}
} }
}); });
} }

1
packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js vendored
View File

@ -44,6 +44,7 @@
apply: function(editState) { apply: function(editState) {
var newValue; var newValue;
var d; var d;
// If the node is a subflow, the node's properties (exepts name) are saved by `envProperties`
if (node._def.defaults) { if (node._def.defaults) {
for (d in node._def.defaults) { for (d in node._def.defaults) {
if (node._def.defaults.hasOwnProperty(d)) { if (node._def.defaults.hasOwnProperty(d)) {

2
packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js vendored
View File

@ -1362,7 +1362,7 @@ RED.subflow = (function() {
item.value = ""+input.prop("checked"); item.value = ""+input.prop("checked");
break; break;
case "conf-types": case "conf-types":
item.value = input.val() item.value = input.val() === "_ADD_" ? "" : input.val();
item.type = "conf-type" item.type = "conf-type"
} }
if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) { if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) {