From ae049b7b965b66770cf4ada5956f8e37ec02a43b Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:03:26 +0000
Subject: [PATCH] ui: All metrics cards should default to the default nspace if
 not set (#9223)

* ui: All metrics cards should default to the default nspace if not set

* Use the up/downstream as the data/nspace for up/downstreams not the service
---
 .../consul-ui/app/components/topology-metrics/card.hbs        | 4 ++--
 .../consul-ui/app/components/topology-metrics/index.hbs       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/packages/consul-ui/app/components/topology-metrics/card.hbs b/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
index 51ce9160e2..81c6d561d0 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
@@ -47,7 +47,7 @@
   {{#if (and @hasMetricsProvider (not-eq @service.Kind 'ingress-gateway'))}}
     {{#if (eq @type 'upstream')}}
       <TopologyMetrics::Stats
-        @nspace={{@item.Namespace}}
+        @nspace={{or @item.Namespace 'default'}}
         @dc={{@item.Datacenter}}
         @endpoint='upstream-summary-for-service'
         @service={{@service.Service}}
@@ -56,7 +56,7 @@
       />
     {{else}}
       <TopologyMetrics::Stats
-        @nspace={{@item.Namespace}}
+        @nspace={{or @item.Namespace 'default'}}
         @dc={{@item.Datacenter}}
         @endpoint='downstream-summary-for-service'
         @service={{@service.Service}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
index 7b183d7568..0ca4047b27 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
@@ -33,7 +33,7 @@
     </div>
     {{#if this.hasMetricsProvider }}
       <TopologyMetrics::Series
-        @nspace={{@service.Service.Namespace}}
+        @nspace={{or @service.Service.Namespace 'default'}}
         @dc={{@dc}}
         @service={{@service.Service.Service}}
         @protocol={{@topology.Protocol}}
@@ -41,7 +41,7 @@
       />
       {{#if (not-eq @service.Service.Kind 'ingress-gateway')}}
       <TopologyMetrics::Stats
-        @nspace={{@service.Service.Namespace}}
+        @nspace={{or @service.Service.Namespace 'default'}}
         @dc={{@dc}}
         @endpoint='summary-for-service'
         @service={{@service.Service.Service}}