Merge pull request #2376 from appirio-tech/issue-2361

issue #2361 - Two types of `checkpoint-review` and `final-designs` milestones

Author: vikasrohit

src/projects/actions/productsTimelines.js

@@ -173,6 +173,7 @@ export function completeProductMilestone(productId, timelineId, milestoneId, upd
             details: {
               ...nextMilestone.details,
               prevMilestoneContent: completedMilestone.details.content,
+              prevMilestoneType: completedMilestone.type,
             }
           // always return completedMilestone for COMPLETE_PRODUCT_MILESTONE
           }).then(() => completedMilestone)
@@ -336,9 +337,14 @@ export function completeFinalFixesMilestone(productId, timelineId, milestoneId,
             details: {
               ...nextMilestone.details,
               prevMilestoneContent: completedMilestone.details.content,
+              prevMilestoneType: completedMilestone.type,
             },
             status: MILESTONE_STATUS.COMPLETED,
-          })
+            // always return completedMilestone for COMPLETE_PRODUCT_MILESTONE
+          }).then(() => completedMilestone)
+        } else {
+          // always return completedMilestone for COMPLETE_PRODUCT_MILESTONE
+          return completedMilestone
         }
       })
     ]
@@ -352,7 +358,6 @@ export function completeFinalFixesMilestone(productId, timelineId, milestoneId,
       }
     }).then(() => {
       if (timeline) {
-
         const phaseIndex = _.findIndex(state.projectState.phases, p => p.products[0].id === productId)
         const phase = state.projectState.phases[phaseIndex]
         dispatch(updatePhase(state.projectState.project.id, phase.id, {status: PHASE_STATUS_COMPLETED}, phaseIndex))

src/projects/detail/components/timeline/Milestone/Milestone.jsx

@@ -282,7 +282,7 @@ class Milestone extends React.Component {
             !isUpdating &&
             milestone.type === 'checkpoint-review' &&
             // old type 'checkpoint-review' which let user add links
-            _.get(milestone, 'details.prevMilestoneContent.links[0].type') !== 'marvelapp' &&
+            _.get(milestone, 'details.prevMilestoneType') !== 'add-links' &&
           (
             <MilestoneTypeCheckpointReview
               milestone={milestone}
@@ -297,8 +297,8 @@ class Milestone extends React.Component {
             !isEditing &&
             !isUpdating &&
             milestone.type === 'checkpoint-review' &&
-            // new type 'checkpoint-review' which gets list of links from previous milestone
-            _.get(milestone, 'details.prevMilestoneContent.links[0].type') === 'marvelapp' &&
+            // new type 'checkpoint-review' which gets list of links from previous `add-links` milestone
+            _.get(milestone, 'details.prevMilestoneType') === 'add-links' &&
           (
             <MilestoneTypeCheckpointReviewOnly
               milestone={milestone}
@@ -321,7 +321,7 @@ class Milestone extends React.Component {
 
           {!isEditing && !isUpdating && milestone.type === 'final-designs'  &&
             // old type 'final-designs' which let user add links
-            _.get(milestone, 'details.prevMilestoneContent.links[0].type') !== 'marvelapp' &&
+            _.get(milestone, 'details.prevMilestoneType') !== 'add-links' &&
           (
             <MilestoneTypeFinalDesigns
               milestone={milestone}
@@ -333,8 +333,8 @@ class Milestone extends React.Component {
           )}
 
           {!isEditing && !isUpdating && milestone.type === 'final-designs'  &&
-            // new type 'final-designs' which gets list of links from previous milestone
-            _.get(milestone, 'details.prevMilestoneContent.links[0].type') === 'marvelapp' &&
+            // new type 'final-designs' which gets list of links from previous `add-links` milestone
+            _.get(milestone, 'details.prevMilestoneType') === 'add-links' &&
           (
             <MilestoneTypeFinalDesignsSelectionOnly
               milestone={milestone}