From bfe0d3b8a3caa3c026efab4978e4b06737f77795 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 8 Nov 2021 21:12:13 +0000
Subject: [PATCH] Do not show status for disabled nodes Fixes #3249

---
 .../@node-red/editor-client/src/js/ui/tab-info-outliner.js | 2 ++
 .../node_modules/@node-red/editor-client/src/js/ui/view.js | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
index e6eff18ae..35267331c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -175,6 +175,7 @@ RED.sidebar.info.outliner = (function() {
                                     n.d = true;
                                 }
                                 n.dirty = true;
+                                n.dirtyStatus = true;
                                 n.changed = true;
                                 RED.events.emit("nodes:change",n);
                                 groupHistoryEvent.events.push(historyEvent);
@@ -203,6 +204,7 @@ RED.sidebar.info.outliner = (function() {
                         n.d = true;
                     }
                     n.dirty = true;
+                    n.dirtyStatus = true;
                     n.changed = true;
                     RED.events.emit("nodes:change",n);
                     RED.history.push(historyEvent);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 014ebdcfb..94865064f 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -3675,7 +3675,11 @@ RED.view = (function() {
             nodeEl = document.getElementById(d.id);
         }
         if (nodeEl) {
-            if (!showStatus || !d.status) {
+            // Do not show node status if:
+            // - global flag set
+            // - node has no status
+            // - node is disabled
+            if (!showStatus || !d.status || d.d === true) {
                 nodeEl.__statusGroup__.style.display = "none";
             } else {
                 nodeEl.__statusGroup__.style.display = "inline";
@@ -5029,6 +5033,7 @@ RED.view = (function() {
                             delete node.d;
                         }
                         node.dirty = true;
+                        node.dirtyStatus = true;
                         node.changed = true;
                         RED.events.emit("nodes:change",node);
                     }