| : null} - |
- |
+ + { + hideCheckbox ? null : |
+ |
+ }
MILESTONE | DESCRIPTION | START DATE | @@ -54,6 +56,7 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) { MilestoneHeaderRow.propTypes = { onChangeMilestones: PT.func, + hideCheckbox: PT.bool, } export default MilestoneHeaderRow diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx index 47ebf9e32..93024fb94 100644 --- a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx +++ b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx @@ -45,7 +45,9 @@ function MilestoneRow({ phaseMembers, disableDeleteAction, isCustomer, - isApproving + isApproving, + hideCheckbox, + isInReview }) { const isNeedApproval = milestone.status === PHASE_STATUS_IN_REVIEW const showApproval = isCustomer && isNeedApproval @@ -58,11 +60,12 @@ function MilestoneRow({ let milestoneRef let startDateRef let endDateRef + const tdEl = hideCheckbox ? null :return edit ? ( | |||
|---|---|---|---|---|---|---|---|---|---|---|
| : null} - {isEditingMilestone ? | : | + {(isEditingMilestone || hideCheckbox) ? | : |
| onExpand(!isExpand, milestone)}>{isExpand ? | : }
- {isEditingMilestone ? | : |
+ {(isEditingMilestone || hideCheckbox) ? tdEl : |
|
|
{
@@ -402,6 +405,8 @@ MilestoneRow.propTypes = {
disableDeleteAction: PT.bool,
isCustomer: PT.bool,
members: PT.object,
+ hideCheckbox: PT.bool,
+ isInReview: PT.bool,
}
export default MilestoneRow
diff --git a/src/projects/detail/containers/DashboardContainer.jsx b/src/projects/detail/containers/DashboardContainer.jsx
index e8b42b1f6..d9cbd75ce 100644
--- a/src/projects/detail/containers/DashboardContainer.jsx
+++ b/src/projects/detail/containers/DashboardContainer.jsx
@@ -26,6 +26,7 @@ import {
fireProductDirty,
fireProductDirtyUndo,
deleteProjectPhase,
+ deleteBulkProjectPhase,
expandProjectPhase,
collapseProjectPhase,
collapseAllProjectPhases,
@@ -53,7 +54,6 @@ import { updateProject, fireProjectDirty, fireProjectDirtyUndo, updatePhase, exe
import { addProjectAttachment, updateProjectAttachment, removeProjectAttachment } from '../../actions/projectAttachment'
import ProjectEstimation from '../../create/components/ProjectEstimation'
import CreateSimplePlan from '../components/SimplePlan/CreateSimplePlan'
-import { updatePhaseMembers } from '../../actions/phaseMember'
import {
PHASE_STATUS_ACTIVE,
@@ -94,6 +94,7 @@ class DashboardContainer extends React.Component {
this.onChangeMilestones = this.onChangeMilestones.bind(this)
this.onSaveMilestone = this.onSaveMilestone.bind(this)
this.onRemoveMilestone = this.onRemoveMilestone.bind(this)
+ this.onRemoveAllMilestones = this.onRemoveAllMilestones.bind(this)
this.onGetChallenges = this.onGetChallenges.bind(this)
this.onApproveMilestones = this.onApproveMilestones.bind(this)
}
@@ -188,23 +189,20 @@ class DashboardContainer extends React.Component {
const { createGameplanPhases } = this.state
const index = createGameplanPhases.findIndex(phase => phase.id === id)
const phase = createGameplanPhases[index]
+
- /*
- * @return {Promise} The updated phase members
+ /**
+ * Helper function to get changes in members
*/
- const updatePhaseMembers = (projectId, phaseId) => {
+ const getUpdatedPhaseMembers = () => {
const phaseMembers = _.get(phase, 'members', [])
const oldPhaseMembers = _.get(phase, 'origin.members', [])
- if (phaseMembers.length !== oldPhaseMembers.length ||
- _.differenceBy(phaseMembers, oldPhaseMembers, member => member.userId).length !== 0) {
- return this.props.updatePhaseMembers(
- projectId,
- phaseId,
- phaseMembers.map(member => member.userId)
- ).then(() => phaseMembers) // ignore the result from backend
+ const updatedPhaseMembers =
+ _.differenceBy(phaseMembers, oldPhaseMembers, member => member.userId)
+ if(phaseMembers.length !== oldPhaseMembers.length || updatedPhaseMembers.length !== 0) {
+ return phaseMembers
}
-
- return Promise.resolve(phaseMembers)
+ return null
}
if (`${phase.id}`.startsWith('new-milestone')) {
@@ -217,8 +215,11 @@ class DashboardContainer extends React.Component {
productTemplate.description = phase.description.trim()
}
- const projectId = project.id
- let phaseId
+ const phaseMembers = getUpdatedPhaseMembers()
+ if(phaseMembers !== null) {
+ productTemplate.members = phaseMembers.map(member => member.userId)
+ }
+
createPhaseWithoutTimeline(
project,
productTemplate,
@@ -226,26 +227,13 @@ class DashboardContainer extends React.Component {
moment.utc(phase.startDate),
moment.utc(phase.endDate)
).then(({ action }) => {
- phaseId = action.payload.phase.id
// reload phase
const updatedCreateGameplanPhases = [...this.state.createGameplanPhases]
updatedCreateGameplanPhases.splice(index, 1, {
...action.payload.phase,
selected: phase.selected,
})
- this.setState({ createGameplanPhases: updatedCreateGameplanPhases }, () => {
- updatePhaseMembers(projectId, phaseId)
- .then((members) => {
- // reload members
- const updatedPhases = [...this.state.createGameplanPhases]
- updatedPhases.splice(index, 1, {
- ...updatedPhases[index],
- members
- })
- this.setState({ createGameplanPhases: updatedPhases })
- })
- })
-
+ this.setState({ createGameplanPhases: updatedCreateGameplanPhases })
})
} else {
const updateParam = {
@@ -259,14 +247,16 @@ class DashboardContainer extends React.Component {
updateParam.description = phase.description.trim()
}
- Promise.all([
- updatePhase(
- phase.projectId,
- phase.id,
- updateParam
- ),
- updatePhaseMembers(phase.projectId, phase.id)
- ]).then(([{ action }, members]) => {
+ const phaseMembers = getUpdatedPhaseMembers()
+ if(phaseMembers !== null) {
+ updateParam.members = phaseMembers.map(member => member.userId)
+ }
+
+ updatePhase(
+ phase.projectId,
+ phase.id,
+ updateParam
+ ).then(({ action }) => {
const updatedCreateGameplanPhases = [...this.state.createGameplanPhases]
const idx = updatedCreateGameplanPhases.findIndex(phase => phase.id === action.payload.id)
@@ -275,7 +265,8 @@ class DashboardContainer extends React.Component {
...action.payload,
edit: this.state.createGameplanPhases[idx].edit,
selected: this.state.createGameplanPhases[idx].selected,
- members
+ products: this.state.createGameplanPhases[idx].products,
+ challenges: this.state.createGameplanPhases[idx].challenges,
})
this.setState({ createGameplanPhases: updatedCreateGameplanPhases })
})
@@ -321,6 +312,21 @@ class DashboardContainer extends React.Component {
})
}
+ onRemoveAllMilestones(projectId, phaseIds) {
+ this.props.deleteBulkProjectPhase(
+ projectId,
+ phaseIds
+ ).then(() => {
+ if (!this.state.createGameplanPhases) {
+ return
+ }
+
+ // remove phases
+ const newGameplanPhases = this.state.createGameplanPhases.filter(phase => !phaseIds.includes(phase.id))
+ this.setState({createGameplanPhases: newGameplanPhases})
+ })
+ }
+
render() {
const {
@@ -523,6 +529,7 @@ class DashboardContainer extends React.Component {
onSaveMilestone={this.onSaveMilestone}
onGetChallenges={this.onGetChallenges}
onRemoveMilestone={this.onRemoveMilestone}
+ onRemoveAllMilestones={this.onRemoveAllMilestones}
onApproveMilestones={this.onApproveMilestones}
/>
)
@@ -575,6 +582,7 @@ const mapDispatchToProps = {
updateProductAttachment,
removeProductAttachment,
deleteProjectPhase,
+ deleteBulkProjectPhase,
expandProjectPhase,
collapseProjectPhase,
collapseAllProjectPhases,
@@ -585,7 +593,6 @@ const mapDispatchToProps = {
updateProjectAttachment,
removeProjectAttachment,
updatePhase,
- updatePhaseMembers,
executePhaseApproval,
approveMilestone
}
diff --git a/src/projects/reducers/project.js b/src/projects/reducers/project.js
index d6b11b9f0..b04a79c62 100644
--- a/src/projects/reducers/project.js
+++ b/src/projects/reducers/project.js
@@ -26,7 +26,7 @@ import {
ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING,
UPLOAD_PROJECT_ATTACHMENT_FILES, DISCARD_PROJECT_ATTACHMENT, CHANGE_ATTACHMENT_PERMISSION,
CREATE_SCOPE_CHANGE_REQUEST_SUCCESS, APPROVE_SCOPE_CHANGE_SUCCESS, REJECT_SCOPE_CHANGE_SUCCESS, CANCEL_SCOPE_CHANGE_SUCCESS, ACTIVATE_SCOPE_CHANGE_SUCCESS,
- LOAD_PROJECT_MEMBERS_SUCCESS, LOAD_PROJECT_MEMBER_INVITES_SUCCESS, LOAD_PROJECT_MEMBER_SUCCESS, CREATE_PROJECT_PHASE_PENDING, CREATE_PROJECT_PHASE_SUCCESS, CUSTOMER_APPROVE_MILESTONE_PENDING, CUSTOMER_APPROVE_MILESTONE_FINISHED,
+ LOAD_PROJECT_MEMBERS_SUCCESS, LOAD_PROJECT_MEMBER_INVITES_SUCCESS, LOAD_PROJECT_MEMBER_SUCCESS, CREATE_PROJECT_PHASE_PENDING, CREATE_PROJECT_PHASE_SUCCESS, CUSTOMER_APPROVE_MILESTONE_PENDING, CUSTOMER_APPROVE_MILESTONE_FINISHED, DELETE_BULK_PROJECT_PHASE_PENDING, DELETE_BULK_PROJECT_PHASE_SUCCESS,
} from '../../config/constants'
import _ from 'lodash'
import update from 'react-addons-update'
@@ -519,6 +519,7 @@ export const projectState = function (state=initialState, action) {
case UPDATE_PROJECT_PENDING:
case UPDATE_PHASE_PENDING:
case DELETE_PROJECT_PHASE_PENDING:
+ case DELETE_BULK_PROJECT_PHASE_PENDING:
return Object.assign({}, state, {
isLoading: false,
processing: true,
@@ -562,6 +563,18 @@ export const projectState = function (state=initialState, action) {
})
}
+ case DELETE_BULK_PROJECT_PHASE_SUCCESS: {
+ const { phaseIds } = action.payload
+
+ const newPhases = state.phases.filter(phase => !phaseIds.includes(phase.id))
+
+ return Object.assign({}, state, {
+ phases: newPhases,
+ phasesNonDirty: newPhases,
+ processing: false,
+ })
+ }
+
case UPDATE_PRODUCT_SUCCESS:
return {
...state,
diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js
index da1b345e3..6de87290c 100644
--- a/src/reducers/alerts.js
+++ b/src/reducers/alerts.js
@@ -77,7 +77,8 @@ import {
CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS,
CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS,
CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE,
- CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE
+ CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE,
+ DELETE_BULK_PROJECT_PHASE_SUCCESS
} from '../config/constants'
/* eslint-enable no-unused-vars */
@@ -112,6 +113,16 @@ export default function(state = {}, action) {
return state
}
+ case DELETE_BULK_PROJECT_PHASE_SUCCESS: {
+ if (state.project.version === 'v4') {
+ Alert.success('Project milestones deleted.')
+ } else {
+ Alert.success('Project phases deleted.')
+ }
+
+ return state
+ }
+
case DELETE_PROJECT_SUCCESS:
Alert.success('Project deleted.')
return state
|