Merge branch...

Merge branch '11435-mr-search-by-approvers-doesn-t-use-reserved-values-for-none-and-any' into 'master'

Resolve MR search by approvers

Closes #11435

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

app/assets/javascripts/filtered_search/constants.js

+/* eslint-disable import/prefer-default-export */
+export const TOKEN_TYPES = ['author', 'assignee'];

app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js

-import VisualTokenValue from 'ee_else_ce/filtered_search/visual_token_value';
+import VisualTokenValue from './visual_token_value';
 import { objectToQueryString } from '~/lib/utils/common_utils';
 import FilteredSearchContainer from './container';
 

app/assets/javascripts/filtered_search/visual_token_value.js

@@ -6,6 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
 import Flash from '~/flash';
 import UsersCache from '~/lib/utils/users_cache';
 import { __ } from '~/locale';
+import { TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
 
 export default class VisualTokenValue {
   constructor(tokenValue, tokenType) {
@@ -22,7 +23,7 @@ export default class VisualTokenValue {
 
     if (tokenType === 'label') {
       this.updateLabelTokenColor(tokenValueContainer);
-    } else if (tokenType === 'author' || tokenType === 'assignee') {
+    } else if (TOKEN_TYPES.includes(tokenType)) {
       this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
     } else if (tokenType === 'my-reaction') {
       this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement);

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

+/* eslint-disable import/prefer-default-export */
+import { TOKEN_TYPES as CE_TOKEN_TYPES } from '~/filtered_search/constants';
+
+export const TOKEN_TYPES = [...CE_TOKEN_TYPES, 'approver'];

ee/app/assets/javascripts/filtered_search/visual_token_value.js

-import VisualTokenValueCE from '~/filtered_search/visual_token_value';
-
-export default class VisualTokenValue {
-  constructor(tokenValue, tokenType) {
-    this.tokenValue = tokenValue;
-    this.tokenType = tokenType;
-
-    this.visualTokenValueCE = new VisualTokenValueCE(tokenValue, tokenType);
-  }
-
-  render(tokenValueContainer, tokenValueElement) {
-    if (this.tokenType === 'approver') {
-      this.visualTokenValueCE.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
-    } else {
-      this.visualTokenValueCE.render(tokenValueContainer, tokenValueElement);
-    }
-  }
-}

ee/changelogs/unreleased/origin-11435-mr-search-by-approvers-doesn-t-use-reserved-values-for-none-and-any.yml

+---
+title: Fix broken filter by approvers
+merge_request:
+author:
+type: fixed