From 86928bbb2d41c3a927a25cd7c3d5b7d003e99950 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 26 Jul 2019 23:06:56 +0900
Subject: [PATCH 1/2] fix converting selection to subflow

---
 .../@node-red/editor-client/src/js/nodes.js         | 13 +++++++++++++
 .../@node-red/editor-client/src/js/ui/subflow.js    |  2 +-
 2 files changed, 14 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 63027aed1..c14126a00 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
@@ -301,6 +301,17 @@ RED.nodes = (function() {
         return {links:removedLinks,nodes:removedNodes};
     }
 
+    function moveNodeToTab(node, z) {
+        if (nodeTabMap[node.z]) {
+            delete nodeTabMap[node.z][node.id];
+        }
+        if (!nodeTabMap[z]) {
+            nodeTabMap[z] = {};
+        }
+        nodeTabMap[z][node.iz] = node;
+        node.z = z;
+    }
+    
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -1466,6 +1477,8 @@ RED.nodes = (function() {
         remove: removeNode,
         clear: clear,
 
+        moveNodeToTab: moveNodeToTab,
+        
         addLink: addLink,
         removeLink: removeLink,
 
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 e136f7df6..a8be067d6 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
@@ -723,7 +723,7 @@ RED.subflow = (function() {
             }
             n.x -= offsetX;
             n.y -= offsetY;
-            n.z = subflow.id;
+            RED.nodes.moveNodeToTab(n, subflow.id);
         }
 
         RED.history.push({

From cbce9b8637f818a179ed9b4998e1cb19470d17cc Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 30 Jul 2019 11:07:55 +0900
Subject: [PATCH 2/2] fix undo handling & typo

---
 packages/node_modules/@node-red/editor-client/src/js/history.js | 2 ++
 packages/node_modules/@node-red/editor-client/src/js/nodes.js   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index 930598dd5..f0e248689 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -276,11 +276,13 @@ RED.history = (function() {
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
                 if (ev.nodes) {
+                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        RED.nodes.moveNodeToTab(n, z);
                     });
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.remove(ev.nodes[i]);
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 c14126a00..2a800322b 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
@@ -308,7 +308,7 @@ RED.nodes = (function() {
         if (!nodeTabMap[z]) {
             nodeTabMap[z] = {};
         }
-        nodeTabMap[z][node.iz] = node;
+        nodeTabMap[z][node.id] = node;
         node.z = z;
     }