Merge pull request #671 from topcoder-platform/feature/github-666-out-of-order-phases-edit-mode

fix: Github issue#666, Standard Design "Edit" Event Sequence Out of Order

Author: vikasrohit

src/services/challenges.js

@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import qs from 'qs'
 import { axiosInstance } from './axiosWithAuth'
-import { updateChallengePhaseBeforeSendRequest, convertChallengePhaseFromSecondsToHours } from '../util/date'
+import { updateChallengePhaseBeforeSendRequest, convertChallengePhaseFromSecondsToHours, sortChallengePhases } from '../util/date'
 import FormData from 'form-data'
 const {
   CHALLENGE_API_URL,
@@ -88,6 +88,7 @@ export async function fetchChallenge (challengeId) {
     }
   }
   convertChallengePhaseFromSecondsToHours(newResponse.phases)
+  newResponse.phases = sortChallengePhases(newResponse.phases)
   return newResponse
 }
 

src/util/date.js

@@ -56,6 +56,15 @@ export const convertChallengePhaseFromSecondsToHours = (phases) => {
   }
 }
 
+/**
+ * Sorts the challenge phases in order of their supposed execution
+ *
+ * @param {Array} phases challenge phases that are to be sorte3d
+ */
+export const sortChallengePhases = (phases) => {
+  return _.sortBy(phases, phase => phase.actualStartDate || phase.scheduledStartDate)
+}
+
 /**
  * Convert challenge phase from hours to second and remove unnessesary field
  * @param {Object} challengeDetail challenge detail