Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 180 deletions

diff --git a/app/assets/javascripts/users_select/constants.js b/app/assets/javascripts/users_select/constants.js
index 64df1e1748c..6b91d7e7c10 100644
--- a/app/assets/javascripts/users_select/constants.js
+++ b/app/assets/javascripts/users_select/constants.js
@@ -1,11 +1,3 @@
-export const AJAX_USERS_SELECT_OPTIONS_MAP = {
-  projectId: 'projectId',
-  groupId: 'groupId',
-  showCurrentUser: 'currentUser',
-  authorId: 'authorId',
-  skipUsers: 'skipUsers',
-};
-
 export const AJAX_USERS_SELECT_PARAMS_MAP = {
   project_id: 'projectId',
   group_id: 'groupId',
diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js
index 8fc5c354802..a0550737e24 100644
--- a/app/assets/javascripts/users_select/index.js
+++ b/app/assets/javascripts/users_select/index.js
@@ -1,21 +1,17 @@
-/* eslint-disable func-names, prefer-rest-params, consistent-return, no-shadow, no-self-compare, no-unused-expressions, yoda, prefer-spread, camelcase, no-param-reassign */
+/* eslint-disable func-names, consistent-return, no-shadow, no-self-compare, no-unused-expressions, camelcase, no-param-reassign */
 /* global Issuable */
 /* global emitSidebarEvent */
 
 import $ from 'jquery';
 import { escape, template, uniqBy } from 'lodash';
-import {
-  AJAX_USERS_SELECT_OPTIONS_MAP,
-  AJAX_USERS_SELECT_PARAMS_MAP,
-} from 'ee_else_ce/users_select/constants';
+import { AJAX_USERS_SELECT_PARAMS_MAP } from 'ee_else_ce/users_select/constants';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 import { isUserBusy } from '~/set_status_modal/utils';
 import { fixTitle, dispose } from '~/tooltips';
 import axios from '~/lib/utils/axios_utils';
 import { parseBoolean, spriteIcon } from '~/lib/utils/common_utils';
-import { loadCSSFile } from '~/lib/utils/css_utils';
 import { s__, __, sprintf } from '~/locale';
-import { getAjaxUsersSelectOptions, getAjaxUsersSelectParams } from './utils';
+import { getAjaxUsersSelectParams } from './utils';
 
 // TODO: remove eventHub hack after code splitting refactor
 window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
@@ -24,9 +20,7 @@ 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);
   this.usersPath = '/-/autocomplete/users.json';
-  this.userPath = '/-/autocomplete/users/:id.json';
   if (currentUser != null) {
     if (typeof currentUser === 'object') {
       this.currentUser = currentUser;
@@ -36,7 +30,6 @@ function UsersSelect(currentUser, els, options = {}) {
   }
 
   const { handleClick } = options;
-  const userSelect = this;
 
   $els.each((i, dropdown) => {
     const userSelect = this;
@@ -619,156 +612,8 @@ function UsersSelect(currentUser, els, options = {}) {
       },
     });
   });
