diff --git a/.circleci/config.yml b/.circleci/config.yml index 3cd7879dfb..d723a4d47b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -304,7 +304,6 @@ workflows: branches: only: - develop - - nav-vanilla-forum - "approve-smoke-test-on-staging": type: approval requires: diff --git a/src/shared/utils/challenge-listing/buckets.js b/src/shared/utils/challenge-listing/buckets.js index e50a724de3..180e4f570e 100644 --- a/src/shared/utils/challenge-listing/buckets.js +++ b/src/shared/utils/challenge-listing/buckets.js @@ -45,7 +45,7 @@ export const BUCKET_DATA = { // SORTS.TIME_TO_SUBMIT, // SORTS.NUM_REGISTRANTS, // SORTS.NUM_SUBMISSIONS, - // SORTS.PRIZE_HIGH_TO_LOW, + SORTS.PRIZE_HIGH_TO_LOW, SORTS.TITLE_A_TO_Z, ], }, @@ -63,7 +63,7 @@ export const BUCKET_DATA = { // SORTS.TIME_TO_SUBMIT, // SORTS.NUM_REGISTRANTS, // SORTS.NUM_SUBMISSIONS, - // SORTS.PRIZE_HIGH_TO_LOW, + SORTS.PRIZE_HIGH_TO_LOW, SORTS.TITLE_A_TO_Z, ], }, @@ -78,9 +78,9 @@ export const BUCKET_DATA = { name: 'Ongoing challenges', sorts: [ SORTS.MOST_RECENT_START_DATE, - // SORTS.CURRENT_PHASE, + SORTS.CURRENT_PHASE, SORTS.TITLE_A_TO_Z, - // SORTS.PRIZE_HIGH_TO_LOW, + SORTS.PRIZE_HIGH_TO_LOW, ], }, [BUCKETS.UPCOMING]: { diff --git a/src/shared/utils/challenge-listing/sort.js b/src/shared/utils/challenge-listing/sort.js index ce537b2ac5..b8338076f2 100644 --- a/src/shared/utils/challenge-listing/sort.js +++ b/src/shared/utils/challenge-listing/sort.js @@ -7,14 +7,14 @@ import { sumBy } from 'lodash'; // import { phaseStartDate, phaseEndDate } from './helper'; export const SORTS = { - // CURRENT_PHASE: 'current-phase', + CURRENT_PHASE: 'current-phase', MOST_RECENT: 'updated', MOST_RECENT_START_DATE: 'startDate', // NUM_REGISTRANTS: 'num-registrants', // NUM_SUBMISSIONS: 'num-submissions', - // PRIZE_HIGH_TO_LOW: 'prize-high-to-low', - // TIME_TO_REGISTER: 'time-to-register', - // TIME_TO_SUBMIT: 'time-to-submit', + PRIZE_HIGH_TO_LOW: 'overview.totalPrizes', + // TIME_TO_REGISTER: 'registrationEndDate', + // TIME_TO_SUBMIT: 'submissionEndDate', TITLE_A_TO_Z: 'name', REVIEW_OPPORTUNITIES_TITLE_A_TO_Z: 'review-opportunities-title-a-to-z', REVIEW_OPPORTUNITIES_PAYMENT: 'review-opportunities-payment', @@ -22,12 +22,11 @@ export const SORTS = { }; export default { - // [SORTS.CURRENT_PHASE]: { - // func: (a, b) => a.status.localeCompare(b.status), - // name: 'Current phase', - // }, + [SORTS.CURRENT_PHASE]: { + func: (a, b) => a.status.localeCompare(b.status), + name: 'Current phase', + }, [SORTS.MOST_RECENT]: { - // func: (a, b) => moment(b.registrationStartDate).diff(a.registrationStartDate), name: 'Most recent', order: 'desc', }, @@ -35,18 +34,11 @@ export default { name: 'Most recent', order: 'desc', }, - // [SORTS.NUM_REGISTRANTS]: { - // func: (a, b) => b.numOfRegistrants - a.numOfRegistrants, - // name: '# of registrants', - // }, - // [SORTS.NUM_SUBMISSIONS]: { - // func: (a, b) => b.numOfSubmissions - a.numOfSubmissions, - // name: '# of submissions', - // }, - // [SORTS.PRIZE_HIGH_TO_LOW]: { - // func: (a, b) => b.totalPrize - a.totalPrize, - // name: 'Prize high to low', - // }, + [SORTS.PRIZE_HIGH_TO_LOW]: { + func: (a, b) => b.totalPrize - a.totalPrize, + name: 'Prize high to low', + order: 'desc', + }, // [SORTS.TIME_TO_REGISTER]: { // func: (a, b) => { // const aDate = moment(a.registrationEndDate || a.submissionEndTimestamp); @@ -59,6 +51,7 @@ export default { // return aDate.diff(bDate); // }, // name: 'Time to register', + // order: 'desc', // }, // [SORTS.TIME_TO_SUBMIT]: { // func: (a, b) => { @@ -79,6 +72,7 @@ export default { // return aDate.diff(bDate); // }, // name: 'Time to submit', + // order: 'desc', // }, [SORTS.TITLE_A_TO_Z]: { // func: (a, b) => a.name.localeCompare(b.name),