Ensure unique ARP attributes

Author: oharsta

client/src/connection/Testing.jsx

@@ -1226,7 +1226,7 @@ export const Testing = ({
         return (
             <>
                 <div className="testing-header">
-                    <h2>{I18n.t(`connection.${isComplete ? "existing" : "new"}Connection${isProduction ? "Prod" : ""}`)}</h2>
+                    <h2>{I18n.t(`connection.${isComplete ? "existing" : "new"}Connection${isProduction ? "Prod" : ""}`, {name: connection.name})}</h2>
                     {(isProduction && application.signedContract && (connection.status === CONNECTION_STATUSES.COMPLETE || connection.status === CONNECTION_STATUSES.IN_PROGRESS)) &&
                         <div className="action-button">
                             <Button txt={I18n.t("connection.connections.requestProductionStatus")}

client/src/locale/en.js

@@ -342,9 +342,9 @@ const en = {
         productionActivationAction: "Do it now",
         productActivationPending: "The request for activation of your production connection has been received. SURF will contact you within three business days.",
         newConnection: "New connection to the test environment",
-        existingConnection: "Testkoppeling bewerken",
+        existingConnection: "Edit test connection {{name}}",
         newConnectionProd: "New connection to the production environment",
-        existingConnectionProd: "Edit connection",
+        existingConnectionProd: "Edit connection {{name}}",
         copyConnection: "Copy from other connection",
         technical: "Technical details",
         informationProfile: "Attribute profile",

client/src/pages/Policies.jsx

@@ -134,7 +134,7 @@ const Policies = () => {
                                     refreshPolicies={refreshPolicies}
                         />
                     }
-                    {showPolicyOverview &&
+                    {(showPolicyOverview  || showNewPolicyChoice) &&
                         <PolicyOverview
                             policies={policies}
                             currentOrganization={currentOrganization}

server/src/main/java/access/manage/ListMerger.java

@@ -2,9 +2,13 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 public class ListMerger {
 
@@ -61,7 +65,7 @@ public static List<String> threeWayMerge(
             }
         }
 
-        return result;
+        return new LinkedHashSet<>(result).stream().toList();
     }
 
     /**

server/src/test/java/access/manage/ListMergerTest.java

@@ -11,28 +11,36 @@ class ListMergerTest {
 
     @Test
     void threeWayMerge() {
-        List<String> list1 = List.of("alpha", "beta", "gamma", "delta");
+        List<String> base = List.of("alpha", "beta", "gamma", "delta");
 
-        // list2: changed "beta"→"BETA", removed "delta", added "epsilon"
-        List<String> list2 = List.of("alpha", "BETA", "gamma", "epsilon");
+        // left: changed "beta"→"BETA", removed "delta", added "epsilon"
+        List<String> left = List.of("alpha", "BETA", "gamma", "epsilon");
 
-        // list3: changed "alpha"→"ALPHA", changed "gamma"→"GAMMA"
-        List<String> list3 = List.of("ALPHA", "beta", "GAMMA", "delta");
+        // right: changed "alpha"→"ALPHA", changed "gamma"→"GAMMA"
+        List<String> right = List.of("ALPHA", "beta", "GAMMA", "delta");
 
-        List<String> list4 = ListMerger.threeWayMerge(list1, list2, list3);
-        assertEquals(list4, List.of("ALPHA", "BETA", "GAMMA", "epsilon"));
+        List<String> list4 = ListMerger.threeWayMerge(base, left, right);
+        assertEquals(List.of("ALPHA", "BETA", "GAMMA", "epsilon"), list4);
 
-        list1 = List.of("red1", "red2");
+        base = List.of("red1", "red2");
 
-        // list2: changed "beta"→"BETA", removed "delta", added "epsilon"
-        list2 = List.of("red1", "red2", "red3");
+        // left: changed "beta"→"BETA", removed "delta", added "epsilon"
+        left = List.of("red1", "red2", "red3");
 
-        // list3: changed "alpha"→"ALPHA", changed "gamma"→"GAMMA"
-        list3 = List.of("red1", "red2", "red4");
+        // right: changed "alpha"→"ALPHA", changed "gamma"→"GAMMA"
+        right = List.of("red1", "red2", "red4");
 
-        list4 = ListMerger.threeWayMerge(list1, list2, list3);
-        assertEquals(list4, List.of("red1", "red2", "red3", "red4"));
+        list4 = ListMerger.threeWayMerge(base, left, right);
+        assertEquals(List.of("red1", "red2", "red3", "red4"), list4);
     }
 
+    @Test
+    void threeWayMergeDuplicates() {
+        List<String> base = List.of("a");
+        List<String> left = List.of("a", "b");
+        List<String> right = List.of("c", "b", "b", "b");
 
+        List<String> list4 = ListMerger.threeWayMerge(base, left, right);
+        assertEquals(List.of("c","b"), list4);
+    }
 }