From e8b6b8906d822be33402dc1549ac65cb077a83e0 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Thu, 15 Oct 2020 22:28:22 +0530 Subject: [PATCH 1/5] Update ChallengeFilters.jsx --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index 6bc2bd13c7..7abd0658ea 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -49,6 +49,7 @@ export default function ChallengeFilters({ if (filterState.events && filterState.events.length) filterRulesCount += 1; if (filterState.tags && filterState.tags.length) filterRulesCount += 1; if (filterState.types && filterState.types.length) filterRulesCount += 1; + if (filterState.status) filterRulesCount += 1; if (filterState.endDateStart || filterState.startDateEnd) { filterRulesCount += 1; } From e2b07f2017b1127a9f87e7d9cafb04b1f84877a9 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Thu, 15 Oct 2020 23:52:56 +0530 Subject: [PATCH 2/5] Update ChallengeFilters.jsx --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index 7abd0658ea..56e37800c4 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -49,7 +49,7 @@ export default function ChallengeFilters({ if (filterState.events && filterState.events.length) filterRulesCount += 1; if (filterState.tags && filterState.tags.length) filterRulesCount += 1; if (filterState.types && filterState.types.length) filterRulesCount += 1; - if (filterState.status) filterRulesCount += 1; + if (filterState.status && filterState.status !== 'Active') filterRulesCount += 1; if (filterState.endDateStart || filterState.startDateEnd) { filterRulesCount += 1; } From b25dd098af3d806e2fb92c42cf2c7abb3caeaef2 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Fri, 16 Oct 2020 01:47:09 +0530 Subject: [PATCH 3/5] Update ChallengeFilters.jsx --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index 56e37800c4..4ce26b5740 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -49,7 +49,7 @@ export default function ChallengeFilters({ if (filterState.events && filterState.events.length) filterRulesCount += 1; if (filterState.tags && filterState.tags.length) filterRulesCount += 1; if (filterState.types && filterState.types.length) filterRulesCount += 1; - if (filterState.status && filterState.status !== 'Active') filterRulesCount += 1; + if (filterState.status && filterState.status !== 'All') filterRulesCount += 1; if (filterState.endDateStart || filterState.startDateEnd) { filterRulesCount += 1; } From 5d3c3aa4ed0f440b25b1fca92b318e0b12fe23fa Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Fri, 16 Oct 2020 02:32:45 +0530 Subject: [PATCH 4/5] Update ChallengeFilters.jsx --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index 4ce26b5740..ea89fb7b42 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -7,6 +7,7 @@ import SwitchWithLabel from 'components/SwitchWithLabel'; import { challenge as challengeUtils } from 'topcoder-react-lib'; // import { COMPETITION_TRACKS as TRACKS } from 'utils/tc'; import _ from 'lodash'; +import { BUCKETS } from 'utils/challenge-listing/buckets'; // import localStorage from 'localStorage'; import ChallengeSearchBar from './ChallengeSearchBar'; @@ -49,7 +50,7 @@ export default function ChallengeFilters({ if (filterState.events && filterState.events.length) filterRulesCount += 1; if (filterState.tags && filterState.tags.length) filterRulesCount += 1; if (filterState.types && filterState.types.length) filterRulesCount += 1; - if (filterState.status && filterState.status !== 'All') filterRulesCount += 1; + if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'Active') filterRulesCount += 1; if (filterState.endDateStart || filterState.startDateEnd) { filterRulesCount += 1; } From 27199390cf3ba979a1afeb88d770245a10849aca Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Fri, 16 Oct 2020 03:32:25 +0530 Subject: [PATCH 5/5] Update ChallengeFilters.jsx --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index ea89fb7b42..3e7f9848f1 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -50,7 +50,7 @@ export default function ChallengeFilters({ if (filterState.events && filterState.events.length) filterRulesCount += 1; if (filterState.tags && filterState.tags.length) filterRulesCount += 1; if (filterState.types && filterState.types.length) filterRulesCount += 1; - if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'Active') filterRulesCount += 1; + if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'All') filterRulesCount += 1; if (filterState.endDateStart || filterState.startDateEnd) { filterRulesCount += 1; }