Merge branch 'integration-v5-challenge-api' into issue-4549

Author: narekcat

src/shared/actions/challenge-listing/index.js

@@ -139,6 +139,16 @@ function getAllActiveChallengesDone(uuid, tokenV3) {
   return getAllActiveChallengesWithUsersDone(uuid, tokenV3, filter);
 }
 
+function getAllUserChallengesInit(uuid) {
+  return uuid;
+}
+
+function getAllUserChallengesDone(uuid, tokenV3) {
+  const memberId = decodeToken(tokenV3).userId;
+  const filter = { status: 'Active', memberId };
+  return getAllActiveChallengesWithUsersDone(uuid, tokenV3, filter);
+}
+
 /**
  * Gets 1 page of active challenges (including marathon matches) from the backend.
  * Once this action is completed any active challenges saved to the state before
@@ -316,6 +326,9 @@ export default createActions({
     GET_ALL_ACTIVE_CHALLENGES_INIT: getAllActiveChallengesInit,
     GET_ALL_ACTIVE_CHALLENGES_DONE: getAllActiveChallengesDone,
 
+    GET_ALL_USER_CHALLENGES_INIT: getAllUserChallengesInit,
+    GET_ALL_USER_CHALLENGES_DONE: getAllUserChallengesDone,
+
     GET_ALL_RECOMMENDED_CHALLENGES_INIT: getAllRecommendedChallengesInit,
     GET_ALL_RECOMMENDED_CHALLENGES_DONE: getAllRecommendedChallengesDone,
 

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

@@ -45,18 +45,19 @@ export default function ChallengeCard({
   // unregisterFromChallenge,
 }) {
   const {
-    currentPhases,
+    phases,
     legacy,
     id,
     registrationStartDate,
     status,
-    subTrack,
     userDetails,
   } = challenge;
 
+  const { track } = legacy;
+
   let EventTag;
   // let TrackTag;
-  switch (legacy.track) {
+  switch (track) {
     case 'DATA_SCIENCE':
       EventTag = DataScienceTrackEventTag;
       // TrackTag = DataScienceTrackTag;
@@ -70,6 +71,7 @@ export default function ChallengeCard({
       // TrackTag = DevelopmentTrackTag;
       break;
     default:
+      EventTag = DevelopmentTrackEventTag;
   }
 
   const forumEndpoint = _.toLower(legacy.track) === 'design'
@@ -94,7 +96,7 @@ export default function ChallengeCard({
 
   const submitter = roles.includes('Submitter');
   const submitted = _.get(userDetails, 'hasUserSubmittedForReview');
-  const nextPhase = currentPhases && _.last(currentPhases);
+  const nextPhase = phases && _.last(phases);
 
   const nextPhaseType = _.get(nextPhase, 'phaseType');
 
@@ -158,14 +160,14 @@ export default function ChallengeCard({
             <EventTag
               onClick={
                 () => setImmediate(
-                  () => setChallengeListingFilter({ subtracks: [subTrack] }),
+                  () => setChallengeListingFilter({ subtracks: [track] }),
                 )
               }
               theme={{ button: style.tag }}
               to={`/challenges?filter[subtracks][0]=${
-                encodeURIComponent(subTrack)}`}
+                encodeURIComponent(track)}`}
             >
-              {normalizeSubTrackTagForRendering(challenge.subTrack)}
+              {normalizeSubTrackTagForRendering(track)}
             </EventTag>
             {
               isTco ? (
@@ -280,12 +282,11 @@ ChallengeCard.propTypes = {
     }).isRequired,
     id: PT.oneOfType([PT.number, PT.string]).isRequired,
     name: PT.string.isRequired,
-    currentPhases: PT.any,
+    phases: PT.any,
     registrationStartDate: PT.any,
     status: PT.any,
     userDetails: PT.any,
     events: PT.any,
-    subTrack: PT.string.isRequired,
   }).isRequired,
   selectChallengeDetailsTab: PT.func.isRequired,
   setChallengeListingFilter: PT.func.isRequired,

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

@@ -130,9 +130,13 @@ export default class MyChallenges extends React.Component {
   }
 }
 
+MyChallenges.defaultProps = {
+  challenges: [],
+};
+
 MyChallenges.propTypes = {
   challengeFilter: PT.string.isRequired,
-  challenges: PT.arrayOf(PT.object).isRequired,
+  challenges: PT.arrayOf(PT.object),
   challengesLoading: PT.bool.isRequired,
   communities: PT.arrayOf(PT.object).isRequired,
   communitiesLoading: PT.bool.isRequired,

src/shared/containers/Dashboard/index.jsx

@@ -366,8 +366,8 @@ function mapDispatchToProps(dispatch) {
   return {
     getAllActiveChallenges: (tokenV3) => {
       const uuid = shortId();
-      dispatch(challengeListingActions.challengeListing.getAllActiveChallengesInit(uuid));
-      dispatch(challengeListingActions.challengeListing.getAllActiveChallengesDone(uuid, tokenV3));
+      dispatch(challengeListingActions.challengeListing.getAllUserChallengesInit(uuid));
+      dispatch(challengeListingActions.challengeListing.getAllUserChallengesDone(uuid, tokenV3));
     },
     getCommunityList: (auth) => {
       const uuid = shortId();

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

@@ -843,12 +843,12 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(a.getDetailsDone(challengeId, tokens.tokenV3, tokens.tokenV2))
         .then((res) => {
           const ch = res.payload;
-          if (ch.track === 'DESIGN') {
+          if (ch.legacy.track === 'DESIGN') {
             const p = ch.allPhases || ch.phases || []
               .filter(x => x.name === 'Checkpoint Review');
             if (p.length && !p[0].isOpen) {
               dispatch(a.fetchCheckpointsInit());
-              dispatch(a.fetchCheckpointsDone(tokens.tokenV2, challengeId));
+              dispatch(a.fetchCheckpointsDone(tokens.tokenV2, ch.legacyId));
             } else dispatch(a.dropCheckpoints());
           } else dispatch(a.dropCheckpoints());
           if (ch.status === 'COMPLETED') {
@@ -867,11 +867,11 @@ const mapDispatchToProps = (dispatch) => {
       const a = actions.challenge;
       dispatch(a.getDetailsDone(challengeId, tokens.tokenV3, tokens.tokenV2))
         .then((challengeDetails) => {
-          if (challengeDetails.track === 'DESIGN') {
+          if (challengeDetails.legacy.track === 'DESIGN') {
             const p = challengeDetails.allPhases || challengeDetails.phases || []
               .filter(x => x.name === 'Checkpoint Review');
             if (p.length && !p[0].isOpen) {
-              dispatch(a.fetchCheckpointsDone(tokens.tokenV2, challengeId));
+              dispatch(a.fetchCheckpointsDone(tokens.tokenV2, challengeDetails.legacyId));
             }
           }
           return challengeDetails;

src/shared/reducers/challenge-listing/index.js

@@ -52,6 +52,24 @@ function onGetAllActiveChallengesDone(state, { error, payload }) {
   };
 }
 
+function onGetAllUserChallengesInit(state, { payload }) {
+  return { ...state, loadingActiveChallengesUUID: payload };
+}
+function onGetAllUserChallengesDone(state, { error, payload }) {
+  if (error) {
+    logger.error(payload);
+    return state;
+  }
+  const { challenges } = payload || [];
+
+  return {
+    ...state,
+    challenges,
+    lastUpdateOfActiveChallenges: Date.now(),
+    loadingActiveChallengesUUID: '',
+  };
+}
+
 /**
  * Called when 1st page of ative challenges is loaded from `/challenges` api
  * @param {*} state
@@ -502,6 +520,9 @@ function create(initialState) {
     [a.getAllActiveChallengesInit]: onGetAllActiveChallengesInit,
     [a.getAllActiveChallengesDone]: onGetAllActiveChallengesDone,
 
+    [a.getAllUserChallengesInit]: onGetAllUserChallengesInit,
+    [a.getAllUserChallengesDone]: onGetAllUserChallengesDone,
+
     [a.getAllRecommendedChallengesInit]: onGetAllRecommendedChallengesInit,
     [a.getAllRecommendedChallengesDone]: onGetAllRecommendedChallengesDone,