From 1be337fbc50eb4ee2337f20372dc2963bf46a454 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 13 Feb 2021 00:23:30 +0900
Subject: [PATCH] make nodes with only group change not deployed by nodes
 deploy mode

---
 packages/node_modules/@node-red/runtime/lib/flows/index.js | 3 ++-
 packages/node_modules/@node-red/runtime/lib/flows/util.js  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/flows/index.js b/packages/node_modules/@node-red/runtime/lib/flows/index.js
index b31dc7755..16d81d4a2 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/index.js
@@ -148,7 +148,8 @@ function setFlows(_config,_credentials,type,muteLog,forceStart,user) {
         // Parse the configuration
         newFlowConfig = flowUtil.parseConfig(clone(config));
         // Generate a diff to identify what has changed
-        diff = flowUtil.diffConfigs(activeFlowConfig,newFlowConfig);
+        diff = flowUtil.diffConfigs(activeFlowConfig,newFlowConfig,
+                                    (type === "nodes"));
 
         // Now the flows have been compared, remove any credentials from newFlowConfig
         // so they don't cause false-positive diffs the next time a flow is deployed
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/util.js b/packages/node_modules/@node-red/runtime/lib/flows/util.js
index 31c822313..f7478e820 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -271,7 +271,7 @@ module.exports = {
 
     parseConfig: parseConfig,
 
-    diffConfigs: function(oldConfig, newConfig) {
+    diffConfigs: function(oldConfig, newConfig, ignoreGroup) {
         var id;
         var node;
         var nn;
@@ -438,6 +438,9 @@ module.exports = {
                 if (newConfig.allNodes.hasOwnProperty(id)) {
                     node = newConfig.allNodes[id];
                     for (var prop in node) {
+                        if (ignoreGroup && (prop === "g")) {
+                            continue;
+                        }
                         if (node.hasOwnProperty(prop) && prop != "z" && prop != "id" && prop != "wires") {
                             // This node has a property that references a changed/removed node
                             // Assume it is a config node change and mark this node as