From 6224401fb2007c421191feb8ff18e293dc6ee205 Mon Sep 17 00:00:00 2001 From: codeMinter Date: Wed, 2 Oct 2019 05:44:17 +0530 Subject: [PATCH 1/2] Fix for issue #3331 --- src/shared/containers/challenge-listing/Listing/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx index 0a934ee595..c95e1dde93 100644 --- a/src/shared/containers/challenge-listing/Listing/index.jsx +++ b/src/shared/containers/challenge-listing/Listing/index.jsx @@ -116,11 +116,11 @@ export class ListingContainer extends React.Component { getBackendFilter() { const { communitiesList, - selectedCommunityId, + communityId, } = this.props; let { filter } = this.props; let communityFilter = communitiesList.data.find( - item => item.communityId === selectedCommunityId, + item => item.communityId === communityId, ); if (communityFilter) communityFilter = communityFilter.challengeFilter; if (communityFilter) filter = combine(filter, communityFilter); From a0c773adc12c823d4ff53a68701dd3c418ce84f3 Mon Sep 17 00:00:00 2001 From: codeMinter Date: Wed, 2 Oct 2019 21:56:59 +0530 Subject: [PATCH 2/2] changes for issue #3331 --- src/shared/containers/challenge-listing/Listing/index.jsx | 7 ++++++- src/shared/routes/Communities/Zurich/Routes.jsx | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx index c95e1dde93..5baedb9510 100644 --- a/src/shared/containers/challenge-listing/Listing/index.jsx +++ b/src/shared/containers/challenge-listing/Listing/index.jsx @@ -116,14 +116,19 @@ export class ListingContainer extends React.Component { getBackendFilter() { const { communitiesList, + selectedCommunityId, + groupIds, communityId, } = this.props; let { filter } = this.props; let communityFilter = communitiesList.data.find( - item => item.communityId === communityId, + item => item.communityId === selectedCommunityId, ); if (communityFilter) communityFilter = communityFilter.challengeFilter; if (communityFilter) filter = combine(filter, communityFilter); + if (communityId && groupIds.length > 0) { + filter.groupIds = groupIds; + } return { back: mapToBackend(filter), front: filter, diff --git a/src/shared/routes/Communities/Zurich/Routes.jsx b/src/shared/routes/Communities/Zurich/Routes.jsx index f414e52861..c063041232 100644 --- a/src/shared/routes/Communities/Zurich/Routes.jsx +++ b/src/shared/routes/Communities/Zurich/Routes.jsx @@ -81,6 +81,7 @@ function Zurich({ base, meta, userGroups }) { meta, newChallengeDetails: true, ChallengeListingBanner, + groupIds: meta.groupIds, })} exact path={`${base}/challenges`}