Merge pull request #24 from topcoder-platform/integration-v5-challenge-api

Integration v5 challenge api

Author: PrakashDurlabhji

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

@@ -66,6 +66,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
       "currentPhases": Array [
         "Registration",
       ],
+      "events": Array [],
       "id": "1",
       "legacy": Object {
         "track": "DATA_SCIENCE",
@@ -109,6 +110,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
       "currentPhases": Array [
         "Registration",
       ],
+      "events": Array [],
       "id": "long id",
       "legacy": Object {
         "track": "DATA_SCIENCE",

__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx

@@ -56,6 +56,7 @@ const mockData2 = {
     id: '1',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -76,6 +77,7 @@ const mockData3 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -96,6 +98,7 @@ const mockData4 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -116,6 +119,7 @@ const mockData5 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 

src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx

@@ -77,7 +77,7 @@ export default function ChallengeCard({
     : `/?module=Category&categoryID=${legacy.forumId}`;
 
   const isTco = challenge.events
-  && challenge.events.find(x => x.eventName.match(/tco\d{2}/));
+  && challenge.events.find(x => x.eventName && x.eventName.match(/tco\d{2}/));
 
   const roles = _.get(userDetails, 'roles') || [];
 

src/shared/components/challenge-detail/Header/index.jsx

@@ -66,8 +66,6 @@ export default function ChallengeHeader(props) {
     events,
     legacy,
     prizeSets,
-    numberOfCheckpointsPrizes,
-    topCheckPointPrize,
     reliabilityBonus,
     userDetails,
     numRegistrants,
@@ -83,6 +81,14 @@ export default function ChallengeHeader(props) {
   const { prizes } = prizeSets && prizeSets.length ? prizeSets[0] : [];
   const status = allPhases.length ? allPhases[0].name : '';
 
+  const checkpointPrizes = _.find(prizeSets, { type: 'checkpoint' });
+  let numberOfCheckpointsPrizes = 0;
+  let topCheckPointPrize = 0;
+  if (!_.isEmpty(checkpointPrizes)) {
+    numberOfCheckpointsPrizes = checkpointPrizes.prizes.length;
+    topCheckPointPrize = checkpointPrizes.prizes[0].value;
+  }
+
   const phases = {};
   if (allPhases) {
     allPhases.forEach((phase) => {
@@ -483,8 +489,6 @@ ChallengeHeader.propTypes = {
     legacy: PT.shape({
       track: PT.any,
     }),
-    numberOfCheckpointsPrizes: PT.any,
-    topCheckPointPrize: PT.any,
     reliabilityBonus: PT.any,
     userDetails: PT.any,
     currentPhases: PT.any,

src/shared/components/challenge-detail/RecommendedActiveChallenges/ChallengesCard/index.jsx

@@ -65,7 +65,7 @@ export default function ChallengesCard({
                 <TrackIcon
                   track={track}
                   subTrack={challenge.subTrack}
-                  tcoEligible={challenge.events ? challenge.events[0].eventName : ''}
+                  tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
                   isDataScience={challenge.isDataScience}
                   challengesUrl={challengesUrl}
                 />

src/shared/components/challenge-listing/ChallengeCard/index.jsx

@@ -71,7 +71,7 @@ function ChallengeCard({
               <TrackIcon
                 track={track}
                 subTrack={subTrack}
-                tcoEligible={challenge.events ? challenge.events[0].eventName : ''}
+                tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
                 isDataScience={challenge.isDataScience}
               />
             </span>

src/shared/containers/challenge-detail/index.jsx

@@ -166,7 +166,6 @@ class ChallengeDetailPageContainer extends React.Component {
       reviewTypes,
       getAllCountries,
       getReviewTypes,
-      history,
     } = this.props;
 
     if (
@@ -192,7 +191,7 @@ class ChallengeDetailPageContainer extends React.Component {
       && !challenge.fetchedWithAuth)
 
     ) {
-      loadChallengeDetails(auth, challengeId, history);
+      loadChallengeDetails(auth, challengeId);
     }
 
     if (!allCountries.length) {
@@ -219,8 +218,14 @@ class ChallengeDetailPageContainer extends React.Component {
       auth,
       challenge,
       loadingRecommendedChallengesUUID,
+      history,
     } = this.props;
 
+    if (challenge.isLegacyChallenge && !history.location.pathname.includes(challenge.id)) {
+      history.location.pathname = `/challenges/${challenge.id}`; // eslint-disable-line no-param-reassign
+      history.push(history.location.pathname, history.state);
+    }
+
     const recommendedTechnology = getRecommendedTags(challenge);
     if (
       challenge
@@ -843,15 +848,12 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(lookupActions.getReviewTypesInit());
       dispatch(lookupActions.getReviewTypesDone(tokenV3));
     },
-    loadChallengeDetails: (tokens, challengeId, history) => {
+    loadChallengeDetails: (tokens, challengeId) => {
       const a = actions.challenge;
       dispatch(a.getDetailsInit(challengeId));
       dispatch(a.getDetailsDone(challengeId, tokens.tokenV3, tokens.tokenV2))
         .then((res) => {
           const ch = res.payload;
-          if (ch.isLegacyChallenge) {
-            history.location.pathname = `/challenges/${ch.id}`; // eslint-disable-line no-param-reassign
-          }
           if (ch.track === 'DESIGN') {
             const p = ch.allPhases || ch.phases || []
               .filter(x => x.name === 'Checkpoint Review');