-
-  if ($('.ajax-users-select').length) {
-    import(/* webpackChunkName: 'select2' */ 'select2/select2')
-      .then(() => {
-        // eslint-disable-next-line promise/no-nesting
-        loadCSSFile(gon.select2_css_path)
-          .then(() => {
-            $('.ajax-users-select').each((i, select) => {
-              const options = getAjaxUsersSelectOptions($(select), AJAX_USERS_SELECT_OPTIONS_MAP);
-              options.skipLdap = $(select).hasClass('skip_ldap');
-              const showNullUser = $(select).data('nullUser');
-              const showAnyUser = $(select).data('anyUser');
-              const showEmailUser = $(select).data('emailUser');
-              const firstUser = $(select).data('firstUser');
-              return $(select).select2({
-                placeholder: __('Search for a user'),
-                multiple: $(select).hasClass('multiselect'),
-                minimumInputLength: 0,
-                query(query) {
-                  return userSelect.users(query.term, options, (users) => {
-                    let name;
-                    const data = {
-                      results: users,
-                    };
-                    if (query.term.length === 0) {
-                      if (firstUser) {
-                        // Move current user to the front of the list
-                        const ref = data.results;
-
-                        for (let index = 0, len = ref.length; index < len; index += 1) {
-                          const obj = ref[index];
-                          if (obj.username === firstUser) {
-                            data.results.splice(index, 1);
-                            data.results.unshift(obj);
-                            break;
-                          }
-                        }
-                      }
-                      if (showNullUser) {
-                        const nullUser = {
-                          name: s__('UsersSelect|Unassigned'),
-                          id: 0,
-                        };
-                        data.results.unshift(nullUser);
-                      }
-                      if (showAnyUser) {
-                        name = showAnyUser;
-                        if (name === true) {
-                          name = s__('UsersSelect|Any User');
-                        }
-                        const anyUser = {
-                          name,
-                          id: null,
-                        };
-                        data.results.unshift(anyUser);
-                      }
-                    }
-                    if (
-                      showEmailUser &&
-                      data.results.length === 0 &&
-                      query.term.match(/^[^@]+@[^@]+$/)
-                    ) {
-                      const trimmed = query.term.trim();
-                      const emailUser = {
-                        name: sprintf(__('Invite "%{trimmed}" by email'), { trimmed }),
-                        username: trimmed,
-                        id: trimmed,
-                        invite: true,
-                      };
-                      data.results.unshift(emailUser);
-                    }
-                    return query.callback(data);
-                  });
-                },
-                initSelection() {
-                  const args = 1 <= arguments.length ? [].slice.call(arguments, 0) : [];
-                  return userSelect.initSelection.apply(userSelect, args);
-                },
-                formatResult() {
-                  const args = 1 <= arguments.length ? [].slice.call(arguments, 0) : [];
-                  return userSelect.formatResult.apply(userSelect, args);
-                },
-                formatSelection() {
-                  const args = 1 <= arguments.length ? [].slice.call(arguments, 0) : [];
-                  return userSelect.formatSelection.apply(userSelect, args);
-                },
-                dropdownCssClass: 'ajax-users-dropdown',
-                // we do not want to escape markup since we are displaying html in results
-                escapeMarkup(m) {
-                  return m;
-                },
-              });
-            });
-          })
-          .catch(() => {});
-      })
-      .catch(() => {});
-  }
 }
 
-UsersSelect.prototype.initSelection = function (element, callback) {
-  const id = $(element).val();
-  if (id === '0') {
-    const nullUser = {
-      name: s__('UsersSelect|Unassigned'),
-    };
-    return callback(nullUser);
-  } else if (id !== '') {
-    return this.user(id, callback);
-  }
-};
-
-UsersSelect.prototype.formatResult = function (user) {
-  let avatar = gon.default_avatar_url;
-  if (user.avatar_url) {
-    avatar = user.avatar_url;
-  }
-  return `
-    <div class='user-result'>
-      <div class='user-image'>
-        <img class='avatar avatar-inline s32' src='${avatar}'>
-      </div>
-      <div class='user-info'>
-        <div class='user-name dropdown-menu-user-full-name'>
-          ${escape(user.name)}
-        </div>
-        <div class='user-username dropdown-menu-user-username text-secondary'>
-          ${!user.invite ? `@${escape(user.username)}` : ''}
-        </div>
-      </div>
-    </div>
-  `;
-};
-
-UsersSelect.prototype.formatSelection = function (user) {
-  return escape(user.name);
-};
-
-UsersSelect.prototype.user = function (user_id, callback) {
-  if (!/^\d+$/.test(user_id)) {
-    return false;
-  }
-
-  let url = this.buildUrl(this.userPath);
-  url = url.replace(':id', user_id);
-  return axios.get(url).then(({ data }) => {
-    callback(data);
-  });
-};
-
 // Return users list. Filtered by query
 // Only active users retrieved
 UsersSelect.prototype.users = function (query, options, callback) {
diff --git a/app/assets/javascripts/users_select/utils.js b/app/assets/javascripts/users_select/utils.js
index b46fd15fb77..8184e646124 100644
--- a/app/assets/javascripts/users_select/utils.js
+++ b/app/assets/javascripts/users_select/utils.js
@@ -1,18 +1,4 @@
 /**
- * Get options from data attributes on passed `$select`.
- * @param {jQuery} $select
- * @param {Object} optionsMap e.g. { optionKeyName: 'dataAttributeName' }
- */
-export const getAjaxUsersSelectOptions = ($select, optionsMap) => {
-  return Object.keys(optionsMap).reduce((accumulator, optionKey) => {
-    const dataKey = optionsMap[optionKey];
-    accumulator[optionKey] = $select.data(dataKey);
-
-    return accumulator;
-  }, {});
-};
-
-/**
  * Get query parameters used for users request from passed `options` parameter
  * @param {Object} options e.g. { currentUserId: 1, fooBar: 'baz' }
  * @param {Object} paramsMap e.g. { user_id: 'currentUserId', foo_bar: 'fooBar' }