From c9b7fe50519b72a31d1ac0831cfb32d594a1c905 Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:22:18 -0400
Subject: [PATCH] ui: Fix empty SVG height to prevent service mesh from
 breaking when there are no upstreams (#10122)

---
 .changelog/10122.txt                             |  3 +++
 .../app/components/topology-metrics/index.js     | 16 +++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 .changelog/10122.txt

diff --git a/.changelog/10122.txt b/.changelog/10122.txt
new file mode 100644
index 000000000..8353016bc
--- /dev/null
+++ b/.changelog/10122.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Adding conditional to prevent Service Mesh from breaking when there are no Upstreams
+```
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.js b/ui/packages/consul-ui/app/components/topology-metrics/index.js
index cb19b9e82..0c8ca0385 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.js
@@ -108,14 +108,16 @@ export default class TopologyMetrics extends Component {
     // Calculate viewBox dimensions
     this.downView = document.getElementById('downstream-lines').getBoundingClientRect();
     const upstreamLines = document.getElementById('upstream-lines').getBoundingClientRect();
-    const upstreamColumn = document.getElementById('upstream-column').getBoundingClientRect();
+    const upstreamColumn = document.getElementById('upstream-column');
 
-    this.upView = {
-      x: upstreamLines.x,
-      y: upstreamLines.y,
-      width: upstreamLines.width,
-      height: upstreamColumn.height,
-    };
+    if (upstreamColumn) {
+      this.upView = {
+        x: upstreamLines.x,
+        y: upstreamLines.y,
+        width: upstreamLines.width,
+        height: upstreamColumn.getBoundingClientRect().height + 10,
+      };
+    }
 
     // Get Card elements positions
     const downCards = [