diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js index 1526ea19072a348c59af1b50d7df7ce390e89a29..97ccc58e8269445150691d7ce2a10c7bacaef1c5 100644 --- a/app/assets/javascripts/issues/list/constants.js +++ b/app/assets/javascripts/issues/list/constants.js @@ -73,6 +73,8 @@ export const POPULARITY_DESC = 'POPULARITY_DESC'; export const PRIORITY_ASC = 'PRIORITY_ASC'; export const PRIORITY_DESC = 'PRIORITY_DESC'; export const RELATIVE_POSITION_ASC = 'RELATIVE_POSITION_ASC'; +export const START_DATE_ASC = 'START_DATE_ASC'; +export const START_DATE_DESC = 'START_DATE_DESC'; export const TITLE_ASC = 'TITLE_ASC'; export const TITLE_DESC = 'TITLE_DESC'; export const UPDATED_ASC = 'UPDATED_ASC'; diff --git a/app/assets/javascripts/work_items/pages/list/constants.js b/app/assets/javascripts/work_items/pages/list/constants.js index 425e67e6e42c094a57cfcea4cd0f15ecc424366b..d621755c81ba503658c81b1b4ceb28f14f3bffc5 100644 --- a/app/assets/javascripts/work_items/pages/list/constants.js +++ b/app/assets/javascripts/work_items/pages/list/constants.js @@ -2,6 +2,10 @@ import { __ } from '~/locale'; import { CREATED_ASC, CREATED_DESC, + DUE_DATE_ASC, + DUE_DATE_DESC, + START_DATE_ASC, + START_DATE_DESC, TITLE_ASC, TITLE_DESC, UPDATED_ASC, @@ -27,6 +31,22 @@ export const sortOptions = [ }, { id: 3, + title: __('Start date'), + sortDirection: { + ascending: START_DATE_ASC, + descending: START_DATE_DESC, + }, + }, + { + id: 4, + title: __('Due date'), + sortDirection: { + ascending: DUE_DATE_ASC, + descending: DUE_DATE_DESC, + }, + }, + { + id: 5, title: __('Title'), sortDirection: { ascending: TITLE_ASC, @@ -38,6 +58,10 @@ export const sortOptions = [ export const urlSortParams = { [CREATED_ASC]: 'created_asc', [CREATED_DESC]: 'created_date', + [DUE_DATE_ASC]: 'due_date_asc', + [DUE_DATE_DESC]: 'due_date_desc', + [START_DATE_ASC]: 'start_date_asc', + [START_DATE_DESC]: 'start_date_desc', [TITLE_ASC]: 'title_asc', [TITLE_DESC]: 'title_desc', [UPDATED_ASC]: 'updated_asc',