From f4e38d229bbeed12f636fa42c734c39e411c82a7 Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Wed, 3 Jun 2020 11:29:53 -0400
Subject: [PATCH] ui: Customize link for an Upstream in a different namespace
 as the ingress gateway (#8006)

* Add configuration default value for findGatewayBySlug

* Customize link for an Upstream in a different nspace as the ingress gateway
---
 ui-v2/app/services/repository/service.js           |  2 +-
 ui-v2/app/templates/dc/services/show/upstreams.hbs | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ui-v2/app/services/repository/service.js b/ui-v2/app/services/repository/service.js
index ae34a6dd2..dc4df18c2 100644
--- a/ui-v2/app/services/repository/service.js
+++ b/ui-v2/app/services/repository/service.js
@@ -76,7 +76,7 @@ export default RepositoryService.extend({
       throw e;
     });
   },
-  findGatewayBySlug: function(slug, dc, nspace, configuration) {
+  findGatewayBySlug: function(slug, dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
diff --git a/ui-v2/app/templates/dc/services/show/upstreams.hbs b/ui-v2/app/templates/dc/services/show/upstreams.hbs
index f329541e8..518e53c14 100644
--- a/ui-v2/app/templates/dc/services/show/upstreams.hbs
+++ b/ui-v2/app/templates/dc/services/show/upstreams.hbs
@@ -8,9 +8,17 @@
     {{#let item.Service.Namespace as |nspace|}}
       <ListCollection @items={{gatewayServices}} class="consul-upstream-list" as |item index|>
       {{#if (service/exists item)}}
-        <a data-test-service-name href={{href-to 'dc.services.show' item.Name}}>
-          {{item.Name}}
-        </a>
+      {{#let item.Namespace as |gatewayNspace|}}
+        {{#if (and (env 'CONSUL_NSPACES_ENABLED') (not-eq gatewayNspace nspace))}}
+          <a data-test-service-name href={{href-to 'nspace.dc.services.show' (concat '~' gatewayNspace) dc item.Name}}>
+            {{item.Name}}
+          </a>
+        {{else}}
+          <a data-test-service-name href={{href-to 'dc.services.show' item.Name}}>
+            {{item.Name}}
+          </a>
+        {{/if}}
+      {{/let}}
       {{else}}
         <p data-test-service-name>
           {{item.Name}}