From ef7c9b5c2aaa27862154d81079f17f0bfa55930a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 6 Jul 2020 15:59:50 +0100
Subject: [PATCH] Get group order right in history events to ensure proper
 handling

---
 .../@node-red/editor-client/src/js/history.js |  4 +--
 .../@node-red/editor-client/src/js/nodes.js   | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

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 8c2de37ed..f7c43b5c9 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
@@ -85,7 +85,7 @@ RED.history = (function() {
                 }
                 if (ev.groups) {
                     inverseEv.groups = [];
-                    for (i=0;i<ev.groups.length;i++) {
+                    for (i = ev.groups.length - 1;i>=0;i--) {
                         group = ev.groups[i];
                         modifiedTabs[group.z] = true;
                         // The order of groups is important
@@ -214,7 +214,7 @@ RED.history = (function() {
                     inverseEv.groups = [];
                     var groupsToAdd = {};
                     ev.groups.forEach(function(g) { groupsToAdd[g.id] = g; });
-                    for (i=0;i<ev.groups.length;i++) {
+                    for (i = ev.groups.length - 1;i>=0;i--) {
                         RED.nodes.addGroup(ev.groups[i])
                         modifiedTabs[ev.groups[i].z] = true;
                         // The order of groups is important
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 f33d48007..57bb979d5 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
@@ -1427,6 +1427,9 @@ RED.nodes = (function() {
                 delete n.status.wires;
             }
         }
+        // Order the groups to ensure they are outer-most to inner-most
+        var groupDepthMap = {};
+        console.log(new_groups);
         for (i=0;i<new_groups.length;i++) {
             n = new_groups[i];
             if (n.g && node_map[n.g]) {
@@ -1437,8 +1440,33 @@ RED.nodes = (function() {
             n.nodes = n.nodes.map(function(id) {
                 return node_map[id];
             })
+            n.nodes = n.nodes.filter(function(v) { return !!v});
+            if (!n.g) {
+                groupDepthMap[n.id] = 0;
+            }
+        }
+        var changedDepth;
+        do {
+            changedDepth = false;
+            for (i=0;i<new_groups.length;i++) {
+                n = new_groups[i];
+                if (n.g) {
+                    if (groupDepthMap[n.id] !== groupDepthMap[n.g] + 1) {
+                        groupDepthMap[n.id] = groupDepthMap[n.g] + 1;
+                        changedDepth = true;
+                    }
+                }
+            }
+        } while(changedDepth);
+
+        new_groups.sort(function(A,B) {
+            return groupDepthMap[A.id] - groupDepthMap[B.id];
+        });
+        for (i=0;i<new_groups.length;i++) {
+            n = new_groups[i];
             addGroup(n);
         }
+
         // Now the nodes have been fully updated, add them.
         for (i=0;i<new_nodes.length;i++) {
             var node = new_nodes[i];