Add latest changes from gitlab-org/gitlab@master

9 files changed, 30 insertions, 27 deletions

diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
index 65daf9280d2..8750e477803 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
@@ -8,7 +8,8 @@ export const FILTER_ANY = 'Any';
 export const FILTER_CURRENT = 'Current';
 export const FILTER_UPCOMING = 'Upcoming';
 export const FILTER_STARTED = 'Started';
-export const FILTER_NONE_ANY = [FILTER_NONE, FILTER_ANY];
+
+export const FILTERS_NONE_ANY = [FILTER_NONE, FILTER_ANY];
 
 export const OPERATOR_IS = '=';
 export const OPERATOR_IS_TEXT = __('is');
@@ -23,9 +24,11 @@ export const OPERATORS_OR = [{ value: OPERATOR_OR, description: OPERATOR_OR_TEXT
 export const OPERATORS_IS_NOT = [...OPERATORS_IS, ...OPERATORS_NOT];
 export const OPERATORS_IS_NOT_OR = [...OPERATORS_IS, ...OPERATORS_NOT, ...OPERATORS_OR];
 
-export const DEFAULT_LABEL_NONE = { value: FILTER_NONE, text: __('None'), title: __('None') };
-export const DEFAULT_LABEL_ANY = { value: FILTER_ANY, text: __('Any'), title: __('Any') };
-export const DEFAULT_NONE_ANY = [DEFAULT_LABEL_NONE, DEFAULT_LABEL_ANY];
+export const OPTION_NONE = { value: FILTER_NONE, text: __('None'), title: __('None') };
+export const OPTION_ANY = { value: FILTER_ANY, text: __('Any'), title: __('Any') };
+export const OPTION_CURRENT = { value: FILTER_CURRENT, text: __('Current') };
+
+export const OPTIONS_NONE_ANY = [OPTION_NONE, OPTION_ANY];
 
 export const DEFAULT_MILESTONE_UPCOMING = {
   value: FILTER_UPCOMING,
@@ -37,12 +40,12 @@ export const DEFAULT_MILESTONE_STARTED = {
   text: __('Started'),
   title: __('Started'),
 };
-export const DEFAULT_MILESTONES = DEFAULT_NONE_ANY.concat([
+export const DEFAULT_MILESTONES = OPTIONS_NONE_ANY.concat([
   DEFAULT_MILESTONE_UPCOMING,
   DEFAULT_MILESTONE_STARTED,
 ]);
 
-export const SortDirection = {
+export const SORT_DIRECTION = {
   descending: 'descending',
   ascending: 'ascending',
 };
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
index 0d0787e7033..34f64dddc41 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
@@ -15,7 +15,7 @@ import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 
-import { SortDirection } from './constants';
+import { SORT_DIRECTION } from './constants';
 import { filterEmptySearchTerm, stripQuotes, uniqueTokens } from './filtered_search_utils';
 
 export default {
@@ -107,7 +107,7 @@ export default {
       recentSearches: [],
       filterValue: this.initialFilterValue,
       selectedSortOption: this.sortOptions[0],
-      selectedSortDirection: SortDirection.descending,
+      selectedSortDirection: SORT_DIRECTION.descending,
     };
   },
   computed: {
@@ -130,12 +130,12 @@ export default {
       );
     },
     sortDirectionIcon() {
-      return this.selectedSortDirection === SortDirection.ascending
+      return this.selectedSortDirection === SORT_DIRECTION.ascending
         ? 'sort-lowest'
         : 'sort-highest';
     },
     sortDirectionTooltip() {
-      return this.selectedSortDirection === SortDirection.ascending
+      return this.selectedSortDirection === SORT_DIRECTION.ascending
         ? __('Sort direction: Ascending')
         : __('Sort direction: Descending');
     },
@@ -267,9 +267,9 @@ export default {
     },
     handleSortDirectionClick() {
       this.selectedSortDirection =
-        this.selectedSortDirection === SortDirection.ascending
-          ? SortDirection.descending
-          : SortDirection.ascending;
+        this.selectedSortDirection === SORT_DIRECTION.ascending
+          ? SORT_DIRECTION.descending
+          : SORT_DIRECTION.ascending;
       this.$emit('onSort', this.selectedSortOption.sortDirection[this.selectedSortDirection]);
     },
     handleHistoryItemSelected(filters) {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue
index 7c184a3c391..c40bdae207c 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue
@@ -4,7 +4,7 @@ import { compact } from 'lodash';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -36,7 +36,7 @@ export default {
   },
   computed: {
     defaultAuthors() {
-      return this.config.defaultAuthors || DEFAULT_NONE_ANY;
+      return this.config.defaultAuthors || OPTIONS_NONE_ANY;
     },
     preloadedAuthors() {
       return this.config.preloadedAuthors || [];
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
index 3c5b3022bec..b0fa3e4c27e 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
@@ -9,7 +9,7 @@ import {
 } from '@gitlab/ui';
 import { debounce } from 'lodash';
 
-import { DEBOUNCE_DELAY, FILTER_NONE_ANY, OPERATOR_NOT } from '../constants';
+import { DEBOUNCE_DELAY, FILTERS_NONE_ANY, OPERATOR_NOT } from '../constants';
 import {
   getRecentlyUsedSuggestions,
   setTokenValueToRecentlyUsed,
@@ -102,7 +102,7 @@ export default {
     availableDefaultSuggestions() {
       if (this.value.operator === OPERATOR_NOT) {
         return this.defaultSuggestions.filter(
-          (suggestion) => !FILTER_NONE_ANY.includes(suggestion.value),
+          (suggestion) => !FILTERS_NONE_ANY.includes(suggestion.value),
         );
       }
       return this.defaultSuggestions;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
index d34cfb922a9..e0fa06c159e 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
@@ -8,7 +8,7 @@ import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { __ } from '~/locale';
 import searchCrmContactsQuery from '../queries/search_crm_contacts.query.graphql';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -39,7 +39,7 @@ export default {
   },
   computed: {
     defaultContacts() {
-      return this.config.defaultContacts || DEFAULT_NONE_ANY;
+      return this.config.defaultContacts || OPTIONS_NONE_ANY;
     },
     namespace() {
       return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
index c7c9350ee93..3f030c8698c 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
@@ -8,7 +8,7 @@ import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { __ } from '~/locale';
 import searchCrmOrganizationsQuery from '../queries/search_crm_organizations.query.graphql';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -39,7 +39,7 @@ export default {
   },
   computed: {
     defaultOrganizations() {
-      return this.config.defaultOrganizations || DEFAULT_NONE_ANY;
+      return this.config.defaultOrganizations || OPTIONS_NONE_ANY;
     },
     namespace() {
       return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
index 929823f7308..74905dc2ae0 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
@@ -3,7 +3,7 @@ import { GlFilteredSearchSuggestion } from '@gitlab/ui';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 import { stripQuotes } from '../filtered_search_utils';
 
 export default {
@@ -33,7 +33,7 @@ export default {
   },
   computed: {
     defaultEmojis() {
-      return this.config.defaultEmojis || DEFAULT_NONE_ANY;
+      return this.config.defaultEmojis || OPTIONS_NONE_ANY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
index bce0c11aafd..71c50ef292a 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
@@ -5,7 +5,7 @@ import { createAlert } from '~/flash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { __ } from '~/locale';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 import { stripQuotes } from '../filtered_search_utils';
 
 import BaseToken from './base_token.vue';
@@ -38,7 +38,7 @@ export default {
   },
   computed: {
     defaultLabels() {
-      return this.config.defaultLabels || DEFAULT_NONE_ANY;
+      return this.config.defaultLabels || OPTIONS_NONE_ANY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
index 59701b4959e..6d681aab3ca 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
@@ -3,7 +3,7 @@ import { GlFilteredSearchSuggestion } from '@gitlab/ui';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 export default {
   components: {
@@ -32,7 +32,7 @@ export default {
   },
   computed: {
     defaultReleases() {
-      return this.config.defaultReleases || DEFAULT_NONE_ANY;
+      return this.config.defaultReleases || OPTIONS_NONE_ANY;
     },
   },
   methods: {