FIX SUBMISSION PHASE DISPLAY ON 2 ROUND CHALLENGE

Author: jmgasper

src/components/ChallengeEditor/index.js

@@ -842,6 +842,8 @@ class ChallengeEditor extends Component {
           moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
         if (newChallenge.phases[index].name === 'Submission') {
           newChallenge.phases[index].isStartTimeActive = true
+        } else if (newChallenge.phases[index].name === 'Checkpoint Submission') {
+          newChallenge.phases[index].isStartTimeActive = true
         } else {
           newChallenge.phases[index].isStartTimeActive = index <= 0
         }

src/reducers/challenges.js

@@ -104,6 +104,21 @@ export default function (state = initialState, action) {
     case CREATE_CHALLENGE_FAILURE:
       return { ...state, isLoading: false, attachments: [], challenge: null, failedToLoad: true, errorMessage: _.get(action, 'error.response.data.message', '') }
     case LOAD_CHALLENGE_DETAILS_SUCCESS: {
+      const phases = action.payload.phases
+      const swapPhaseAtIndex = (phaseA, phaseB) => {
+        const phaseAIndex = _.findIndex(phases, { name: phaseA })
+        let phaseBIndex = _.findIndex(phases, { name: phaseB })
+        if (phaseAIndex >= 0 && phaseBIndex >= 0) {
+          const tmp = phases[phaseAIndex]
+          phases.splice(phaseAIndex, 1)
+          phaseBIndex = _.findIndex(phases, { name: phaseB })
+          phases.splice(phaseBIndex, 0, tmp)
+        }
+      }
+      swapPhaseAtIndex('Checkpoint Submission', 'Submission')
+      swapPhaseAtIndex('Checkpoint Screening', 'Submission')
+      swapPhaseAtIndex('Checkpoint Review', 'Submission')
+
       return {
         ...state,
         challengeDetails: { ...action.payload,