fix issues

Author: ThomasKranitsas

src/components/ChallengeEditor/TimelineTemplate-Field/index.js

@@ -19,20 +19,20 @@ class TimelineTemplateField extends Component {
   }
 
   componentDidMount () {
-    const { challengeTimelines, timelineTemplates, challenge } = this.props
-    this.checkData(challengeTimelines, timelineTemplates, challenge)
+    const { challengeTimelines, timelineTemplates, challenge, currentTemplate } = this.props
+    this.checkData(challengeTimelines, timelineTemplates, challenge, currentTemplate)
   }
 
   componentWillUnmount () {
-    this.props.onUpdateSelect(this.state.selectedOption.value, false, 'timelineTemplateId')
+    this.props.onUpdateSelect(this.state.selectedOption.value)
   }
 
   loadSelectedOption (validOptions, value) {
-    // if (!value) return
     const { timelineTemplates, challenge } = this.props
     const selectedOption = {}
     const selectedTemplate = _.find(timelineTemplates, t => t.id === (value))
-    // if (!selectedTemplate) return
+    this.props.onUpdateSelect(selectedTemplate)
+
     selectedOption.label = selectedTemplate.name
     selectedOption.value = selectedTemplate.id
     this.setState({
@@ -42,16 +42,16 @@ class TimelineTemplateField extends Component {
     })
   }
 
-  checkData (challengeTimelines, timelineTemplates, challenge) {
+  checkData (challengeTimelines, timelineTemplates, challenge, currentTemplate) {
     const availableTemplates = _.filter(challengeTimelines, ct => ct.typeId === challenge.typeId && ct.trackId === challenge.trackId)
     const availableTemplateIds = availableTemplates.map(tt => tt.timelineTemplateId)
     const validOptions = _.filter(timelineTemplates, t => _.includes(availableTemplateIds, t.id))
     const defaultValue = _.get(_.find(availableTemplates, t => t.isDefault), 'timelineTemplateId')
-    if (challenge.timelineTemplateId) {
-      if (!_.includes(_.map(validOptions, o => o.id), challenge.timelineTemplateId)) {
+    if (currentTemplate && currentTemplate.id) {
+      if (!_.includes(_.map(validOptions, o => o.id), currentTemplate.id)) {
         this.loadSelectedOption(validOptions, defaultValue)
       } else {
-        this.loadSelectedOption(validOptions, challenge.timelineTemplateId)
+        this.loadSelectedOption(validOptions, currentTemplate.id)
       }
     } else if (defaultValue) {
       return this.loadSelectedOption(validOptions, defaultValue)
@@ -61,7 +61,7 @@ class TimelineTemplateField extends Component {
   getErrorMessage () {
     if (!this.props.challenge.typeId || !this.props.challenge.trackId) {
       return 'Please select a work type and format to enable this field'
-    } else if (this.props.challenge.submitTriggered && !this.props.challenge.timelineTemplateId) {
+    } else if (this.props.challenge.submitTriggered && !this.props.currentTemplate) {
       return 'Timeline template is required field'
     } else if (this.state.validOptions.length === 0) {
       return 'Sorry, there are no available timeline templates for the options you have selected'
@@ -70,10 +70,10 @@ class TimelineTemplateField extends Component {
   }
 
   render () {
-    const { challengeTimelines, timelineTemplates, challenge } = this.props
+    const { challengeTimelines, timelineTemplates, challenge, currentTemplate } = this.props
     const hasSelectedTypeAndTrack = !_.isEmpty(challenge.typeId) && !_.isEmpty(challenge.trackId)
     if ((hasSelectedTypeAndTrack && this.state.validOptions.length === 0) || this.state.matchString !== `${challenge.typeId}-${challenge.trackId}-${this.state.selectedOption.value}`) {
-      this.checkData(challengeTimelines, timelineTemplates, challenge)
+      this.checkData(challengeTimelines, timelineTemplates, challenge, currentTemplate)
     }
     const error = this.getErrorMessage()
     return (
@@ -90,7 +90,6 @@ class TimelineTemplateField extends Component {
               placeholder='Timeline Template'
               isClearable={false}
               onChange={(e) => {
-                this.props.onUpdateSelect(e.value, false, 'timelineTemplateId')
                 this.loadSelectedOption(this.state.validOptions, e.value)
               }}
               isDisabled={this.state.validOptions.length === 0 || this.props.readOnly}
@@ -111,15 +110,17 @@ class TimelineTemplateField extends Component {
 TimelineTemplateField.defaultProps = {
   challengeTimelines: [],
   timelineTemplates: [],
-  readOnly: false
+  readOnly: false,
+  currentTemplate: null
 }
 
 TimelineTemplateField.propTypes = {
   challengeTimelines: PropTypes.arrayOf(PropTypes.shape()).isRequired,
   timelineTemplates: PropTypes.arrayOf(PropTypes.shape()).isRequired,
   challenge: PropTypes.shape().isRequired,
   onUpdateSelect: PropTypes.func.isRequired,
-  readOnly: PropTypes.bool
+  readOnly: PropTypes.bool,
+  currentTemplate: PropTypes.shape()
 }
 
 export default TimelineTemplateField

src/components/ChallengeEditor/index.js

@@ -834,7 +834,7 @@ class ChallengeEditor extends Component {
     const STD_DEV_TIMELINE_TEMPLATE = _.find(timelineTemplates, { name: 'Standard Development' })
     const avlTemplates = this.getAvailableTimelineTemplates()
     // chooses first available timeline template or fallback template for the new challenge
-    const defaultTemplate = avlTemplates && avlTemplates.length > 0 ? avlTemplates[0] : STD_DEV_TIMELINE_TEMPLATE
+    const defaultTemplate = _.find(avlTemplates || [], t => t.isDefault) || STD_DEV_TIMELINE_TEMPLATE
     const isTask = _.find(metadata.challengeTypes, { id: typeId, isTask: true })
     const newChallenge = {
       status: 'New',
@@ -847,7 +847,7 @@ class ChallengeEditor extends Component {
         reviewType: isTask || isDesignChallenge ? REVIEW_TYPES.INTERNAL : REVIEW_TYPES.COMMUNITY
       },
       descriptionFormat: 'markdown',
-      timelineTemplateId: defaultTemplate.id,
+      timelineTemplateId: _.get(this.getCurrentTemplate(), 'id', defaultTemplate.id),
       terms: [{ id: DEFAULT_TERM_UUID, roleId: SUBMITTER_ROLE_UUID }],
       groups: []
       // prizeSets: this.getDefaultPrizeSets()
@@ -1136,8 +1136,9 @@ class ChallengeEditor extends Component {
 
     // all timeline template ids available for the challenge type
     const availableTemplateIds = _.filter(challengeTimelines, ct => ct.typeId === challenge.typeId && ct.trackId === challenge.trackId).map(tt => tt.timelineTemplateId)
+    const defaultChallengeTimeline = _.find(challengeTimelines, ct => ct.isDefault)
     // filter and return timeline templates that are available for this challenge type
-    return _.filter(timelineTemplates, tt => availableTemplateIds.indexOf(tt.id) !== -1)
+    return _.map(_.filter(timelineTemplates, tt => availableTemplateIds.indexOf(tt.id) !== -1), tt => tt.id === defaultChallengeTimeline.timelineTemplateId ? { ...tt, isDefault: true } : tt)
   }
 
   render () {
@@ -1354,7 +1355,13 @@ class ChallengeEditor extends Component {
           <div className={styles.newFormContainer}>
             <TrackField tracks={metadata.challengeTracks} challenge={challenge} onUpdateOthers={this.onUpdateOthers} />
             <TypeField types={metadata.challengeTypes} onUpdateSelect={this.onUpdateSelect} challenge={challenge} />
-            <TimelineTemplateField challengeTimelines={metadata.challengeTimelines} timelineTemplates={metadata.timelineTemplates} challenge={challenge} onUpdateSelect={this.onUpdateSelect} />
+            <TimelineTemplateField
+              currentTemplate={this.state.currentTemplate}
+              challengeTimelines={metadata.challengeTimelines}
+              timelineTemplates={metadata.timelineTemplates}
+              challenge={challenge}
+              onUpdateSelect={this.resetPhase}
+            />
             <ChallengeNameField challenge={challenge} onUpdateInput={this.onUpdateInput} />
           </div>
           { errorContainer }
@@ -1434,7 +1441,13 @@ class ChallengeEditor extends Component {
                 {isBetaMode() && (
                   <UseSchedulingAPIField challenge={challenge} toggleUseSchedulingAPI={this.toggleUseSchedulingAPI} />
                 )}
-                <TimelineTemplateField challengeTimelines={metadata.challengeTimelines} timelineTemplates={metadata.timelineTemplates} challenge={challenge} onUpdateSelect={this.onUpdateSelect} />
+                <TimelineTemplateField
+                  challengeTimelines={metadata.challengeTimelines}
+                  timelineTemplates={metadata.timelineTemplates}
+                  challenge={challenge}
+                  currentTemplate={this.state.currentTemplate}
+                  onUpdateSelect={this.resetPhase}
+                />
               </React.Fragment>
             )}
             {!isTask && (