From bc0f175bbe1337c3ad78d5cf9e8e7ad08311a449 Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Wed, 28 Apr 2021 10:31:14 -0400
Subject: [PATCH] ui: Update not-defined intention popover and banner (#10133)

---
 .changelog/10133.txt                                          | 3 +++
 .../app/components/topology-metrics/down-lines/index.hbs      | 1 +
 .../app/components/topology-metrics/popover/index.hbs         | 2 +-
 .../consul-ui/translations/components/consul/en-us.yaml       | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/10133.txt

diff --git a/.changelog/10133.txt b/.changelog/10133.txt
new file mode 100644
index 000000000000..6ec6a3dd56c2
--- /dev/null
+++ b/.changelog/10133.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Updating the wording for the banner and the popover for a service with an upstream that is not explicitly defined.
+```
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
index e5ee6a80e843..10ba159159bc 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
@@ -93,6 +93,7 @@
   {{else if (and item.Intention.Allowed (not item.TransparentProxy) (eq item.Source 'specific-intention'))}}
     <TopologyMetrics::Popover
       @type='not-defined'
+      @service={{@service}}
       @position={{find-by 'id' (concat this.guid item.Namespace item.Name) this.iconPositions}}
       @item={{item}}
       @oncreate={{action @oncreate item @service}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
index 04e3316e9098..ccd29d8eb2be 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
@@ -59,7 +59,7 @@
     </:header>
     <:body>
       <p>
-        {{t "components.consul.topology-metrics.popover.not-defined.body"}}
+        {{t "components.consul.topology-metrics.popover.not-defined.body" downstream=@item.Name upstream=@service.Name }}
       </p>
     </:body>
     <:actions as |Actions|>
diff --git a/ui/packages/consul-ui/translations/components/consul/en-us.yaml b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
index 0372bdd505f2..62e8497c4397 100644
--- a/ui/packages/consul-ui/translations/components/consul/en-us.yaml
+++ b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
@@ -126,7 +126,7 @@ topology-metrics:
         URL: dc.services.show.intentions
     not-defined-intention:
       header: Connections are not explicitly defined
-      body: There appears to be an Intention defining traffic, but the services are unable to communicate until that connection is explicitly defined as a downstream or Transparent Proxy mode is turned on.
+      body: There appears to be an Intention allowing traffic, but the services are unable to communicate until that connection is enabled by defining an explicit upstream or proxies are set to 'transparent' mode.
       footer: Read the documentation
     wildcard-intention:
       header: Permissive Intention
@@ -149,5 +149,5 @@ topology-metrics:
         notExact: Create
     not-defined:
       header: No traffic
-      body: Add the current service as an explicit upstream or turn on Transparent Proxy mode to initiate traffic.
+      body: Add "{upstream}" as an explicit upstream of "{downstream}" or set the "{downstream}" proxy to "transparent" mode to enable traffic.
       action: Documentation