frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

[groups] Include groups when exporting

Browse Source
This commit is contained in:
Nick O'Leary 2020-03-26 18:01:57 +00:00
parent 1bdbd31b96
commit 03e9522d98
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 19 additions and 4 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

@ -697,8 +697,18 @@ RED.nodes = (function() {
/** /**
* Converts the current node selection to an exportable JSON Object * Converts the current node selection to an exportable JSON Object
**/ **/
function createExportableNodeSet(set, exportedSubflows, exportedConfigNodes) { function createExportableNodeSet(set, exportedIds, exportedSubflows, exportedConfigNodes) {
var nns = []; var nns = [];
exportedIds = exportedIds || {};
set = set.filter(function(n) {
if (exportedIds[n.id]) {
return false;
}
exportedIds[n.id] = true;
return true;
})
exportedConfigNodes = exportedConfigNodes || {}; exportedConfigNodes = exportedConfigNodes || {};
exportedSubflows = exportedSubflows || {}; exportedSubflows = exportedSubflows || {};
for (var n=0;n<set.length;n++) { for (var n=0;n<set.length;n++) {
@ -714,11 +724,11 @@ RED.nodes = (function() {
subflowSet.push(n); subflowSet.push(n);
} }
}); });
var exportableSubflow = createExportableNodeSet(subflowSet, exportedSubflows, exportedConfigNodes); var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
nns = exportableSubflow.concat(nns); nns = exportableSubflow.concat(nns);
} }
} }
if (node.type != "subflow") { if (node.type !== "subflow") {
var convertedNode = RED.nodes.convertNode(node); var convertedNode = RED.nodes.convertNode(node);
for (var d in node._def.defaults) { for (var d in node._def.defaults) {
if (node._def.defaults[d].type && node[d] in configNodes) { if (node._def.defaults[d].type && node[d] in configNodes) {
@ -735,6 +745,9 @@ RED.nodes = (function() {
} }
} }
nns.push(convertedNode); nns.push(convertedNode);
if (node.type === "group") {
nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
}
} else { } else {
var convertedSubflow = convertSubflow(node); var convertedSubflow = convertSubflow(node);
nns.push(convertedSubflow); nns.push(convertedSubflow);

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

@ -583,6 +583,7 @@ RED.clipboard = (function() {
nodes = []; nodes = [];
selection.forEach(function(n) { selection.forEach(function(n) {
nodes.push(n); nodes.push(n);
nodes = nodes.concat(RED.nodes.groups(n.id));
nodes = nodes.concat(RED.nodes.filterNodes({z:n.id})); nodes = nodes.concat(RED.nodes.filterNodes({z:n.id}));
}); });
} else { } else {
@ -592,7 +593,8 @@ RED.clipboard = (function() {
nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'})); nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
} else if (type === 'red-ui-clipboard-dialog-export-rng-flow') { } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
var activeWorkspace = RED.workspaces.active(); var activeWorkspace = RED.workspaces.active();
nodes = RED.nodes.filterNodes({z:activeWorkspace}); nodes = RED.nodes.groups(activeWorkspace);
nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace); var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
nodes.unshift(parentNode); nodes.unshift(parentNode);
nodes = RED.nodes.createExportableNodeSet(nodes); nodes = RED.nodes.createExportableNodeSet(nodes);