Date editing fixes

Author: jmgasper

src/components/ChallengeEditor/index.js

@@ -68,6 +68,7 @@ import { isBetaMode } from '../../util/cookie'
 import MilestoneField from './Milestone-Field'
 import DiscussionField from './Discussion-Field'
 import CheckpointPrizesField from './CheckpointPrizes-Field'
+import { canChangeDuration } from '../../util/phase'
 
 const theme = {
   container: styles.modalContainer
@@ -843,8 +844,7 @@ class ChallengeEditor extends Component {
       const is2RoundDesignChallenge = isDesignChallenge && is2RoundChallenge
 
       for (let index = 0; index < phases.length; ++index) {
-        newChallenge.phases[index].isDurationActive =
-          moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
+        newChallenge.phases[index].isDurationActive = canChangeDuration(newChallenge.phases[index])
         if ((newChallenge.phases[index].name === 'Submission' && !is2RoundDesignChallenge) || newChallenge.phases[index].name === 'Checkpoint Submission') {
           newChallenge.phases[index].isStartTimeActive = true
         } else {

src/util/date.js

@@ -4,6 +4,7 @@
 import moment from 'moment'
 import _ from 'lodash'
 import 'moment-duration-format'
+import { canChangeDuration } from './phase'
 
 const HOUR_MS = 60 * 60 * 1000
 const DAY_MS = 24 * HOUR_MS
@@ -120,7 +121,13 @@ export const getRoundFormattedDuration = (duration) => {
 export const convertChallengePhaseFromSecondsToHours = (phases) => {
   if (phases) {
     _.forEach(phases, (p) => {
-      p.duration = Math.floor(p.duration / minuteToSecond)
+      if (canChangeDuration(p)) {
+        p.duration = Math.floor(p.duration / minuteToSecond)
+      } else {
+        // use the same duration display as OR, as long as we aren't changing the fields that should be fine.
+        const duration = moment.duration(moment(p.scheduledEndDate).diff(moment(p.scheduledStartDate)))
+        p.duration = Math.ceil(duration.asMinutes())
+      }
     })
   }
 }

src/util/phase.js

@@ -0,0 +1,8 @@
+import moment from 'moment'
+
+export const canChangeDuration = phase => {
+  if (!phase) {
+    return false
+  }
+  return moment(phase.scheduledEndDate).isAfter()
+}