Merge branch '39734-fix-protected-refs-roles' into 'master'

Prevent adding same role multiple times on repeated clicks

Closes #4294

See merge request gitlab-org/gitlab-ee!3700

changelogs/unreleased-ee/39734-fix-protected-refs-roles.yml

+---
+title: Prevent adding same role multiple times on repeated clicks
+merge_request: 3700
+author:
+type: fixed

ee/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js

@@ -145,8 +145,8 @@ export default class ProtectedBranchAccessDropdown {
   addSelectedItem(selectedItem) {
     let itemToAdd = {};
 
-    // If the item already exists, just use it
     let index = -1;
+    let alreadyAdded = false;
     const selectedItems = this.getAllSelectedItems();
 
     // Compare IDs based on selectedItem.type
@@ -155,6 +155,10 @@ export default class ProtectedBranchAccessDropdown {
       switch (selectedItem.type) {
         case LEVEL_TYPES.ROLE:
           comparator = LEVEL_ID_PROP.ROLE;
+          // If the item already exists, just use it
+          if (item[comparator] === selectedItem.id) {
+            alreadyAdded = true;
+          }
           break;
         case LEVEL_TYPES.GROUP:
           comparator = LEVEL_ID_PROP.GROUP;
@@ -171,6 +175,10 @@ export default class ProtectedBranchAccessDropdown {
       }
     });
 
+    if (alreadyAdded) {
+      return;
+    }
+
     if (index !== -1 && selectedItems[index]._destroy) {
       delete selectedItems[index]._destroy;
       return;

ee/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js

@@ -140,8 +140,8 @@ export default class ProtectedTagAccessDropdown {
   addSelectedItem(selectedItem) {
     let itemToAdd = {};
 
-    // If the item already exists, just use it
     let index = -1;
+    let alreadyAdded = false;
     const selectedItems = this.getAllSelectedItems();
 
     // Compare IDs based on selectedItem.type
@@ -150,6 +150,10 @@ export default class ProtectedTagAccessDropdown {
       switch (selectedItem.type) {
         case LEVEL_TYPES.ROLE:
           comparator = LEVEL_ID_PROP.ROLE;
+          // If the item already exists, just use it
+          if (item[comparator] === selectedItem.id) {
+            alreadyAdded = true;
+          }
           break;
         case LEVEL_TYPES.GROUP:
           comparator = LEVEL_ID_PROP.GROUP;
@@ -166,6 +170,10 @@ export default class ProtectedTagAccessDropdown {
       }
     });
 
+    if (alreadyAdded) {
+      return;
+    }
+
     if (index !== -1 && selectedItems[index]._destroy) {
       delete selectedItems[index]._destroy;
       return;