Fix incorrect selection checks

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

@@ -9,4 +9,10 @@ export const LEVEL_TYPES = {
   GROUP: 'group',
 };
 
+export const LEVEL_ID_PROP = {
+  ROLE: 'access_level',
+  USER: 'user_id',
+  GROUP: 'group_id',
+};
+
 export const ACCESS_LEVEL_NONE = 0;

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

 /* eslint-disable no-underscore-dangle, class-methods-use-this */
 /* global Flash */
 
-import { LEVEL_TYPES, ACCESS_LEVEL_NONE } from './constants';
+import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVEL_NONE } from './constants';
 
 export default class ProtectedBranchAccessDropdown {
   constructor(options) {
@@ -150,8 +150,24 @@ export default class ProtectedBranchAccessDropdown {
     let index = -1;
     const selectedItems = this.getAllSelectedItems();
 
+    // Compare IDs based on selectedItem.type
     selectedItems.forEach((item, i) => {
-      if (selectedItem.id === item.access_level) {
+      let comparator;
+      switch (selectedItem.type) {
+        case LEVEL_TYPES.ROLE:
+          comparator = LEVEL_ID_PROP.ROLE;
+          break;
+        case LEVEL_TYPES.GROUP:
+          comparator = LEVEL_ID_PROP.GROUP;
+          break;
+        case LEVEL_TYPES.USER:
+          comparator = LEVEL_ID_PROP.USER;
+          break;
+        default:
+          break;
+      }
+
+      if (selectedItem.id === item[comparator]) {
         index = i;
       }
     });

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

@@ -8,4 +8,10 @@ export const LEVEL_TYPES = {
   GROUP: 'group',
 };
 
+export const LEVEL_ID_PROP = {
+  ROLE: 'access_level',
+  USER: 'user_id',
+  GROUP: 'group_id',
+};
+
 export const ACCESS_LEVEL_NONE = 0;

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

 /* eslint-disable no-underscore-dangle, class-methods-use-this */
 /* global Flash */
 
-import { LEVEL_TYPES, ACCESS_LEVEL_NONE } from './constants';
+import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVEL_NONE } from './constants';
 
 export default class ProtectedTagAccessDropdown {
   constructor(options) {
@@ -145,8 +145,24 @@ export default class ProtectedTagAccessDropdown {
     let index = -1;
     const selectedItems = this.getAllSelectedItems();
 
+    // Compare IDs based on selectedItem.type
     selectedItems.forEach((item, i) => {
-      if (selectedItem.id === item.access_level) {
+      let comparator;
+      switch (selectedItem.type) {
+        case LEVEL_TYPES.ROLE:
+          comparator = LEVEL_ID_PROP.ROLE;
+          break;
+        case LEVEL_TYPES.GROUP:
+          comparator = LEVEL_ID_PROP.GROUP;
+          break;
+        case LEVEL_TYPES.USER:
+          comparator = LEVEL_ID_PROP.USER;
+          break;
+        default:
+          break;
+      }
+
+      if (selectedItem.id === item[comparator]) {
         index = i;
       }
     });