From 61433fabb4bce3fa916b8b91975945126ec5dfcf Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Wed, 17 Jun 2020 14:11:40 +0100
Subject: [PATCH] ui: Don't show duplicate services in the intentions form
 dropdown (#8133)

* Add uniq-by helper
* Pass unique services through to intentions form
* Add acceptance test
---
 ui-v2/app/helpers/uniq-by.js                  | 13 +++++++++
 ui-v2/app/templates/dc/intentions/edit.hbs    |  2 +-
 .../dc/intentions/filtered-select.feature     | 29 +++++++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 ui-v2/app/helpers/uniq-by.js

diff --git a/ui-v2/app/helpers/uniq-by.js b/ui-v2/app/helpers/uniq-by.js
new file mode 100644
index 0000000000..c8c46ee027
--- /dev/null
+++ b/ui-v2/app/helpers/uniq-by.js
@@ -0,0 +1,13 @@
+import { helper } from '@ember/component/helper';
+import { isEmpty } from '@ember/utils';
+import { A as emberArray } from '@ember/array';
+
+export function uniqBy([byPath, array]) {
+  if (isEmpty(byPath)) {
+    return [];
+  }
+
+  return emberArray(array).uniqBy(byPath);
+}
+
+export default helper(uniqBy);
diff --git a/ui-v2/app/templates/dc/intentions/edit.hbs b/ui-v2/app/templates/dc/intentions/edit.hbs
index 12d38a121f..d2f995a205 100644
--- a/ui-v2/app/templates/dc/intentions/edit.hbs
+++ b/ui-v2/app/templates/dc/intentions/edit.hbs
@@ -39,7 +39,7 @@
     <BlockSlot @name="content">
       <ConsulIntentionForm
         @item={{item}}
-        @services={{services}}
+        @services={{uniq-by 'Name' services}}
         @nspaces={{nspaces}}
         @ondelete={{action "route" "delete"}}
         @onsubmit={{action "route" (if item.isNew "create" "update")}}
diff --git a/ui-v2/tests/acceptance/dc/intentions/filtered-select.feature b/ui-v2/tests/acceptance/dc/intentions/filtered-select.feature
index ab0ffa530b..e344b342fe 100644
--- a/ui-v2/tests/acceptance/dc/intentions/filtered-select.feature
+++ b/ui-v2/tests/acceptance/dc/intentions/filtered-select.feature
@@ -8,9 +8,9 @@ Feature: dc / intentions / filtered-select: Intention Service Select Dropdowns
     And 4 service models from yaml
     ---
     - Name: service-0
-      Kind: consul
+      Kind: ~
     - Name: service-1
-      Kind: consul
+      Kind: ~
     - Name: service-2
       Kind: connect-proxy
     - Name: service-3
@@ -32,3 +32,28 @@ Feature: dc / intentions / filtered-select: Intention Service Select Dropdowns
       | source      |
       | destination |
       ---------------
+  Scenario: Opening the [Name] dropdown with 2 services with the same name from different nspaces
+    Given 1 datacenter model with the value "datacenter"
+    And 2 service models from yaml
+    ---
+    - Name: service-0
+      Kind: ~
+    - Name: service-0
+      Namespace: nspace
+      Kind: ~
+    ---
+    When I visit the intention page for yaml
+    ---
+      dc: datacenter
+      intention: intention
+    ---
+    Then the url should be /datacenter/intentions/intention
+    And I click "[data-test-[Name]-element] .ember-power-select-trigger"
+    Then I see the text "* (All Services)" in ".ember-power-select-option:nth-last-child(2)"
+    Then I see the text "service-0" in ".ember-power-select-option:last-child"
+    Where:
+      ---------------
+      | Name        |
+      | source      |
+      | destination |
+      ---------------