frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Node on deleted tab not removed on partial deploy

This commit is contained in:
Nick O'Leary 2015-03-15 21:27:11 +00:00
parent 42730b8fce
commit 46f2f752b0
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
red/nodes/Flow.js
View File

@ -530,6 +530,7 @@ function diffFlow(flow,config) {
var flowNodes = {};
var changedNodes = {};
var deletedNodes = {};
var deletedTabs = {};
var linkChangedNodes = {};
var activeLinks = {};
@ -582,8 +583,12 @@ function diffFlow(flow,config) {
});
flow.config.forEach(function(node) {
if (!flowNodes[node.id] && node.type != "tab") {
deletedNodes[node.id] = node;
if (!flowNodes[node.id]) {
if (node.type != "tab") {
deletedNodes[node.id] = node;
} else {
deletedTabs[node.id] = node;
}
}
buildNodeLinks(activeLinks,node,flow.allNodes);
});
@ -700,17 +705,17 @@ function diffFlow(flow,config) {
markLinkedNodes(linkChangedNodes,modifiedLinkNodes,newLinks,flowNodes);
//config.forEach(function(n) {
// console.log((changedNodes[n.id]!=null)?"[C]":"[ ]",(linkChangedNodes[n.id]!=null)?"[L]":"[ ]","[ ]",n.id,n.type,n.name);
//});
//Object.keys(deletedNodes).forEach(function(id) {
// var n = flow.allNodes[id];
// console.log("[ ] [ ] [D]",n.id,n.type);
//});
// config.forEach(function(n) {
// console.log((changedNodes[n.id]!=null)?"[C]":"[ ]",(linkChangedNodes[n.id]!=null)?"[L]":"[ ]","[ ]",n.id,n.type,n.name);
// });
//
// Object.keys(deletedNodes).forEach(function(id) {
// var n = flow.allNodes[id];
// console.log("[ ] [ ] [D]",n.id,n.type);
// });
var diff = {
deleted: Object.keys(deletedNodes).filter(function(id) { return deletedNodes[id].type != "subflow" && (!deletedNodes[id].z || flowNodes[deletedNodes[id].z].type != "subflow")}),
deleted: Object.keys(deletedNodes).filter(function(id) { return deletedNodes[id].type != "subflow" && (!deletedNodes[id].z || deletedTabs[deletedNodes[id].z] || flowNodes[deletedNodes[id].z].type != "subflow")}),
changed: Object.keys(changedNodes).filter(function(id) { return changedNodes[id].type != "subflow" && (!changedNodes[id].z || flowNodes[changedNodes[id].z].type != "subflow")}),
linked: Object.keys(linkChangedNodes).filter(function(id) { return linkChangedNodes[id].type != "subflow" && (!linkChangedNodes[id].z || flowNodes[linkChangedNodes[id].z].type != "subflow")}),
wiringChanged: []