Merge branch 'develop' of github.com:topcoder-platform/work-manager into develop

# Conflicts:
#	src/components/ChallengeEditor/index.js

Author: jmgasper

src/components/ChallengeEditor/ChallengeView/index.js

@@ -207,7 +207,7 @@ const ChallengeView = ({
               </>
             )}
             {
-              phases.map((phase, index) => (
+              _.sortBy(phases, ['scheduledEndDate']).map((phase, index) => (
                 <PhaseInput
                   phase={phase}
                   phaseIndex={index}

src/components/ChallengeEditor/index.js

@@ -103,7 +103,8 @@ class ChallengeEditor extends Component {
       // NOTE that we have to keep `assignedMemberDetails` in the local state, rather than just get it from the props
       // because we can update it locally when we choose another assigned user, so we don't have to wait for user details
       // to be loaded from Member Service as we already know it in such case
-      assignedMemberDetails: this.props.assignedMemberDetails
+      assignedMemberDetails: this.props.assignedMemberDetails,
+      isPhaseChange: false
     }
     this.onUpdateInput = this.onUpdateInput.bind(this)
     this.onUpdateSelect = this.onUpdateSelect.bind(this)
@@ -839,7 +840,11 @@ class ChallengeEditor extends Component {
       for (let index = 0; index < phases.length; ++index) {
         newChallenge.phases[index].isDurationActive =
           moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
-        newChallenge.phases[index].isStartTimeActive = true
+        if (newChallenge.phases[index].name === 'Submission') {
+          newChallenge.phases[index].isStartTimeActive = true
+        } else {
+          newChallenge.phases[index].isStartTimeActive = index <= 0
+        }
         newChallenge.phases[index].isOpen =
           newChallenge.phases[index].isDurationActive
       }
@@ -861,8 +866,8 @@ class ChallengeEditor extends Component {
           .format('MM/DD/YYYY HH:mm')
     } else {
       newChallenge.phases[index]['duration'] = phase.duration
-      newChallenge.phases[index]['scheduledStartDate'] = phase.startDate
-      newChallenge.phases[index]['scheduledEndDate'] = phase.endDate
+      newChallenge.phases[index]['scheduledStartDate'] = moment(phase.startDate).toISOString()
+      newChallenge.phases[index]['scheduledEndDate'] = moment(phase.endDate).toISOString()
     }
 
     for (let phaseIndex = index + 1; phaseIndex < phases.length; ++phaseIndex) {
@@ -882,7 +887,9 @@ class ChallengeEditor extends Component {
           .add(newChallenge.phases[phaseIndex]['duration'], 'hours')
           .format('MM/DD/YYYY HH:mm')
     }
-
+    if (!_.isEqual(newChallenge.phases[index], phases[index])) {
+      this.setState({ isPhaseChange: true })
+    }
     this.setState({ challenge: newChallenge })
 
     setTimeout(() => {
@@ -891,6 +898,7 @@ class ChallengeEditor extends Component {
   }
 
   collectChallengeData (status) {
+    const { isPhaseChange } = this.state
     const { attachments, metadata } = this.props
     const challenge = pick([
       'phases',
@@ -938,6 +946,7 @@ class ChallengeEditor extends Component {
     if (challenge.terms && challenge.terms.length === 0) delete challenge.terms
     delete challenge.attachments
     delete challenge.reviewType
+    if (!isPhaseChange) delete challenge.phases
     return _.cloneDeep(challenge)
   }
 

src/util/tc.js

@@ -156,6 +156,9 @@ export const checkAllowedRoles = roles =>
  */
 export const checkReadOnlyRoles = token => {
   const roles = _.get(decodeToken(token), 'roles')
+  if (checkAllowedRoles(roles)) {
+    return false
+  }
   return roles.some(val => READ_ONLY_ROLES.indexOf(val.toLowerCase()) > -1)
 }