issue 3210 patch

Author: rashmi73

src/projects/detail/components/PhaseCard/EditStageForm.jsx

@@ -20,6 +20,10 @@ import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'
 import { TOOLTIP_DEFAULT_DELAY } from '../../../../config/constants'
 import { getPhaseActualData } from '../../../../helpers/projectHelper'
 import DeletePhase from './DeletePhase'
+import {
+  ROLE_CONNECT_ADMIN,
+  ROLE_ADMINISTRATOR,
+} from '../../../../../config/constants'
 
 const moment = extendMoment(Moment)
 const phaseStatuses = PHASE_STATUS.map(ps => ({
@@ -33,7 +37,7 @@ class EditStageForm extends React.Component {
 
     this.state = {
       isUpdating: false,
-      isEdittable: _.get(props, 'phase.status') !== PHASE_STATUS_COMPLETED,
+      isEdittable: (_.get(props, 'phase.status') !== PHASE_STATUS_COMPLETED) || (_.get(props, 'isAdmin')),
       disableActiveStatusFields: _.get(props, 'phase.status') !== PHASE_STATUS_ACTIVE,
       showPhaseOverlapWarning: false,
       phaseIsdirty: false,
@@ -399,11 +403,18 @@ EditStageForm.propTypes = {
   phaseIndex: PT.number
 }
 
-const mapStateToProps = ({projectState, productsTimelines}) => ({
-  isUpdating: projectState.processing,
-  phases: projectState.phases,
-  productsTimelines
-})
+const mapStateToProps = ({projectState, productsTimelines, loadUser}) => {
+  const adminRoles = [
+    ROLE_ADMINISTRATOR,
+    ROLE_CONNECT_ADMIN,
+  ]
+  return {
+    isUpdating: projectState.processing,
+    phases: projectState.phases,
+    productsTimelines,
+    isAdmin: _.intersection(loadUser.user.roles, adminRoles).length > 0
+  }
+}
 
 const actionCreators = {
   updatePhaseAction,

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

@@ -260,27 +260,7 @@ class Milestone extends React.Component {
             isRequired: true
           },
           validationError: 'Planned text is required',
-        }, ...( isActualDateEditable && [{
-          label: 'Actual Start date',
-          placeholder: 'Actual Start date',
-          name: 'actualStartDate',
-          value: moment.utc(milestone.actualStartDate).format('YYYY-MM-DD'),
-          type: 'date',
-          validations: {
-            isRequired: true
-          },
-          validationError: 'Actual Start date is required',
-        }]), ...( isCompletionDateEditable && [{
-          label: 'Completion date',
-          placeholder: 'Completion date',
-          name: 'completionDate',
-          value: moment.utc(milestone.completionDate).format('YYYY-MM-DD'),
-          type: 'date',
-          validations: {
-            isRequired: true
-          },
-          validationError: 'Completion date is required',
-        }]), {
+        }, {
           label: 'Active text',
           placeholder: 'Active text',
           name: 'activeText',
@@ -313,7 +293,27 @@ class Milestone extends React.Component {
             isRequired: true
           },
           validationError: 'Completed text is required',
-        }]}
+        }, ...( isActualDateEditable && [{
+          label: 'Actual Start date',
+          placeholder: 'Actual Start date',
+          name: 'actualStartDate',
+          value: moment.utc(milestone.actualStartDate).format('YYYY-MM-DD'),
+          type: 'date',
+          validations: {
+            isRequired: true
+          },
+          validationError: 'Actual Start date is required',
+        }]), ...( isCompletionDateEditable && [{
+          label: 'Completion date',
+          placeholder: 'Completion date',
+          name: 'completionDate',
+          value: moment.utc(milestone.completionDate).format('YYYY-MM-DD'),
+          type: 'date',
+          validations: {
+            isRequired: true
+          },
+          validationError: 'Completion date is required',
+        }])]}
         onCancelClick={this.closeEditForm}
         onSubmit={this.updateMilestoneWithData}
         onChange={this.milestoneEditorChanged}