Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 5 deletions

diff --git a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
index cb7b963b698..76b286f94ad 100644
--- a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
+++ b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
@@ -7,11 +7,11 @@ import {
   redirectTo,
 } from '~/lib/utils/url_utility';
 import {
-  SEARCH_TOKEN_TYPE,
   SORT_QUERY_PARAM_NAME,
   ACTIVE_TAB_QUERY_PARAM_NAME,
   AVAILABLE_FILTERED_SEARCH_TOKENS,
 } from 'ee_else_ce/members/constants';
+import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 
 export default {
@@ -65,7 +65,7 @@ export default {
 
     if (query[this.filteredSearchBar.searchParam]) {
       tokens.push({
-        type: SEARCH_TOKEN_TYPE,
+        type: FILTERED_SEARCH_TERM,
         value: {
           data: query[this.filteredSearchBar.searchParam],
         },
@@ -83,7 +83,7 @@ export default {
           return accumulator;
         }
 
-        if (type === SEARCH_TOKEN_TYPE) {
+        if (type === FILTERED_SEARCH_TERM) {
           if (value.data !== '') {
             const { searchParam } = this.filteredSearchBar;
             const { [searchParam]: searchParamValue } = accumulator;
diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js
index 47bd042b001..dab544c7cbc 100644
--- a/app/assets/javascripts/members/constants.js
+++ b/app/assets/javascripts/members/constants.js
@@ -187,8 +187,6 @@ export const LEAVE_MODAL_ID = 'member-leave-modal';
 
 export const REMOVE_GROUP_LINK_MODAL_ID = 'remove-group-link-modal-id';
 
-export const SEARCH_TOKEN_TYPE = 'filtered-search-term';
-
 export const SORT_QUERY_PARAM_NAME = 'sort';
 export const ACTIVE_TAB_QUERY_PARAM_NAME = 'tab';