greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: storage files use challenge files as source (#16215) 

* fix(files): CreateFiles shouldn't preserve previous state

* fix(Challenges): Use fileSpec when pulling from storage
pull/16221/head
Berkeley Martinez 2017-12-19 09:41:09 -08:00 committed by Quincy Larson
parent 2b397d7feb
commit e412ce7d0a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/app/files/index.js
View File

@ -45,7 +45,7 @@ export default addNS(
return _.reduce(files, (files, file) => { return _.reduce(files, (files, file) => {
files[file.key] = createPoly(file); files[file.key] = createPoly(file);
return files; return files;
}, { ...state }); }, {});
} }
} }
return state; return state;

8
common/app/routes/Challenges/utils/index.js
View File

@ -81,10 +81,10 @@ export function challengeToFiles(challenge, files) {
const previousWork = !!files; const previousWork = !!files;
files = files || challenge.files || {}; files = files || challenge.files || {};
if (challenge.type === 'modern') { if (challenge.type === 'modern') {
return _.reduce(files, (files, file) => { return _.reduce(challenge.files, (_files, fileSpec) => {
const challengeSpec = _.get(challenge, ['files', file.key]) || {}; const file = _.get(files, fileSpec.key);
files[file.key] = updateFileFromSpec(challengeSpec, file); _files[fileSpec.key] = updateFileFromSpec(fileSpec, file);
return files; return _files;
}, {}); }, {});
} }
if ( if (