Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

3 files changed, 31 insertions, 13 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 810d9f782b9..3d48c74b40b 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
@@ -23,9 +23,19 @@ export const DEFAULT_LABEL_NONE = { value: FILTER_NONE, text: __('None'), title:
 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 DEFAULT_MILESTONE_UPCOMING = {
+  value: FILTER_UPCOMING,
+  text: __('Upcoming'),
+  title: __('Upcoming'),
+};
+export const DEFAULT_MILESTONE_STARTED = {
+  value: FILTER_STARTED,
+  text: __('Started'),
+  title: __('Started'),
+};
 export const DEFAULT_MILESTONES = DEFAULT_NONE_ANY.concat([
-  { value: FILTER_UPCOMING, text: __('Upcoming'), title: __('Upcoming') },
-  { value: FILTER_STARTED, text: __('Started'), title: __('Started') },
+  DEFAULT_MILESTONE_UPCOMING,
+  DEFAULT_MILESTONE_STARTED,
 ]);
 
 export const SortDirection = {
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 bbc1888bc0b..157068b2c0f 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
@@ -163,19 +163,22 @@ export default {
     },
   },
   methods: {
-    handleInput: debounce(function debouncedSearch({ data }) {
-      this.searchKey = data;
+    handleInput: debounce(function debouncedSearch({ data, operator }) {
+      // Prevent fetching suggestions when data or operator is not present
+      if (data || operator) {
+        this.searchKey = data;
 
-      if (!this.suggestionsLoading && !this.activeTokenValue) {
-        let search = this.searchTerm ? this.searchTerm : data;
+        if (!this.suggestionsLoading && !this.activeTokenValue) {
+          let search = this.searchTerm ? this.searchTerm : data;
 
-        if (search.startsWith('"') && search.endsWith('"')) {
-          search = stripQuotes(search);
-        } else if (search.startsWith('"')) {
-          search = search.slice(1, search.length);
-        }
+          if (search.startsWith('"') && search.endsWith('"')) {
+            search = stripQuotes(search);
+          } else if (search.startsWith('"')) {
+            search = search.slice(1, search.length);
+          }
 
-        this.$emit('fetch-suggestions', search);
+          this.$emit('fetch-suggestions', search);
+        }
       }
     }, DEBOUNCE_DELAY),
     handleTokenValueSelected(selectedValue) {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
index 0d3394788fa..11c081ab4f8 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
@@ -57,7 +57,12 @@ export default {
         .fetchMilestones(searchTerm)
         .then((response) => {
           const data = Array.isArray(response) ? response : response.data;
-          this.milestones = data.slice().sort(sortMilestonesByDueDate);
+
+          if (this.config.shouldSkipSort) {
+            this.milestones = data;
+          } else {
+            this.milestones = data.slice().sort(sortMilestonesByDueDate);
+          }
         })
         .catch(() => {
           createFlash({ message: __('There was a problem fetching milestones.') });