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

Fix(challenges): do not load beta/comming soon challenges directly

Browse Source
This commit is contained in:
Berkeley Martinez
2016-09-09 13:36:06 -07:00
parent 546572fbe8
commit a4f1722c29
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/services/map.js
View File

@ -8,10 +8,15 @@ const isBeta = !!process.env.BETA;
const challengesRegex = /^(bonfire|waypoint|zipline|basejump|checkpoint)/i; const challengesRegex = /^(bonfire|waypoint|zipline|basejump|checkpoint)/i;
const log = debug('fcc:services:map'); const log = debug('fcc:services:map');
function shouldNotFilterComingSoon({ isComingSoon, isBeta: challengeIsBeta }) { // if challenge is not isComingSoon or isBeta => load
return isDev || // if challenge is commingSoon we are in beta||dev => load
!isComingSoon || // if challenge is beta and we are in beta||dev => load
(isBeta && challengeIsBeta); // else hide
function loadComingSoonOrBetaChallenge({
isComingSoon,
isBeta: challengeIsBeta
}) {
return !(isComingSoon || challengeIsBeta) || isDev || isBeta;
} }
function getFirstChallenge(challengeMap$) { function getFirstChallenge(challengeMap$) {
@ -42,7 +47,7 @@ function getChallengeAndBlock(
if ( if (
!block || !block ||
!challenge || !challenge ||
!shouldNotFilterComingSoon(challenge) !loadComingSoonOrBetaChallenge(challenge)
) { ) {
return getChallengeByDashedName( return getChallengeByDashedName(
challengeDashedName, challengeDashedName,
@ -80,7 +85,7 @@ function getChallengeByDashedName(dashedName, challengeMap$, lang) {
.map(key => challengeMap[key]); .map(key => challengeMap[key]);
}) })
.filter(challenge => { .filter(challenge => {
return shouldNotFilterComingSoon(challenge) && return loadComingSoonOrBetaChallenge(challenge) &&
testChallengeName.test(challenge.name); testChallengeName.test(challenge.name);
}) })
.last({ defaultValue: null }) .last({ defaultValue: null })