Commit 95746d6f authored by Mike Greiling's avatar Mike Greiling

Merge branch 'chore/rename-variable' into 'master'

Rename TOKEN_TYPES to USER_TOKEN_TYPES

Closes #12237

See merge request gitlab-org/gitlab-ee!14209
parents 5bff14ff a47fb242
/* eslint-disable import/prefer-default-export */
export const TOKEN_TYPES = ['author', 'assignee'];
export const USER_TOKEN_TYPES = ['author', 'assignee'];
......@@ -6,7 +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';
import { USER_TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
export default class VisualTokenValue {
constructor(tokenValue, tokenType) {
......@@ -23,7 +23,7 @@ export default class VisualTokenValue {
if (tokenType === 'label') {
this.updateLabelTokenColor(tokenValueContainer);
} else if (TOKEN_TYPES.includes(tokenType)) {
} else if (USER_TOKEN_TYPES.includes(tokenType)) {
this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
} else if (tokenType === 'my-reaction') {
this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement);
......
/* eslint-disable import/prefer-default-export */
import { TOKEN_TYPES as CE_TOKEN_TYPES } from '~/filtered_search/constants';
import { USER_TOKEN_TYPES as CE_USER_TOKEN_TYPES } from '~/filtered_search/constants';
export const TOKEN_TYPES = [...CE_TOKEN_TYPES, 'approver'];
export const USER_TOKEN_TYPES = [...CE_USER_TOKEN_TYPES, 'approver'];
---
title: Rename `TOKEN_TYPES` to `USER_TOKEN_TYPES`
merge_request: 14209
author: Arun Kumar Mohan
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment