Add latest changes from gitlab-org/gitlab@master

3 files changed, 30 insertions, 13 deletions

diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue
index 241b654df5c..938095a434c 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -26,7 +26,7 @@ import { scrollUp } from '~/lib/utils/scroll_utils';
 import { getParameterByName, joinPaths } from '~/lib/utils/url_utility';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import {
-  DEFAULT_NONE_ANY,
+  OPTIONS_NONE_ANY,
   FILTERED_SEARCH_TERM,
   OPERATORS_IS,
   TOKEN_TITLE_ASSIGNEE,
@@ -305,8 +305,8 @@ export default {
           icon: 'pencil',
           token: AuthorToken,
           dataType: 'user',
-          unique: true,
           defaultAuthors: [],
+          operators: this.hasOrFeature ? OPERATORS_IS_NOT_OR : OPERATORS_IS_NOT,
           fetchAuthors: this.fetchUsers,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-author`,
           preloadedAuthors,
@@ -317,7 +317,7 @@ export default {
           icon: 'user',
           token: AuthorToken,
           dataType: 'user',
-          defaultAuthors: DEFAULT_NONE_ANY,
+          defaultAuthors: OPTIONS_NONE_ANY,
           operators: this.hasOrFeature ? OPERATORS_IS_NOT_OR : OPERATORS_IS_NOT,
           fetchAuthors: this.fetchUsers,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-assignee`,
@@ -337,7 +337,7 @@ export default {
           title: TOKEN_TITLE_LABEL,
           icon: 'labels',
           token: LabelToken,
-          defaultLabels: DEFAULT_NONE_ANY,
+          defaultLabels: OPTIONS_NONE_ANY,
           fetchLabels: this.fetchLabels,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-label`,
         },
@@ -394,7 +394,7 @@ export default {
           token: CrmContactToken,
           fullPath: this.fullPath,
           isProject: this.isProject,
-          defaultContacts: DEFAULT_NONE_ANY,
+          defaultContacts: OPTIONS_NONE_ANY,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-crm-contacts`,
           operators: OPERATORS_IS,
           unique: true,
@@ -409,7 +409,7 @@ export default {
           token: CrmOrganizationToken,
           fullPath: this.fullPath,
           isProject: this.isProject,
-          defaultOrganizations: DEFAULT_NONE_ANY,
+          defaultOrganizations: OPTIONS_NONE_ANY,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-crm-organizations`,
           operators: OPERATORS_IS,
           unique: true,
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 01aa9fd9009..5bc9cd4ebd3 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -169,6 +169,7 @@ export const filters = {
   [TOKEN_TYPE_AUTHOR]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'authorUsername',
+      [ALTERNATIVE_FILTER]: 'authorUsernames',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
@@ -177,6 +178,9 @@ export const filters = {
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[author_username]',
       },
+      [OPERATOR_OR]: {
+        [ALTERNATIVE_FILTER]: 'or[author_username]',
+      },
     },
   },
   [TOKEN_TYPE_ASSIGNEE]: {
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index f788d633552..5a4bdedf56d 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -7,6 +7,7 @@ import {
   OPERATOR_NOT,
   OPERATOR_OR,
   TOKEN_TYPE_ASSIGNEE,
+  TOKEN_TYPE_AUTHOR,
   TOKEN_TYPE_CONFIDENTIAL,
   TOKEN_TYPE_ITERATION,
   TOKEN_TYPE_MILESTONE,
@@ -14,9 +15,12 @@ import {
   TOKEN_TYPE_TYPE,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import {
+  ALTERNATIVE_FILTER,
   API_PARAM,
   BLOCKING_ISSUES_ASC,
   BLOCKING_ISSUES_DESC,
+  CLOSED_ASC,
+  CLOSED_DESC,
   CREATED_ASC,
   CREATED_DESC,
   DUE_DATE_ASC,
@@ -44,8 +48,6 @@ import {
   urlSortParams,
   WEIGHT_ASC,
   WEIGHT_DESC,
-  CLOSED_ASC,
-  CLOSED_DESC,
 } from './constants';
 
 export const getInitialPageParams = (
@@ -223,13 +225,24 @@ export const getFilterTokens = (locationSearch) => {
   return tokens.length ? tokens : [createTerm()];
 };
 
-const getFilterType = (data, tokenType = '') => {
+const isSpecialFilter = (type, data) => {
   const isAssigneeIdParam =
-    tokenType === TOKEN_TYPE_ASSIGNEE &&
+    type === TOKEN_TYPE_ASSIGNEE &&
     isPositiveInteger(data) &&
     getParameterByName(PARAM_ASSIGNEE_ID) === data;
+  return specialFilterValues.includes(data) || isAssigneeIdParam;
+};
+
+const getFilterType = ({ type, value: { data, operator } }) => {
+  const isUnionedAuthor = type === TOKEN_TYPE_AUTHOR && operator === OPERATOR_OR;
 
-  return specialFilterValues.includes(data) || isAssigneeIdParam ? SPECIAL_FILTER : NORMAL_FILTER;
+  if (isUnionedAuthor) {
+    return ALTERNATIVE_FILTER;
+  }
+  if (isSpecialFilter(type, data)) {
+    return SPECIAL_FILTER;
+  }
+  return NORMAL_FILTER;
 };
 
 const wildcardTokens = [TOKEN_TYPE_ITERATION, TOKEN_TYPE_MILESTONE, TOKEN_TYPE_RELEASE];
@@ -258,7 +271,7 @@ export const convertToApiParams = (filterTokens) => {
   filterTokens
     .filter((token) => token.type !== FILTERED_SEARCH_TERM)
     .forEach((token) => {
-      const filterType = getFilterType(token.value.data, token.type);
+      const filterType = getFilterType(token);
       const field = filters[token.type][API_PARAM][filterType];
       let obj;
       if (token.value.operator === OPERATOR_NOT) {
@@ -289,7 +302,7 @@ export const convertToUrlParams = (filterTokens) =>
   filterTokens
     .filter((token) => token.type !== FILTERED_SEARCH_TERM)
     .reduce((acc, token) => {
-      const filterType = getFilterType(token.value.data, token.type);
+      const filterType = getFilterType(token);
       const param = filters[token.type][URL_PARAM][token.value.operator]?.[filterType];
       return Object.assign(acc, {
         [param]: acc[param] ? [acc[param], token.value.data].flat() : token.value.data,