luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Ensure disconnect error doesn't appear w/auth change on some pages (#11905)

This commit is contained in:
John Cowen 2022-01-04 14:55:32 +00:00 committed by GitHub
parent c64c512d1b
commit 2e571b6406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11905.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
ui: Prevent disconnection notice appearing with auth change on certain pages
```

6
ui/packages/consul-ui/app/components/data-loader/index.hbs
View File

@ -50,10 +50,10 @@
<State @matches={{array "idle" "disconnected" "invalidating"}}> <State @matches={{array "idle" "disconnected" "invalidating"}}>
<State @matches="disconnected"> <State @matches="disconnected">
{{#if (not (eq error.status '401'))}}
{{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}} {{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}}
{{yield api}} {{yield api}}
{{else}} {{else}}
{{#if (not eq error.status '401')}}
<Notice <Notice
{{notification {{notification
sticky=true sticky=true
@ -70,8 +70,8 @@
</p> </p>
</notice.Body> </notice.Body>
</Notice> </Notice>
{{/if}}
{{/yield-slot}} {{/yield-slot}}
{{/if}}
</State> </State>
{{#if (eq error.status "403")}} {{#if (eq error.status "403")}}
{{#yield-slot name="error"}} {{#yield-slot name="error"}}