From 3f23d6a2e60b9446ae34366c19b106a875e497a0 Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Wed, 17 Nov 2021 06:27:22 +0700 Subject: [PATCH 1/3] Reset Pagination to 1 --- src/containers/Challenges/Listing/index.jsx | 24 ++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/containers/Challenges/Listing/index.jsx b/src/containers/Challenges/Listing/index.jsx index 05381b4..1f32274 100644 --- a/src/containers/Challenges/Listing/index.jsx +++ b/src/containers/Challenges/Listing/index.jsx @@ -51,7 +51,10 @@ const Listing = ({ size="xs" onChange={(value) => { onSearch.current(() => { - const filterChange = { search: value }; + const filterChange = { + search: value, + page: 1 + }; updateFilter(filterChange); }); }} @@ -73,6 +76,7 @@ const Listing = ({ ); const filterChange = { sortBy: constants.CHALLENGE_SORT_BY[selectedOption.label], + page: 1 }; updateFilter(filterChange); }} @@ -91,7 +95,11 @@ const Listing = ({ const s = range.startDate ? moment(range.startDate).toISOString() : null; - const filterChange = { endDateStart: s, startDateEnd: d }; + const filterChange = { + endDateStart: s, + startDateEnd: d, + page: 1 + }; updateFilter(filterChange); }} range={{ @@ -102,18 +110,24 @@ const Listing = ({ - {challenges.length ? + {challenges.length ? {challenges.map((challenge, index) => (
{ - const filterChange = { tags: [tag] }; + const filterChange = { + tags: [tag], + page: 1 + }; updateFilter(filterChange); }} onClickTrack={(track) => { - const filterChange = { tracks: [track] }; + const filterChange = { + tracks: [track], + page: 1 + }; updateFilter(filterChange); }} isLoggedIn={isLoggedIn} From 6ef504bd9653be3e402e7497f3a36ced969ab6c6 Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Wed, 17 Nov 2021 06:28:02 +0700 Subject: [PATCH 2/3] linter --- src/containers/Challenges/Listing/index.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/containers/Challenges/Listing/index.jsx b/src/containers/Challenges/Listing/index.jsx index 1f32274..68a8530 100644 --- a/src/containers/Challenges/Listing/index.jsx +++ b/src/containers/Challenges/Listing/index.jsx @@ -53,7 +53,7 @@ const Listing = ({ onSearch.current(() => { const filterChange = { search: value, - page: 1 + page: 1, }; updateFilter(filterChange); }); @@ -76,7 +76,7 @@ const Listing = ({ ); const filterChange = { sortBy: constants.CHALLENGE_SORT_BY[selectedOption.label], - page: 1 + page: 1, }; updateFilter(filterChange); }} @@ -98,7 +98,7 @@ const Listing = ({ const filterChange = { endDateStart: s, startDateEnd: d, - page: 1 + page: 1, }; updateFilter(filterChange); }} @@ -119,14 +119,14 @@ const Listing = ({ onClickTag={(tag) => { const filterChange = { tags: [tag], - page: 1 + page: 1, }; updateFilter(filterChange); }} onClickTrack={(track) => { const filterChange = { tracks: [track], - page: 1 + page: 1, }; updateFilter(filterChange); }} From 8d039680f267065458c1e9f50491c291920d5084 Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Thu, 18 Nov 2021 12:20:42 +0700 Subject: [PATCH 3/3] Replace Track QA --- .../Challenges/Listing/ChallengeItem/TrackIcon/styles.scss | 1 + src/containers/Challenges/Listing/index.jsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/Challenges/Listing/ChallengeItem/TrackIcon/styles.scss b/src/containers/Challenges/Listing/ChallengeItem/TrackIcon/styles.scss index 1528470..489052a 100644 --- a/src/containers/Challenges/Listing/ChallengeItem/TrackIcon/styles.scss +++ b/src/containers/Challenges/Listing/ChallengeItem/TrackIcon/styles.scss @@ -6,6 +6,7 @@ height: 36px; vertical-align: middle; line-height: 1; + cursor: pointer; > svg { position: absolute; diff --git a/src/containers/Challenges/Listing/index.jsx b/src/containers/Challenges/Listing/index.jsx index 68a8530..aeb22a8 100644 --- a/src/containers/Challenges/Listing/index.jsx +++ b/src/containers/Challenges/Listing/index.jsx @@ -125,7 +125,7 @@ const Listing = ({ }} onClickTrack={(track) => { const filterChange = { - tracks: [track], + tracks: [track.replace('Quality Assurance', 'QA')], page: 1, }; updateFilter(filterChange);