From 2d20c4e40806f1473e4cf52c35dab9b8b2ab8670 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Tue, 5 Jan 2021 10:04:03 +0000
Subject: [PATCH] ui: Fix up erroneously placed conditional (#9447)

This meant that when where were no upstreams, no message would show
telling you of that fact. This commit means an EmptyState will now show instead.
---
 .../dc/services/instance/upstreams.hbs        | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
index 27e72fbca3..d36f1cfef0 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
@@ -22,31 +22,31 @@
           searchproperty=(action (mut searchproperty) value="target.selectedItems")
         }}
       />
-      <DataCollection
-        @type="upstream-instance"
-        @sort={{sort}}
-        @filters={{filters}}
-        @search={{search}}
-        @items={{proxy.Service.Proxy.Upstreams}}
-      as |collection|>
-        <collection.Collection>
-          <Consul::UpstreamInstance::List
-            @items={{collection.items}}
-            @dc={{dc}}
-            @nspace={{nspace}}
-          />
-        </collection.Collection>
-        <collection.Empty>
-          <EmptyState>
-            <BlockSlot @name="body">
-              <p>
-                This service has no upstreams{{#if (gt proxy.Service.Proxy.Upstreams.length 0)}} matching that search{{/if}}.
-              </p>
-            </BlockSlot>
-          </EmptyState>
-        </collection.Empty>
-      </DataCollection>
     {{/if}}
+    <DataCollection
+      @type="upstream-instance"
+      @sort={{sort}}
+      @filters={{filters}}
+      @search={{search}}
+      @items={{proxy.Service.Proxy.Upstreams}}
+    as |collection|>
+      <collection.Collection>
+        <Consul::UpstreamInstance::List
+          @items={{collection.items}}
+          @dc={{dc}}
+          @nspace={{nspace}}
+        />
+      </collection.Collection>
+      <collection.Empty>
+        <EmptyState>
+          <BlockSlot @name="body">
+            <p>
+              This service has no upstreams{{#if (gt proxy.Service.Proxy.Upstreams.length 0)}} matching that search{{/if}}.
+            </p>
+          </BlockSlot>
+        </EmptyState>
+      </collection.Empty>
+    </DataCollection>
   {{/let}}
 {{/let}}
   </div>