Merge branch 'cngo-delete-due-date-issues-list' into 'master'

Delete due_date parameter on issues list refactor

See merge request gitlab-org/gitlab!80316

app/assets/javascripts/issues/list/components/issues_list_app.vue

@@ -41,7 +41,6 @@ import {
   i18n,
   MAX_LIST_SIZE,
   PAGE_SIZE,
-  PARAM_DUE_DATE,
   PARAM_STATE,
   RELATIVE_POSITION_ASC,
   TOKEN_TYPE_ASSIGNEE,
@@ -65,7 +64,6 @@ import {
   convertToApiParams,
   convertToSearchQuery,
   convertToUrlParams,
-  getDueDateValue,
   getFilterTokens,
   getInitialPageParams,
   getSortKey,
@@ -161,7 +159,6 @@ export default {
     }
 
     return {
-      dueDateFilter: getDueDateValue(getParameterByName(PARAM_DUE_DATE)),
       exportCsvPathWithQuery: this.getExportCsvPathWithQuery(),
       filterTokens: isSearchDisabled ? [] : getFilterTokens(window.location.search),
       issues: [],
@@ -391,7 +388,6 @@ export default {
     },
     urlParams() {
       return {
-        due_date: this.dueDateFilter,
         search: this.searchQuery,
         sort: urlSortParams[this.sortKey],
         state: this.state,

app/assets/javascripts/issues/list/constants.js

@@ -55,8 +55,6 @@ export const i18n = {
 export const MAX_LIST_SIZE = 10;
 export const PAGE_SIZE = 20;
 export const PAGE_SIZE_MANUAL = 100;
-export const PARAM_DUE_DATE = 'due_date';
-export const PARAM_SORT = 'sort';
 export const PARAM_STATE = 'state';
 export const RELATIVE_POSITION = 'relative_position';
 
@@ -68,21 +66,6 @@ export const largePageSizeParams = {
   firstPageSize: PAGE_SIZE_MANUAL,
 };
 
-export const DUE_DATE_NONE = '0';
-export const DUE_DATE_ANY = '';
-export const DUE_DATE_OVERDUE = 'overdue';
-export const DUE_DATE_WEEK = 'week';
-export const DUE_DATE_MONTH = 'month';
-export const DUE_DATE_NEXT_MONTH_AND_PREVIOUS_TWO_WEEKS = 'next_month_and_previous_two_weeks';
-export const DUE_DATE_VALUES = [
-  DUE_DATE_NONE,
-  DUE_DATE_ANY,
-  DUE_DATE_OVERDUE,
-  DUE_DATE_WEEK,
-  DUE_DATE_MONTH,
-  DUE_DATE_NEXT_MONTH_AND_PREVIOUS_TWO_WEEKS,
-];
-
 export const BLOCKING_ISSUES_ASC = 'BLOCKING_ISSUES_ASC';
 export const BLOCKING_ISSUES_DESC = 'BLOCKING_ISSUES_DESC';
 export const CREATED_ASC = 'CREATED_ASC';

app/assets/javascripts/issues/list/utils.js

@@ -13,7 +13,6 @@ import {
   defaultPageSizeParams,
   DUE_DATE_ASC,
   DUE_DATE_DESC,
-  DUE_DATE_VALUES,
   filters,
   LABEL_PRIORITY_ASC,
   LABEL_PRIORITY_DESC,
@@ -52,8 +51,6 @@ export const getSortKey = (sort) =>
 
 export const isSortKey = (sort) => Object.keys(urlSortParams).includes(sort);
 
-export const getDueDateValue = (value) => (DUE_DATE_VALUES.includes(value) ? value : undefined);
-
 export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) => {
   const sortOptions = [
     {

spec/frontend/issues/list/components/issues_list_app_spec.js

@@ -30,8 +30,6 @@ import IssuesListApp from '~/issues/list/components/issues_list_app.vue';
 import NewIssueDropdown from '~/issues/list/components/new_issue_dropdown.vue';
 import {
   CREATED_DESC,
-  DUE_DATE_OVERDUE,
-  PARAM_DUE_DATE,
   RELATIVE_POSITION,
   RELATIVE_POSITION_ASC,
   TOKEN_TYPE_ASSIGNEE,
@@ -296,16 +294,6 @@ describe('CE IssuesListApp component', () => {
   });
 
   describe('initial url params', () => {
-    describe('due_date', () => {
-      it('is set from the url params', () => {
-        setWindowLocation(`?${PARAM_DUE_DATE}=${DUE_DATE_OVERDUE}`);
-
-        wrapper = mountComponent();
-
-        expect(findIssuableList().props('urlParams')).toMatchObject({ due_date: DUE_DATE_OVERDUE });
-      });
-    });
-
     describe('search', () => {
       it('is set from the url params', () => {
         setWindowLocation(locationSearch);

spec/frontend/issues/list/utils_spec.js

@@ -10,7 +10,6 @@ import {
 } from 'jest/issues/list/mock_data';
 import {
   defaultPageSizeParams,
-  DUE_DATE_VALUES,
   largePageSizeParams,
   RELATIVE_POSITION_ASC,
   urlSortParams,
@@ -19,7 +18,6 @@ import {
   convertToApiParams,
   convertToSearchQuery,
   convertToUrlParams,
-  getDueDateValue,
   getFilterTokens,
   getInitialPageParams,
   getSortKey,
@@ -56,16 +54,6 @@ describe('isSortKey', () => {
   });
 });
 
-describe('getDueDateValue', () => {
-  it.each(DUE_DATE_VALUES)('returns the argument when it is `%s`', (value) => {
-    expect(getDueDateValue(value)).toBe(value);
-  });
-
-  it('returns undefined when the argument is invalid', () => {
-    expect(getDueDateValue('invalid value')).toBeUndefined();
-  });
-});
-
 describe('getSortOptions', () => {
   describe.each`
     hasIssueWeightsFeature | hasBlockedIssuesFeature | length | containsWeight | containsBlocking