Merge pull request #4459 from appirio-tech/feature/new-milestone-concept

[DEV] Hide checkboxes for only non new, non edit mode rows in milestone

Author: elkhawajah

src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx

@@ -52,7 +52,7 @@ class ManageMilestones extends React.Component {
 
 
     if (days > 0) {
-      const seletedMilestones = _.filter(milestones, m => m.selected)
+      const seletedMilestones = _.filter(milestones, m => m.selected && !m.edit)
       _.forEach(seletedMilestones, m => {
         m.startDate = moment(m.startDate).add(days, 'days')
         m.endDate = moment(m.endDate).add(days, 'days')
@@ -215,7 +215,7 @@ class ManageMilestones extends React.Component {
   }
   getSelectCount() {
     const { milestones } = this.props
-    const seletedMilestones = _.filter(milestones, m => m.selected)
+    const seletedMilestones = _.filter(milestones, m => m.selected && !m.edit)
     return seletedMilestones.length
   }
 
@@ -247,7 +247,6 @@ class ManageMilestones extends React.Component {
       isUpdatable,
     } = this.props
 
-    const isEditingMilestone = !!_.find(milestones, m => m.edit)
     const canEdit = isUpdatable && this.getSelectCount() > 0
     return (
       <div>
@@ -287,7 +286,6 @@ class ManageMilestones extends React.Component {
             <table styleName="milestones-table">
               <thead>
                 <MilestoneHeaderRow
-                  isEditingMilestone={isEditingMilestone}
                   milestones={milestones}
                   onChangeMilestones={onChangeMilestones}
                   isUpdatable={isUpdatable}
@@ -297,7 +295,7 @@ class ManageMilestones extends React.Component {
                 {milestones.map((milestone) => (
                   [
                     <MilestoneRow
-                      isEditingMilestone={isEditingMilestone}
+                      isEditingMilestone={!!milestone.edit}
                       milestone={milestone}
                       key={milestone.id}
                       rowId={`${milestone.id}`}

src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx

@@ -9,7 +9,7 @@ import './MilestoneHeaderRow.scss'
 
 const TCFormFields = FormsyForm.Fields
 
-function MilestoneHeaderRow ({ isEditingMilestone, milestones, onChangeMilestones, isUpdatable }) {
+function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
   const checked = milestones.reduce(
     (selected, milestone) => selected = selected && milestone.selected,
     milestones.length > 0
@@ -32,15 +32,15 @@ function MilestoneHeaderRow ({ isEditingMilestone, milestones, onChangeMilestone
   return (
     <tr styleName="milestone-row">
       {isUpdatable ? <th />: null}
-      {isEditingMilestone? <th /> :<th>
+      <th>
         <TCFormFields.Checkbox
           name="select-all"
           value={checked}
           onChange={(_, value) => {
             value ? selectAll() : unselectAll()
           }}
         />
-      </th>}
+      </th>
       <th>MILESTONE</th>
       <th>DESCRIPTION</th>
       <th>START DATE</th>
@@ -54,7 +54,6 @@ function MilestoneHeaderRow ({ isEditingMilestone, milestones, onChangeMilestone
 
 MilestoneHeaderRow.propTypes = {
   onChangeMilestones: PT.func,
-  isEditingMilestone: PT.bool,
 }
 
 export default MilestoneHeaderRow