ui: Update not-defined intention popover and banner (#10133)

hashicorp · May 5, 2021 · bc0f175 · bc0f175
1 parent c86c222
commit bc0f175
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/10133.txt 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.
+```
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
@@ -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
@@ -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
@@ -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