Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 31 deletions

diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js
index 20d1a3c1fcd..5f4260f26ff 100644
--- a/app/assets/javascripts/users_select/index.js
+++ b/app/assets/javascripts/users_select/index.js
@@ -19,7 +19,6 @@ import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
 
 function UsersSelect(currentUser, els, options = {}) {
-  const elsClassName = els?.toString().match('.(.+$)')[1];
   const $els = $(els || '.js-user-search');
   this.users = this.users.bind(this);
   this.user = this.user.bind(this);
@@ -128,16 +127,9 @@ function UsersSelect(currentUser, els, options = {}) {
             .find(`input[name='${$dropdown.data('fieldName')}'][value=${firstSelectedId}]`);
 
           firstSelected.remove();
-
-          if ($dropdown.hasClass(elsClassName)) {
-            emitSidebarEvent('sidebar.removeReviewer', {
-              id: firstSelectedId,
-            });
-          } else {
-            emitSidebarEvent('sidebar.removeAssignee', {
-              id: firstSelectedId,
-            });
-          }
+          emitSidebarEvent('sidebar.removeAssignee', {
+            id: firstSelectedId,
+          });
         }
       }
     };
@@ -400,11 +392,7 @@ function UsersSelect(currentUser, els, options = {}) {
       defaultLabel,
       hidden() {
         if ($dropdown.hasClass('js-multiselect')) {
-          if ($dropdown.hasClass(elsClassName)) {
-            emitSidebarEvent('sidebar.saveReviewers');
-          } else {
-            emitSidebarEvent('sidebar.saveAssignees');
-          }
+          emitSidebarEvent('sidebar.saveAssignees');
         }
 
         if (!$dropdown.data('alwaysShowSelectbox')) {
@@ -440,18 +428,10 @@ function UsersSelect(currentUser, els, options = {}) {
             previouslySelected.each((index, element) => {
               element.remove();
             });
-            if ($dropdown.hasClass(elsClassName)) {
-              emitSidebarEvent('sidebar.removeAllReviewers');
-            } else {
-              emitSidebarEvent('sidebar.removeAllAssignees');
-            }
+            emitSidebarEvent('sidebar.removeAllAssignees');
           } else if (isActive) {
             // user selected
-            if ($dropdown.hasClass(elsClassName)) {
-              emitSidebarEvent('sidebar.addReviewer', user);
-            } else {
-              emitSidebarEvent('sidebar.addAssignee', user);
-            }
+            emitSidebarEvent('sidebar.addAssignee', user);
 
             // Remove unassigned selection (if it was previously selected)
             const unassignedSelected = $dropdown
@@ -468,11 +448,7 @@ function UsersSelect(currentUser, els, options = {}) {
             }
 
             // User unselected
-            if ($dropdown.hasClass(elsClassName)) {
-              emitSidebarEvent('sidebar.removeReviewer', user);
-            } else {
-              emitSidebarEvent('sidebar.removeAssignee', user);
-            }
+            emitSidebarEvent('sidebar.removeAssignee', user);
           }
 
           if (getSelected().find(u => u === gon.current_user_id)) {