diff options
Diffstat (limited to 'app/assets/javascripts/issues/list/utils.js')
-rw-r--r-- | app/assets/javascripts/issues/list/utils.js | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js index dfdc6e27f0d..f02c7a23f51 100644 --- a/app/assets/javascripts/issues/list/utils.js +++ b/app/assets/javascripts/issues/list/utils.js @@ -21,7 +21,6 @@ import { MILESTONE_DUE_DESC, NORMAL_FILTER, PAGE_SIZE, - PAGE_SIZE_MANUAL, PARAM_ASSIGNEE_ID, POPULARITY_ASC, POPULARITY_DESC, @@ -44,11 +43,13 @@ import { urlSortParams, WEIGHT_ASC, WEIGHT_DESC, + CLOSED_ASC, + CLOSED_DESC, } from './constants'; export const getInitialPageParams = ( - sortKey, - firstPageSize = sortKey === RELATIVE_POSITION_ASC ? PAGE_SIZE_MANUAL : PAGE_SIZE, + pageSize, + firstPageSize = pageSize ?? PAGE_SIZE, lastPageSize, afterCursor, beforeCursor, @@ -92,6 +93,14 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, { id: 4, + title: __('Closed date'), + sortDirection: { + ascending: CLOSED_ASC, + descending: CLOSED_DESC, + }, + }, + { + id: 5, title: __('Milestone due date'), sortDirection: { ascending: MILESTONE_DUE_ASC, @@ -99,7 +108,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, }, { - id: 5, + id: 6, title: __('Due date'), sortDirection: { ascending: DUE_DATE_ASC, @@ -107,7 +116,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, }, { - id: 6, + id: 7, title: __('Popularity'), sortDirection: { ascending: POPULARITY_ASC, @@ -115,7 +124,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, }, { - id: 7, + id: 8, title: __('Label priority'), sortDirection: { ascending: LABEL_PRIORITY_ASC, @@ -123,7 +132,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, }, { - id: 8, + id: 9, title: __('Manual'), sortDirection: { ascending: RELATIVE_POSITION_ASC, @@ -131,7 +140,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) }, }, { - id: 9, + id: 10, title: __('Title'), sortDirection: { ascending: TITLE_ASC, |