From d025513a59b012c9c23421ed4c8bbe9db6b58269 Mon Sep 17 00:00:00 2001 From: gets0ul Date: Wed, 23 Sep 2020 17:33:53 +0700 Subject: [PATCH 1/5] Fix sorted of by 'Most recent' of My Challenges bucket and sorted by 'Review start date' of Open for Review bucket to be based of challenge start date in descending order. --- src/shared/reducers/challenge-listing/index.js | 2 +- src/shared/utils/challenge-listing/buckets.js | 2 +- src/shared/utils/challenge-listing/sort.js | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/shared/reducers/challenge-listing/index.js b/src/shared/reducers/challenge-listing/index.js index 77cc274165..2e47332a45 100644 --- a/src/shared/reducers/challenge-listing/index.js +++ b/src/shared/reducers/challenge-listing/index.js @@ -812,7 +812,7 @@ function create(initialState) { sorts: { ongoing: 'updated', openForRegistration: 'updated', - my: 'updated', + my: 'startDate', // past: 'updated', reviewOpportunities: 'review-opportunities-start-date', }, diff --git a/src/shared/utils/challenge-listing/buckets.js b/src/shared/utils/challenge-listing/buckets.js index dcc08de4ce..5c999bb9fe 100644 --- a/src/shared/utils/challenge-listing/buckets.js +++ b/src/shared/utils/challenge-listing/buckets.js @@ -35,7 +35,7 @@ export const BUCKET_DATA = { // hideCount: false, name: 'My Challenges', sorts: [ - SORTS.MOST_RECENT, + SORTS.MOST_RECENT_START_DATE, // SORTS.TIME_TO_SUBMIT, // SORTS.NUM_REGISTRANTS, // SORTS.NUM_SUBMISSIONS, diff --git a/src/shared/utils/challenge-listing/sort.js b/src/shared/utils/challenge-listing/sort.js index bad9bf9fc8..eceb250436 100644 --- a/src/shared/utils/challenge-listing/sort.js +++ b/src/shared/utils/challenge-listing/sort.js @@ -8,6 +8,7 @@ import { sumBy } from 'lodash'; export const SORTS = { // 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', @@ -29,6 +30,10 @@ export default { name: 'Most recent', order: 'desc', }, + [SORTS.MOST_RECENT_START_DATE]: { + name: 'Most recent', + order: 'desc', + }, // [SORTS.NUM_REGISTRANTS]: { // func: (a, b) => b.numOfRegistrants - a.numOfRegistrants, // name: '# of registrants', @@ -89,7 +94,7 @@ export default { }, [SORTS.REVIEW_OPPORTUNITIES_START_DATE]: { // This will implicitly use moment#valueOf - func: (a, b) => moment(a.startDate) - moment(b.startDate), + func: (a, b) => moment(b.startDate) - moment(a.startDate), // descending name: 'Review start date', }, }; From 959e5a25d4cf0061d57c42b556f878a6d05e0311 Mon Sep 17 00:00:00 2001 From: gets0ul Date: Thu, 24 Sep 2020 00:21:19 +0700 Subject: [PATCH 2/5] Fix comment. Sorting by review start date is ascending as in prod env. --- src/shared/utils/challenge-listing/sort.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/utils/challenge-listing/sort.js b/src/shared/utils/challenge-listing/sort.js index eceb250436..8c27e5929e 100644 --- a/src/shared/utils/challenge-listing/sort.js +++ b/src/shared/utils/challenge-listing/sort.js @@ -94,7 +94,7 @@ export default { }, [SORTS.REVIEW_OPPORTUNITIES_START_DATE]: { // This will implicitly use moment#valueOf - func: (a, b) => moment(b.startDate) - moment(a.startDate), // descending + func: (a, b) => moment(b.startDate) - moment(a.startDate), // ascending name: 'Review start date', }, }; From 4e60e7a021da29961afb2044c20cb8b8d364d6ca Mon Sep 17 00:00:00 2001 From: gets0ul Date: Thu, 24 Sep 2020 00:57:33 +0700 Subject: [PATCH 3/5] Revert back the comment. As sorting is in descending order. --- src/shared/utils/challenge-listing/sort.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/utils/challenge-listing/sort.js b/src/shared/utils/challenge-listing/sort.js index 8c27e5929e..eceb250436 100644 --- a/src/shared/utils/challenge-listing/sort.js +++ b/src/shared/utils/challenge-listing/sort.js @@ -94,7 +94,7 @@ export default { }, [SORTS.REVIEW_OPPORTUNITIES_START_DATE]: { // This will implicitly use moment#valueOf - func: (a, b) => moment(b.startDate) - moment(a.startDate), // ascending + func: (a, b) => moment(b.startDate) - moment(a.startDate), // descending name: 'Review start date', }, }; From 92df869479cee97f6b1cb26e29c1118d245232b1 Mon Sep 17 00:00:00 2001 From: gets0ul Date: Thu, 24 Sep 2020 15:40:16 +0700 Subject: [PATCH 4/5] Apply the same sorting to other buckets. --- .../components/challenge-listing/Listing/Bucket/index.jsx | 2 +- src/shared/reducers/challenge-listing/index.js | 4 ++-- src/shared/utils/challenge-listing/buckets.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx index aad36f8317..9e26afb548 100644 --- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx +++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx @@ -58,7 +58,7 @@ export default function Bucket({ refs.current.push(el); } }; - const activeSort = sort || 'updated'; + const activeSort = sort || 'startDate'; const sortedChallenges = activeBucket === 'all' ? _.clone(challenges.slice(0, 10)) : _.clone(challenges); // sortedChallenges.sort(Sort[activeSort].func); diff --git a/src/shared/reducers/challenge-listing/index.js b/src/shared/reducers/challenge-listing/index.js index 2e47332a45..412ffb0fd1 100644 --- a/src/shared/reducers/challenge-listing/index.js +++ b/src/shared/reducers/challenge-listing/index.js @@ -810,8 +810,8 @@ function create(initialState) { selectedCommunityId: 'All', sorts: { - ongoing: 'updated', - openForRegistration: 'updated', + ongoing: 'startDate', + openForRegistration: 'startDate', my: 'startDate', // past: 'updated', reviewOpportunities: 'review-opportunities-start-date', diff --git a/src/shared/utils/challenge-listing/buckets.js b/src/shared/utils/challenge-listing/buckets.js index 5c999bb9fe..964e9cc9c6 100644 --- a/src/shared/utils/challenge-listing/buckets.js +++ b/src/shared/utils/challenge-listing/buckets.js @@ -52,7 +52,7 @@ export const BUCKET_DATA = { // hideCount: false, name: 'Open for registration', sorts: [ - SORTS.MOST_RECENT, + SORTS.MOST_RECENT_START_DATE, // SORTS.TIME_TO_REGISTER, // SORTS.TIME_TO_SUBMIT, // SORTS.NUM_REGISTRANTS, @@ -71,7 +71,7 @@ export const BUCKET_DATA = { // hideCount: false, name: 'Ongoing challenges', sorts: [ - SORTS.MOST_RECENT, + SORTS.MOST_RECENT_START_DATE, // SORTS.CURRENT_PHASE, SORTS.TITLE_A_TO_Z, // SORTS.PRIZE_HIGH_TO_LOW, From 64a6ef5235c7780612ef7cd589f7cb44ea6733d9 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Mon, 28 Sep 2020 23:41:21 -0300 Subject: [PATCH 5/5] Revert Review Opportunities sort to asc @gets0ul this was a mistyped in issue description, we need keep this like existing. --- src/shared/utils/challenge-listing/sort.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/utils/challenge-listing/sort.js b/src/shared/utils/challenge-listing/sort.js index eceb250436..3225595650 100644 --- a/src/shared/utils/challenge-listing/sort.js +++ b/src/shared/utils/challenge-listing/sort.js @@ -94,7 +94,7 @@ export default { }, [SORTS.REVIEW_OPPORTUNITIES_START_DATE]: { // This will implicitly use moment#valueOf - func: (a, b) => moment(b.startDate) - moment(a.startDate), // descending + func: (a, b) => moment(a.startDate) - moment(b.startDate), name: 'Review start date', }, };