Skip to content

Issue#4393 - Challenge Listings: Challenges not loading for subcommunitie #4580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 23, 2020
Merged

Issue#4393 - Challenge Listings: Challenges not loading for subcommunitie #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37fd324
Update filter.groupIds to filter.groups
luizrrodrigues Jun 22, 2020
6851599
Fix warning about propTypes
luizrrodrigues Jun 22, 2020
5dae888
Added backend filter to getRestActiveChallenges
luizrrodrigues Jun 22, 2020
eaa5c7d
Merge branch 'integration-v5-challenge-api' into issue-4393
luizrrodrigues Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/shared/actions/challenge-listing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,12 @@ function getRestActiveChallengesInit(uuid) {
* @param {String} uuid progress id
* @param {String} tokenV3 token v3
*/
function getRestActiveChallengesDone(uuid, tokenV3) {
const filter = { status: 'Active' };
return getAllActiveChallengesWithUsersDone(uuid, tokenV3, filter, 1);
function getRestActiveChallengesDone(uuid, tokenV3, filter) {
const mergedFilter = {
...filter,
status: 'Active',
};
return getAllActiveChallengesWithUsersDone(uuid, tokenV3, mergedFilter, 1);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/challenge-listing/Listing/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Listing.propTypes = {
setSort: PT.func.isRequired,
sorts: PT.shape().isRequired,
pastSearchTimestamp: PT.number,
userChallenges: PT.arrayOf(PT.shape()),
userChallenges: PT.arrayOf(PT.string),
isLoggedIn: PT.bool.isRequired,
};

Expand Down
11 changes: 6 additions & 5 deletions src/shared/containers/challenge-listing/Listing/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ export class ListingContainer extends React.Component {

if (!loadingActiveChallengesUUID && !_.isEmpty(meta) && !allActiveChallengesLoaded
&& BUCKETS.PAST !== activeBucket) {
getRestActiveChallenges(auth.tokenV3);
const f = this.getBackendFilter();
getRestActiveChallenges(auth.tokenV3, f.back);
}

setTimeout(() => {
Expand Down Expand Up @@ -134,8 +135,8 @@ export class ListingContainer extends React.Component {
);
if (communityFilter) communityFilter = communityFilter.challengeFilter;
if (communityFilter) filter = combine(filter, communityFilter);
if (communityId && groupIds.length > 0) {
filter.groupIds = groupIds;
if (communityId && !_.isEmpty(groupIds)) {
filter.groups = groupIds;
}
return {
back: mapToBackend(filter),
Expand Down Expand Up @@ -475,10 +476,10 @@ function mapDispatchToProps(dispatch) {
dispatch(a.getActiveChallengesInit(uuid, page, frontFilter));
dispatch(a.getActiveChallengesDone(uuid, page, filter, token, frontFilter));
},
getRestActiveChallenges: (token) => {
getRestActiveChallenges: (token, filter) => {
const uuid = shortId();
dispatch(a.getRestActiveChallengesInit(uuid));
dispatch(a.getRestActiveChallengesDone(uuid, token));
dispatch(a.getRestActiveChallengesDone(uuid, token, filter));
},
getCommunitiesList: (auth) => {
const uuid = shortId();
Expand Down