Skip to content

I v5 develop 18 aug #225

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 6 commits into from
Aug 18, 2020
Merged

I v5 develop 18 aug #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61b7e18
Merge pull request #221 from topcoder-platform/integration-v5-challen…
sushilshinde Aug 13, 2020
0a44b2e
Fix challenge.track validation
luizrrodrigues Aug 14, 2020
d5ba25f
fix: for #4749
mtwomey Aug 14, 2020
f39c012
Fix getChallengeRegistrants filter to not logged user
mtwomey Aug 14, 2020
cebfd8b
Hotfix - Remove old legacy.track
mtwomey Aug 16, 2020
0077211
Merge remote-tracking branch 'origin/integration-v5-develop' into i-v…
sushilshinde Aug 18, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
"test": "npm run lint && npm run jest"
},
"version": "1000.19.45",
"version": "1000.19.48",
"dependencies": {
"auth0-js": "^6.8.4",
"config": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/reducers/challenge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ export function factory(options = {}) {
tokens.tokenV2,
)).then((res) => {
const challengeDetails = _.get(res, 'payload', {});
const track = _.get(challengeDetails, 'legacy.track', '');
const track = _.get(challengeDetails, 'track', '');
let checkpointsPromise = null;
if (track === COMPETITION_TRACKS.DESIGN) {
const p = _.get(challengeDetails, 'phases', [])
Expand Down
6 changes: 4 additions & 2 deletions src/services/challenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function normalizeChallenge(challenge, username) {
}
const prizes = (challenge.prizeSets[0] && challenge.prizeSets[0].prizes) || [];
_.defaults(challenge, {
communities: new Set([COMPETITION_TRACKS[challenge.legacy.track]]),
communities: new Set([COMPETITION_TRACKS[challenge.track]]),
groups,
registrationOpen,
submissionEndTimestamp,
Expand Down Expand Up @@ -407,7 +407,9 @@ class ChallengesService {
.then(checkErrorV5).then(res => res.result);

/* API will return all roles to currentUser, so need to filter in FE */
registrants = _.filter(registrants, r => r.roleId === roleId);
if (roleId) {
registrants = _.filter(registrants, r => r.roleId === roleId);
}

return registrants || [];
}
Expand Down