Merge branch 'ss/fix-mileston-token-filter' into 'master'

Add guard to milestone_token for sort

See merge request gitlab-org/gitlab!79068

app/assets/javascripts/boards/components/issue_board_filtered_search.vue

@@ -157,6 +157,7 @@ export default {
           symbol: '%',
           token: MilestoneToken,
           unique: true,
+          shouldSkipSort: true,
           fetchMilestones: this.fetchMilestones,
         },
         {

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.') });

ee/spec/frontend/boards/mock_data.js

@@ -474,6 +474,7 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, fetchIter
     symbol: '%',
     type: 'milestone',
     token: MilestoneToken,
+    shouldSkipSort: true,
     unique: true,
     fetchMilestones,
   },

spec/frontend/boards/mock_data.js

@@ -612,6 +612,7 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, isSignedI
     title: __('Milestone'),
     symbol: '%',
     type: 'milestone',
+    shouldSkipSort: true,
     token: MilestoneToken,
     unique: true,
     fetchMilestones,

spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js

@@ -32,7 +32,7 @@ const defaultStubs = {
 
 function createComponent(options = {}) {
   const {
-    config = mockMilestoneToken,
+    config = { ...mockMilestoneToken, shouldSkipSort: true },
     value = { data: '' },
     active = false,
     stubs = defaultStubs,
@@ -68,6 +68,27 @@ describe('MilestoneToken', () => {
 
   describe('methods', () => {
     describe('fetchMilestones', () => {
+      describe('when config.shouldSkipSort is true', () => {
+        beforeEach(() => {
+          wrapper.vm.config.shouldSkipSort = true;
+        });
+
+        afterEach(() => {
+          wrapper.vm.config.shouldSkipSort = false;
+        });
+        it('does not call sortMilestonesByDueDate', async () => {
+          jest.spyOn(wrapper.vm.config, 'fetchMilestones').mockResolvedValue({
+            data: mockMilestones,
+          });
+
+          wrapper.vm.fetchMilestones();
+
+          await waitForPromises();
+
+          expect(sortMilestonesByDueDate).toHaveBeenCalledTimes(0);
+        });
+      });
+
       it('calls `config.fetchMilestones` with provided searchTerm param', () => {
         jest.spyOn(wrapper.vm.config, 'fetchMilestones');
 
@@ -77,10 +98,11 @@ describe('MilestoneToken', () => {
       });
 
       it('sets response to `milestones` when request is successful', () => {
+        wrapper.vm.config.shouldSkipSort = false;
+
         jest.spyOn(wrapper.vm.config, 'fetchMilestones').mockResolvedValue({
           data: mockMilestones,
         });
-
         wrapper.vm.fetchMilestones();
 
         return waitForPromises().then(() => {