From 72e5d7e1d43e52a54d4f5d663410568de82a6fee Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:55:32 +0000
Subject: [PATCH] ui: Ensure disconnect error doesn't appear w/auth change on
 some pages (#11905)

---
 .changelog/11905.txt                                       | 3 +++
 ui/packages/consul-ui/app/components/data-loader/index.hbs | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/11905.txt

diff --git a/.changelog/11905.txt b/.changelog/11905.txt
new file mode 100644
index 0000000000..510e305d0d
--- /dev/null
+++ b/.changelog/11905.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Prevent disconnection notice appearing with auth change on certain pages
+```
diff --git a/ui/packages/consul-ui/app/components/data-loader/index.hbs b/ui/packages/consul-ui/app/components/data-loader/index.hbs
index b29d59a584..6f38827ab4 100644
--- a/ui/packages/consul-ui/app/components/data-loader/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-loader/index.hbs
@@ -50,10 +50,10 @@
   <State @matches={{array "idle" "disconnected" "invalidating"}}>
 
     <State @matches="disconnected">
+      {{#if (not (eq error.status '401'))}}
         {{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}}
-          {{yield api}}
+            {{yield api}}
         {{else}}
-        {{#if (not eq error.status '401')}}
           <Notice
             {{notification
               sticky=true
@@ -70,8 +70,8 @@
               </p>
             </notice.Body>
           </Notice>
-        {{/if}}
         {{/yield-slot}}
+      {{/if}}
     </State>
     {{#if (eq error.status "403")}}
       {{#yield-slot name="error"}}