gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16789 from Bouncey/fix/profileChallenges

Browse Source 
fix(profile): Fix challenges of undefined Error
This commit is contained in:
Berkeley Martinez
2018-02-28 09:05:30 -08:00
committed by GitHub
parent 4aa8981b44 b81cea4b08
commit 6abf4f05e3
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/app/entities/index.js
View File

@@ -110,14 +110,14 @@ export function projectsSelector(state) {
key.includes('projects') && !key.includes('coding-interview') key.includes('projects') && !key.includes('coding-interview')
) )
.map(key => blocks[key]) .map(key => blocks[key])
.map(({ name, challenges, superBlock }) => { .map(({ title, challenges, superBlock }) => {
const projectChallengeDashNames = challenges const projectChallengeDashNames = challenges
// remove any project intros // remove any project intros
.filter(chal => !chal.includes('get-set-for')); .filter(chal => !chal.includes('get-set-for'));
const projectChallenges = projectChallengeDashNames const projectChallenges = projectChallengeDashNames
.map(dashedName => selectiveChallengeTitleSelector(state, dashedName)); .map(dashedName => selectiveChallengeTitleSelector(state, dashedName));
return { return {
projectBlockName: name, projectBlockName: title,
superBlock, superBlock,
challenges: projectChallenges, challenges: projectChallenges,
challengeNameIdMap: pick( challengeNameIdMap: pick(

4
common/app/redux/fetch-challenges-epic.js
View File

@@ -68,7 +68,9 @@ export function fetchChallengesForBlockEpic(
.flatMapLatest(({ type, payload }) => { .flatMapLatest(({ type, payload }) => {
const fetchAnotherBlock = type === types.fetchNewBlock.start; const fetchAnotherBlock = type === types.fetchNewBlock.start;
const state = getState(); const state = getState();
let { block: blockName } = challengeSelector(state); let {
block: blockName = 'basic-html-and-html5'
} = challengeSelector(state);
const lang = langSelector(state); const lang = langSelector(state);
if (fetchAnotherBlock) { if (fetchAnotherBlock) {

15
server/services/mapUi.js
View File

@@ -34,10 +34,19 @@ export default function mapUiService(app) {
}, {}); }, {});
const blockMap = Object.keys(fullBlockMap) const blockMap = Object.keys(fullBlockMap)
.map(block => fullBlockMap[block]) .map(block => fullBlockMap[block])
.reduce((map, { dashedName, title, time, challenges }) => { .reduce(
map[dashedName] = { dashedName, title, time, challenges }; (map, { dashedName, title, time, challenges, superBlock }) => {
map[dashedName] = {
dashedName,
title,
time,
challenges,
superBlock
};
return map; return map;
}, {}); },
{}
);
const challengeMap = Object.keys(fullChallengeMap) const challengeMap = Object.keys(fullChallengeMap)
.map(challenge => fullChallengeMap[challenge]) .map(challenge => fullChallengeMap[challenge])
.reduce((map, challenge) => { .reduce((map, challenge) => {