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 #4093 from node-red/subflow-nested-context

Browse Source 
Generate stable ids for subflow instance internal nodes
This commit is contained in:
Nick O'Leary
2023-03-06 17:13:10 +00:00
committed by GitHub
parent 2d066307f4 e47698bfd4
commit 4deca552fa
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/runtime/lib/flows/Subflow.js vendored
View File

@@ -474,7 +474,7 @@ class Subflow extends Flow {
*/ */
function createNodeInSubflow(subflowInstanceId, def) { function createNodeInSubflow(subflowInstanceId, def) {
let node = clone(def); let node = clone(def);
let nid = redUtil.generateId(); let nid = `${subflowInstanceId}-${node.id}` //redUtil.generateId();
// console.log("Create Node In subflow",node._alias, "--->",nid, "(",node.type,")") // console.log("Create Node In subflow",node._alias, "--->",nid, "(",node.type,")")
// node_map[node.id] = node; // node_map[node.id] = node;
node._alias = node.id; node._alias = node.id;

27
packages/node_modules/@node-red/runtime/lib/nodes/context/index.js vendored
View File

@@ -589,17 +589,28 @@ function deleteContext(id,flowId) {
* If flowConfig is undefined, all flow/node contexts will be removed * If flowConfig is undefined, all flow/node contexts will be removed
**/ **/
function clean(flowConfig) { function clean(flowConfig) {
flowConfig = flowConfig || { allNodes: {} }; flowConfig = flowConfig || { allNodes: {}, subflows: {} };
const knownNodes = new Set(Object.keys(flowConfig.allNodes))
// We need to alias all of the subflow instance contents
for (const subflow of Object.values(flowConfig.subflows || {})) {
subflow.instances.forEach(instance => {
for (const nodeId of Object.keys(subflow.nodes || {})) {
knownNodes.add(`${instance.id}-${nodeId}`)
}
for (const nodeId of Object.keys(subflow.configs || {})) {
knownNodes.add(`${instance.id}-${nodeId}`)
}
})
}
var promises = []; var promises = [];
for(var plugin in stores){ for (const store of Object.values(stores)){
if(stores.hasOwnProperty(plugin)){ promises.push(store.clean(Array.from(knownNodes)));
promises.push(stores[plugin].clean(Object.keys(flowConfig.allNodes)));
} }
} for (const id of Object.keys(contexts)) {
for (var id in contexts) { if (id !== "global") {
if (contexts.hasOwnProperty(id) && id !== "global") {
var idParts = id.split(":"); var idParts = id.split(":");
if (!flowConfig.allNodes.hasOwnProperty(idParts[0])) { if (!knownNodes.has(idParts[0])) {
delete contexts[id]; delete contexts[id];
} }
} }