1 files changed, 21 insertions, 24 deletions

diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
index 867222279b2..57e3a97244e 100644
--- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
@@ -1,22 +1,19 @@
 <script>
-import {
-  GlAlert,
-  GlBadge,
-  GlPagination,
-  GlTab,
-  GlTabs,
-  GlSafeHtmlDirective as SafeHtml,
-} from '@gitlab/ui';
+import { GlAlert, GlBadge, GlPagination, GlTab, GlTabs } from '@gitlab/ui';
+import SafeHtml from '~/vue_shared/directives/safe_html';
 import Api from '~/api';
 import { updateHistory, setUrlParams } from '~/lib/utils/url_utility';
 import Tracking from '~/tracking';
 import {
-  OPERATOR_IS_ONLY,
+  FILTERED_SEARCH_TERM,
+  OPERATORS_IS,
   TOKEN_TITLE_ASSIGNEE,
   TOKEN_TITLE_AUTHOR,
+  TOKEN_TYPE_ASSIGNEE,
+  TOKEN_TYPE_AUTHOR,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
-import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
+import UserToken from '~/vue_shared/components/filtered_search_bar/tokens/user_token.vue';
 import { initialPaginationState, defaultI18n, defaultPageSize } from './constants';
 import { isAny } from './utils';
 
@@ -95,7 +92,7 @@ export default {
     filterSearchTokens: {
       type: Array,
       required: false,
-      default: () => ['author_username', 'assignee_username'],
+      default: () => [TOKEN_TYPE_AUTHOR, TOKEN_TYPE_ASSIGNEE],
     },
   },
   data() {
@@ -113,26 +110,26 @@ export default {
     defaultTokens() {
       return [
         {
-          type: 'author_username',
+          type: TOKEN_TYPE_AUTHOR,
           icon: 'user',
           title: TOKEN_TITLE_AUTHOR,
           unique: true,
           symbol: '@',
-          token: AuthorToken,
-          operators: OPERATOR_IS_ONLY,
+          token: UserToken,
+          operators: OPERATORS_IS,
           fetchPath: this.projectPath,
-          fetchAuthors: Api.projectUsers.bind(Api),
+          fetchUsers: Api.projectUsers.bind(Api),
         },
         {
-          type: 'assignee_username',
+          type: TOKEN_TYPE_ASSIGNEE,
           icon: 'user',
           title: TOKEN_TITLE_ASSIGNEE,
           unique: true,
           symbol: '@',
-          token: AuthorToken,
-          operators: OPERATOR_IS_ONLY,
+          token: UserToken,
+          operators: OPERATORS_IS,
           fetchPath: this.projectPath,
-          fetchAuthors: Api.projectUsers.bind(Api),
+          fetchUsers: Api.projectUsers.bind(Api),
         },
       ];
     },
@@ -144,14 +141,14 @@ export default {
 
       if (this.authorUsername) {
         value.push({
-          type: 'author_username',
+          type: TOKEN_TYPE_AUTHOR,
           value: { data: this.authorUsername },
         });
       }
 
       if (this.assigneeUsername) {
         value.push({
-          type: 'assignee_username',
+          type: TOKEN_TYPE_ASSIGNEE,
           value: { data: this.assigneeUsername },
         });
       }
@@ -226,13 +223,13 @@ export default {
       filters.forEach((filter) => {
         if (typeof filter === 'object') {
           switch (filter.type) {
-            case 'author_username':
+            case TOKEN_TYPE_AUTHOR:
               filterParams.authorUsername = isAny(filter.value.data);
               break;
-            case 'assignee_username':
+            case TOKEN_TYPE_ASSIGNEE:
               filterParams.assigneeUsername = isAny(filter.value.data);
               break;
-            case 'filtered-search-term':
+            case FILTERED_SEARCH_TERM:
               if (filter.value.data !== '') filterParams.search = filter.value.data;
               break;
             default: