From f7b8df281bd5d099be71ca268f8d1b463be0a9ab Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Thu, 25 Nov 2021 10:47:07 +0000
Subject: [PATCH] ui: Add `Service.Namespace` variable to dashboard URL
 templates (#11640)

We currently allow only Datacenter, Service.Name, this PR adds Service.Namespace.
---
 .changelog/11640.txt                               |  3 +++
 .../consul-ui/app/templates/dc/services/show.hbs   | 14 ++++++++++----
 .../app/templates/dc/services/show/topology.hbs    | 13 +++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 .changelog/11640.txt

diff --git a/.changelog/11640.txt b/.changelog/11640.txt
new file mode 100644
index 0000000000..87d4916734
--- /dev/null
+++ b/.changelog/11640.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Include `Service.Namespace` into available variables for `dashboard_url_templates`
+```
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
index b997b79798..4ead68d924 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
@@ -186,10 +186,16 @@ as |items item dc|}}
               }}
             as |config|>
             {{#if config.data.dashboard_url_templates.service}}
-              <a href={{render-template config.data.dashboard_url_templates.service (hash
-                Datacenter=dc.Name
-                Service=(hash Name=item.Service.Service)
-              )}}
+              <a
+                href={{render-template config.data.dashboard_url_templates.service
+                  (hash
+                    Datacenter=dc.Name
+                    Service=(hash
+                      Name=item.Service.Service
+                      Namespace=(or item.Service.Namespace '')
+                    )
+                  )
+                }}
                 target="_blank"
                 rel="noopener noreferrer"
                 data-test-dashboard-anchor
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
index 96ddbc647b..105f122aeb 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
@@ -103,10 +103,15 @@ as |nspace dc items topology|}}
         @service={{items.firstObject}}
         @topology={{topology}}
 
-        @metricsHref={{render-template config.data.dashboard_url_templates.service (hash
-          Datacenter=dc.Name
-          Service=items.firstObject
-        )}}
+        @metricsHref={{render-template config.data.dashboard_url_templates.service
+          (hash
+            Datacenter=dc.Name
+            Service=(hash
+              Name=items.firstObject.Name
+              Namespace=(or items.firstObject.Namespace '')
+            )
+          )
+        }}
         @isRemoteDC={{not dc.Local}}
         @hasMetricsProvider={{gt config.data.metrics_provider.length 0}}
         @oncreate={{route-action 'createIntention'}}