From 0ea5250cf677bacaa9166f08b3448e94424ea6cd Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Tue, 9 Jun 2020 11:02:13 -0400
Subject: [PATCH] ui: Reorder the tabs for Ingress/Terminating Gateway Service
 Detail page (#8060)

---
 ui-v2/app/components/consul-service-list/index.hbs | 12 +++++++++++-
 ui-v2/app/templates/dc/services/index.hbs          |  2 +-
 ui-v2/app/templates/dc/services/show.hbs           |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui-v2/app/components/consul-service-list/index.hbs b/ui-v2/app/components/consul-service-list/index.hbs
index fa05e1d96d..c20a6194fb 100644
--- a/ui-v2/app/components/consul-service-list/index.hbs
+++ b/ui-v2/app/components/consul-service-list/index.hbs
@@ -1,9 +1,19 @@
 {{yield}}
 {{#if (gt items.length 0)}}
 <ListCollection @items={{items}} class="consul-service-list" as |item index|>
-  <a data-test-service-name href={{href-to routeName item.Name}} class={{service/health-checks item}}>
+{{#if (eq item.Kind 'terminating-gateway')}}
+  <a data-test-service-name href={{href-to "dc.services.show.services" item.Name}} class={{service/health-checks item}}>
     {{item.Name}}
   </a>
+{{else if (eq item.Kind 'ingress-gateway')}}
+  <a data-test-service-name href={{href-to "dc.services.show.upstreams" item.Name}} class={{service/health-checks item}}>
+    {{item.Name}}
+  </a>
+{{else}}
+  <a data-test-service-name href={{href-to "dc.services.show.instances" item.Name}} class={{service/health-checks item}}>
+    {{item.Name}}
+  </a>
+  {{/if}}
   <ul>
   {{#if (and nspace (env 'CONSUL_NSPACES_ENABLED'))}}
     {{#if (not-eq item.Namespace nspace)}}
diff --git a/ui-v2/app/templates/dc/services/index.hbs b/ui-v2/app/templates/dc/services/index.hbs
index e758cf6417..1fbacb08ac 100644
--- a/ui-v2/app/templates/dc/services/index.hbs
+++ b/ui-v2/app/templates/dc/services/index.hbs
@@ -34,7 +34,7 @@
 {{#let (sort-by (comparator 'service' sort.selected.key) services) as |sorted|}}
         <ChangeableSet @dispatcher={{searchable 'service' sorted}} @terms={{search}}>
           <BlockSlot @name="set" as |filtered|>
-            <ConsulServiceList @routeName="dc.services.show" @items={{filtered}} @proxies={{proxies}}/>
+            <ConsulServiceList @items={{filtered}} @proxies={{proxies}}/>
           </BlockSlot>
           <BlockSlot @name="empty">
             <EmptyState @allowLogin={{true}}>
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index 15d8da6776..1297210112 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -21,13 +21,13 @@
     <TabNav @items={{
       compact
           (array
-                (hash label="Instances" href=(href-to "dc.services.show.instances") selected=(is-href "dc.services.show.instances"))
 (if (eq item.Service.Kind 'terminating-gateway')
                 (hash label="Linked Services" href=(href-to "dc.services.show.services") selected=(is-href "dc.services.show.services"))
 '')
 (if (eq item.Service.Kind 'ingress-gateway')
                 (hash label="Upstreams" href=(href-to "dc.services.show.upstreams") selected=(is-href "dc.services.show.upstreams"))
 '')
+                (hash label="Instances" href=(href-to "dc.services.show.instances") selected=(is-href "dc.services.show.instances"))
 (if (not item.Service.Kind)
                 (hash label="Intentions" href=(href-to "dc.services.show.intentions") selected=(is-href "dc.services.show.intentions"))
 '')