Merge pull request #4473 from appirio-tech/feature/milestone-customer-approval

[DEV] Customer Approval

Author: RishiRajSahu

.circleci/config.yml

@@ -188,7 +188,7 @@ workflows:
             - build-dev
           filters: &filters-dev
             branches:
-              only: ['dev', 'feature/new-milestone-concept']
+              only: ['dev', 'feature/milestone-customer-approval']
 
       - deployTest01:
           context : org-global

src/api/projects.js

@@ -78,7 +78,7 @@ export function getProjectPhases(projectId, query = {}) {
   const params = _.mapValues(query, (param) => encodeURIComponent(param))
 
   return axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases`, { params })
-    .then(resp => resp.data)
+    .then(resp => {console.log('resp.data', query, resp.data); return resp.data})
 }
 
 /**
@@ -144,6 +144,21 @@ export function updatePhase(projectId, phaseId, updatedProps, phaseIndex) {
     })
 }
 
+/**
+ * Create phase apprvoal
+ * @param  {integer} projectId    project Id
+ * @param  {integer} phaseId    phase Id
+ * @param  {object} updatedProps updated phase properties
+ * @param  {integer} phaseIndex index of phase in phase list redux store
+ * @return {promise}              created phase approval
+ */
+export function createPhaseApproval(projectId, phaseId, updatedProps, phaseIndex) {
+  return axios.post(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}/approvals`, updatedProps)
+    .then(resp => {
+      return _.extend(resp.data, {phaseIndex})
+    })
+}
+
 /**
  * Update product using patch
  *

src/assets/icons/icon-ui-approve.svg

@@ -318,6 +318,14 @@ export const LOAD_PROJECT_PHASES             = 'LOAD_PROJECT_PHASES'
 export const LOAD_PROJECT_PHASES_PENDING     = 'LOAD_PROJECT_PHASES_PENDING'
 export const LOAD_PROJECT_PHASES_FAILURE     = 'LOAD_PROJECT_PHASES_FAILURE'
 export const LOAD_PROJECT_PHASES_SUCCESS     = 'LOAD_PROJECT_PHASES_SUCCESS'
+export const CUSTOMER_APPROVE_MILESTONE_PENDING      = 'CUSTOMER_APPROVE_MILESTONE_PENDING'
+export const CUSTOMER_APPROVE_MILESTONE_FINISHED      = 'CUSTOMER_APPROVE_MILESTONE_FINISHED'
+export const CUSTOMER_APPROVE_MILESTONE_SUCCESS      = 'CUSTOMER_APPROVE_MILESTONE_SUCCESS'
+export const CUSTOMER_APPROVE_MILESTONE_FAILURE      = 'CUSTOMER_APPROVE_MILESTONE_FAILURE'
+export const CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS      = 'CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS'
+export const CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE      = 'CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE'
+export const CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS      = 'CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS'
+export const CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE      = 'CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE'
 
 export const LOAD_PRODUCT_TIMELINE_WITH_MILESTONES             = 'LOAD_PRODUCT_TIMELINE_WITH_MILESTONES'
 export const LOAD_PRODUCT_TIMELINE_WITH_MILESTONES_PENDING     = 'LOAD_PRODUCT_TIMELINE_WITH_MILESTONES_PENDING'
@@ -617,6 +625,9 @@ export const PHASE_STATUS_COMPLETED = 'completed'
 export const PHASE_STATUS_CANCELLED = 'cancelled'
 export const PHASE_STATUS_PAUSED = 'paused'
 
+export const PHASE_APPROVAL_APPROVE = 'approve'
+export const PHASE_APPROVAL_REJECT = 'reject'
+
 export const PROJECT_STATUS = [
   // {color: 'gray', name: 'Draft', fullName: 'Project is in draft', value: PROJECT_STATUS_DRAFT, order: 2, dropDownOrder: 1 },
   {color: 'gray', name: 'In review', fullName: 'Project is in review', value: PROJECT_STATUS_IN_REVIEW, order: 3, dropDownOrder: 2, isSpecial: true },

src/assets/icons/icon-ui-collapse.svg

@@ -10,6 +10,7 @@ import { getProjectById,
   getProjectPhases,
   updateProduct as updateProductAPI,
   updatePhase as updatePhaseAPI,
+  createPhaseApproval as createPhaseApprovalAPI,
   createProjectPhase,
   createScopeChangeRequest as createScopeChangeRequestAPI,
   updateScopeChangeRequest as updateScopeChangeRequestAPI,
@@ -70,7 +71,15 @@ import {
   CREATE_PROJECT_PHASE_TIMELINE_MILESTONES,
   LOAD_PROJECT_MEMBER,
   ES_REINDEX_DELAY,
-  CREATE_PROJECT_PHASE
+  CREATE_PROJECT_PHASE,
+  CUSTOMER_APPROVE_MILESTONE_SUCCESS,
+  CUSTOMER_APPROVE_MILESTONE_FAILURE,
+  CUSTOMER_APPROVE_MILESTONE_PENDING,
+  CUSTOMER_APPROVE_MILESTONE_FINISHED,
+  CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS,
+  CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE,
+  CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE,
+  CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS
 } from '../../config/constants'
 import {
   updateProductMilestone,
@@ -191,6 +200,7 @@ function getProjectPhasesWithProducts(projectId) {
       'startDate',
       'status',
       'members',
+      'approvals',
       'updatedAt',
       'updatedBy',
     ].join(',')
@@ -506,6 +516,51 @@ export function activateScopeChange(projectId, scopeChangeRequestId) {
 }
 
 
+export function executePhaseApproval(projectId, phaseId, updatedProps, phaseIndex) {
+  console.log('execute update phases 0')
+  return (dispatch, getState) => {
+    console.log('execute update phases')
+    const state = getState()
+    phaseIndex = phaseIndex ? phaseIndex : _.findIndex(state.projectState.phases, { id: phaseId })
+    dispatch({type: CUSTOMER_APPROVE_MILESTONE_PENDING,
+      payload: {phaseId}
+    })
+    return createPhaseApprovalAPI(projectId, phaseId, updatedProps, phaseIndex).then(() => {
+      dispatch({type: CUSTOMER_APPROVE_MILESTONE_FINISHED,
+        payload: {phaseId}
+      })
+    }).catch(() => {
+      dispatch({type: CUSTOMER_APPROVE_MILESTONE_FINISHED,
+        payload: {phaseId}
+      })
+      return Promise.reject(new Error('Fail to approve milestone'))
+    })
+  }
+}
+
+/**
+ * Dispatch alert message after individual or bulk milestone approval
+ *
+ * @param {Boolean} success is milestone updated successfully
+ *
+ * @return {Promise} phase
+ */
+export function approveMilestone(success = true, approvalType) {
+  return (dispatch) => {
+    let type = CUSTOMER_APPROVE_MILESTONE_FAILURE
+    if (success) {
+      if (approvalType === 'approve') type = CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS
+      else if (approvalType === 'reject') type = CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS
+      else type = CUSTOMER_APPROVE_MILESTONE_SUCCESS
+      dispatch({ type })
+    } else {
+      if (approvalType === 'approve') type = CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE
+      else if (approvalType === 'reject') type = CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE
+      dispatch({ type })
+    }
+  }
+}
+
 /**
  * Update phase info
  *

src/assets/icons/icon-ui-reject.svg

@@ -9,6 +9,7 @@ import ManageMilestones from '../ManageMilestones'
 import * as milestoneHelper from '../components/helpers/milestone'
 
 import styles from './CreateSimplePlan.scss'
+import MilestonesApprovalNotification from '../components/MilestonesApprovalNotification'
 
 const createTabs = ({ onClick } ) => ([
   {
@@ -34,10 +35,12 @@ class CreateSimplePlan extends React.Component {
       project,
       // phases,
       milestones,
+      milestonesInApproval,
       onChangeMilestones,
       onSaveMilestone,
       onRemoveMilestone,
       onGetChallenges,
+      onApproveMilestones,
       isProjectLive,
       isCustomer,
     } = this.props
@@ -64,17 +67,22 @@ class CreateSimplePlan extends React.Component {
       <div>
         {/* <ProjectDetailsWidget project={project} phases={phases} /> */}
         <div styleName="milestones-container">
+          {!isCustomer && <MilestonesApprovalNotification milestones={milestones} />}
           <div styleName="tabs-header">
             <GenericMenu navLinks={createTabs(onClickMilestonesTab)} />
           </div>
           <ManageMilestones
             milestones={milestones}
+            milestonesInApproval={milestonesInApproval}
             onGetChallenges={onGetChallenges}
             onChangeMilestones={onChangeMilestones}
             onSaveMilestone={onSaveMilestone}
             onRemoveMilestone={onRemoveMilestone}
+            onApproveMilestones={onApproveMilestones}
             projectMembers={project.members}
+            project={project}
             isUpdatable={isProjectLive && !isCustomer}
+            isCustomer={isCustomer}
           />
         </div>
       </div>
@@ -90,6 +98,7 @@ CreateSimplePlan.propTypes = {
   onSaveMilestone: PT.func,
   onRemoveMilestone: PT.func,
   onGetChallenges: PT.func,
+  onApproveMilestones: PT.func,
   isCustomer: PT.bool,
 }