Merge pull request #4510 from appirio-tech/dev

RishiRajSahu · web-flow · commit fd19f8dcdee9 · 2021-09-29T15:13:52.000+05:30
[PROD] Bug Fixes for Milestone Management Project
diff --git a/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts b/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts
@@ -84,7 +84,8 @@ export class ProjectsPageObject {
     await CommonHelper.fillInputField(searchInput, inputText);
     await this.searchButton.click();
 
-    await BrowserHelper.sleep(2000);
+    await BrowserHelper.sleep(4000);
+ 
   }
 
   /**
diff --git a/connect-automation/page-objects/project-milestone/project-milestone.helper.ts b/connect-automation/page-objects/project-milestone/project-milestone.helper.ts
@@ -347,9 +347,11 @@ export class ProjectMilestonePageHelper {
 		await this.projectMilestonePageObject.yesButton.click();
 		logger.info('Clicked Yes button');
 
-		const milestoneDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
-		expect(milestoneDeletionMessage).toEqual(projectMilestones.milestoneDeletionMessage);
-		logger.info(`Verified Delete Milestone Message ${milestoneDeletionMessage}`);
+
+		const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
+		expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage);
+		logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`);
+
 	}
 
 	/**
@@ -438,9 +440,11 @@ export class ProjectMilestonePageHelper {
 			await this.projectMilestonePageObject.yesButton.click();
 			logger.info('Clicked Yes button');
 
-			const milestoneDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
-			expect(milestoneDeletionMessage).toEqual(projectMilestones.milestoneDeletionMessage);
-			logger.info(`Verified Delete Milestone Message ${milestoneDeletionMessage}`);
+
+			const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
+			expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage);
+			logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`);
+
 
 			await BrowserHelper.waitUntilClickableOf(
 				this.projectMilestonePageObject.getAddButton(),
diff --git a/connect-automation/page-objects/project-milestone/project-milestone.model.ts b/connect-automation/page-objects/project-milestone/project-milestone.model.ts
@@ -7,6 +7,8 @@ export interface IProjectMilestone {
     deleteConfirmation: string;
     deletePopupMessage: string;
     milestoneDeletionMessage: string;
+
+    milestoneBulkDeletionMessage: string;
     copilot: string;
     copilotName: string;
     moveMilestoneDatesTitle: string;
diff --git a/connect-automation/page-objects/project-settings/project-settings.helper.ts b/connect-automation/page-objects/project-settings/project-settings.helper.ts
@@ -425,7 +425,7 @@ export class ProjectSettingsPageHelper {
 	public static async specifyUploadFilePathAndClickUploadButton() {
 		// Specify the File Upload Path
 		const fileToUploadElement = this.projectSettingsPageObject.selectFileToUploadButton;
-		const fileToUpload = '../../sample.pdf';
+		const fileToUpload = '../../../sample.pdf';
 		let absolutePath = path.resolve(__dirname, fileToUpload);
 		absolutePath = absolutePath.replace('/temp/', '/');
 		await fileToUploadElement.sendKeys(absolutePath);
diff --git a/connect-automation/test-data/test-data.json b/connect-automation/test-data/test-data.json
@@ -83,6 +83,8 @@
         "deleteConfirmation": "Deletion Confirmation",
         "deletePopupMessage": "Are you sure you want to delete the selected Milestone (s)?",
         "milestoneDeletionMessage": "PROJECT MILESTONE DELETED.",
+
+        "milestoneBulkDeletionMessage": "PROJECT MILESTONES DELETED.",
         "copilot": "Copilot",
         "copilotName": "TCConnCopilot",
         "moveMilestoneDatesTitle": "Move Milestone Dates",
@@ -94,6 +96,8 @@
         "inReview": "In Review",
         "actionOnMilestoneApprove": "approve",
         "milestoneApprovedMessageStr": "APPROVED MILESTONES SUCCESSFULLY.",
-        "allMilestoneApprovedNotificationStr": "All the milestone(s) has been approved by the customer"
+
+        "allMilestoneApprovedNotificationStr": "The following milestone(s) has been approved"
+
     }
 }
diff --git a/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts b/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts
@@ -35,6 +35,8 @@ describe('Connect App - Create New Milestone Tests:', () => {
 
   it('[TC_003] Should verify user can bulk update the milestone.', async () => {
     await ProjectMilestonePageHelper.deleteAllMilestones(testData.projectMilestone);
+
+    await CommonHelper.waitForAddNewMilestones();
     const milestoneNames = await ProjectMilestonePageHelper.addMilestones(testData.projectMilestone, 2, testData.projectMilestone.active);
     await ProjectMilestonePageHelper.verifyUserCanBulkUpdateTheMilestone(testData.projectMilestone);
   });
diff --git a/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts b/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts
@@ -1,3 +1,4 @@
+import { BrowserHelper } from 'topcoder-testing-lib';
 import { CommonHelper } from '../../page-objects/common-page/common.helper';
 import { ProjectSettingsPageHelper } from '../../page-objects/project-settings/project-settings.helper'
 import * as testData from '../../test-data/test-data.json';
@@ -42,18 +43,21 @@ describe('Connect App - Project Settings Tests:', () => {
 
   it('[TC_003] Should verify user can Add/Edit/Delete/Download Files', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
+    await BrowserHelper.sleep(5000);
     await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadFiles(testData.projectSettings);
   });
 
   it('[TC_004] Should verify user can Add/Edit/Delete/Download Links', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
+    await BrowserHelper.sleep(5000);
     await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadLinks(testData.projectSettings);
   });
 
   it('[TC_005] Should verify user can Add Message with Files Attachment', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
+    await BrowserHelper.sleep(5000);
     await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddMessageWithFileAttachment(testData.projectSettings);
   });
diff --git a/src/api/projects.js b/src/api/projects.js
@@ -223,3 +223,8 @@ export function deleteProjectPhase(projectId, phaseId) {
   return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}`)
     .then(() => ({ projectId, phaseId }))
 }
+
+export function deleteBulkProjectPhase(projectId, phaseIds) {
+  return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases`, { data: { phaseIds } })
+    .then(() => ({ phaseIds }))
+}
diff --git a/src/config/constants.js b/src/config/constants.js
@@ -300,6 +300,11 @@ export const DELETE_PROJECT_PHASE_PENDING     = 'DELETE_PROJECT_PHASE_PENDING'
 export const DELETE_PROJECT_PHASE_FAILURE     = 'DELETE_PROJECT_PHASE_FAILURE'
 export const DELETE_PROJECT_PHASE_SUCCESS     = 'DELETE_PROJECT_PHASE_SUCCESS'
 
+export const DELETE_BULK_PROJECT_PHASE             = 'DELETE_BULK_PROJECT_PHASE'
+export const DELETE_BULK_PROJECT_PHASE_PENDING     = 'DELETE_BULK_PROJECT_PHASE_PENDING'
+export const DELETE_BULK_PROJECT_PHASE_FAILURE     = 'DELETE_BULK_PROJECT_PHASE_FAILURE'
+export const DELETE_BULK_PROJECT_PHASE_SUCCESS     = 'DELETE_BULK_PROJECT_PHASE_SUCCESS'
+
 export const UPDATE_PRODUCT           = 'UPDATE_PRODUCT'
 export const UPDATE_PRODUCT_PENDING   = 'UPDATE_PRODUCT_PENDING'
 export const UPDATE_PRODUCT_SUCCESS   = 'UPDATE_PRODUCT_SUCCESS'
diff --git a/src/config/permissions.js b/src/config/permissions.js
@@ -249,7 +249,7 @@ export const PERMISSIONS = {
       description: 'Remove copilots form the project.',
     },
     projectRoles: [
-      ..._.difference(PROJECT_ALL, [PROJECT_ROLE_COPILOT, PROJECT_ROLE_CUSTOMER])
+      ..._.difference(PROJECT_ALL, [PROJECT_ROLE_CUSTOMER])
     ],
     topcoderRoles: [
       ...TOPCODER_ADMINS,
diff --git a/src/projects/actions/project.js b/src/projects/actions/project.js
@@ -7,6 +7,7 @@ import { getProjectById,
   updateProject as updateProjectAPI,
   deleteProject as deleteProjectAPI,
   deleteProjectPhase as deleteProjectPhaseAPI,
+  deleteBulkProjectPhase as deleteBulkProjectPhaseAPI,
   getProjectPhases,
   updateProduct as updateProductAPI,
   updatePhase as updatePhaseAPI,
@@ -79,7 +80,8 @@ import {
   CUSTOMER_APPROVE_MILESTONE_APPROVE_SUCCESS,
   CUSTOMER_APPROVE_MILESTONE_REJECT_FAILURE,
   CUSTOMER_APPROVE_MILESTONE_APPROVE_FAILURE,
-  CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS
+  CUSTOMER_APPROVE_MILESTONE_REJECT_SUCCESS,
+  DELETE_BULK_PROJECT_PHASE
 } from '../../config/constants'
 import {
   updateProductMilestone,
@@ -334,6 +336,11 @@ export function createProjectPhaseAndProduct(project, productTemplate, status =
     description: productTemplate.description,
     productTemplateId: productTemplate.id,
   }
+  
+  if(productTemplate.members) {
+    param.members = productTemplate.members
+  }
+
   if (startDate) {
     param['startDate'] = startDate.format('YYYY-MM-DD')
   }
@@ -441,6 +448,15 @@ export function deleteProjectPhase(projectId, phaseId) {
   }
 }
 
+export function deleteBulkProjectPhase(projectId, phaseIds) {
+  return (dispatch) => {
+    return dispatch({
+      type: DELETE_BULK_PROJECT_PHASE,
+      payload: deleteBulkProjectPhaseAPI(projectId, phaseIds)
+    })
+  }
+}
+
 export function updateProject(projectId, updatedProps, updateExisting = false) {
   return (dispatch) => {
     return dispatch({
diff --git a/src/projects/detail/components/SimplePlan/CreateSimplePlan/CreateSimplePlan.jsx b/src/projects/detail/components/SimplePlan/CreateSimplePlan/CreateSimplePlan.jsx
@@ -10,6 +10,7 @@ import * as milestoneHelper from '../components/helpers/milestone'
 
 import styles from './CreateSimplePlan.scss'
 import MilestonesApprovalNotification from '../components/MilestonesApprovalNotification'
+import { PHASE_STATUS_IN_REVIEW } from '../../../../../config/constants'
 
 const createTabs = ({ onClick } ) => ([
   {
@@ -39,13 +40,18 @@ class CreateSimplePlan extends React.Component {
       onChangeMilestones,
       onSaveMilestone,
       onRemoveMilestone,
+      onRemoveAllMilestones,
       onGetChallenges,
       onApproveMilestones,
       isProjectLive,
       isCustomer,
     } = this.props
     const onClickMilestonesTab = () => {}
 
+    const isInReview =
+      isCustomer ?  (milestones.filter( x => x.status === PHASE_STATUS_IN_REVIEW).length > 0 && isProjectLive)
+        : isProjectLive
+
     if (milestones.length === 0) {
       return isCustomer ? null : (
         <div styleName="add-new-milestone">
@@ -78,10 +84,12 @@ class CreateSimplePlan extends React.Component {
             onChangeMilestones={onChangeMilestones}
             onSaveMilestone={onSaveMilestone}
             onRemoveMilestone={onRemoveMilestone}
+            onRemoveAllMilestones={onRemoveAllMilestones}
             onApproveMilestones={onApproveMilestones}
             projectMembers={project.members}
             project={project}
             isUpdatable={isProjectLive && !isCustomer}
+            isInReview={isInReview}
             isCustomer={isCustomer}
           />
         </div>
@@ -97,6 +105,7 @@ CreateSimplePlan.propTypes = {
   onChangeMilestones: PT.func,
   onSaveMilestone: PT.func,
   onRemoveMilestone: PT.func,
+  onRemoveAllMilestones: PT.func,
   onGetChallenges: PT.func,
   onApproveMilestones: PT.func,
   isCustomer: PT.bool,
diff --git a/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx b/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
@@ -16,7 +16,7 @@ import MilestoneMoveDateButton from '../components/MilestoneMoveDateButton'
 import * as milestoneHelper from '../components/helpers/milestone'
 import IconUnselect from '../../../../../assets/icons/icon-disselect.svg'
 import IconCopilot from '../../../../../assets/icons/icon-copilot.svg'
-import { CHALLENGE_ID_MAPPING, PHASE_STATUS_IN_REVIEW } from '../../../../../config/constants'
+import { CHALLENGE_ID_MAPPING, PHASE_STATUS_IN_REVIEW, PROJECT_STATUS_CANCELLED, PROJECT_STATUS_COMPLETED } from '../../../../../config/constants'
 
 import './ManageMilestones.scss'
 import MilestoneApprovalButton from '../components/MilestoneApprovalButton'
@@ -84,11 +84,14 @@ class ManageMilestones extends React.Component {
   }
 
   onDeleteAll() {
-    const { milestones, onRemoveMilestone } = this.props
-    const seletedMilestones = _.filter(milestones, m => m.selected)
-    _.forEach(seletedMilestones, m => {
-      onRemoveMilestone(m.id)
-    })
+    const { milestones, onRemoveAllMilestones } = this.props
+    const selectedPhases = _.filter(milestones, m => m.selected)
+
+    if (selectedPhases.length) {
+      const { projectId } = selectedPhases[0]
+      const phaseIds = selectedPhases.map(m => m.id)
+      onRemoveAllMilestones(projectId, phaseIds)
+    }
   }
 
   onUnselectAll() {
@@ -256,8 +259,12 @@ class ManageMilestones extends React.Component {
       onChangeMilestones,
       isUpdatable,
       isCustomer,
+      isInReview,
+      project,
     } = this.props
 
+    const hideCheckbox = project.status === PROJECT_STATUS_CANCELLED || project.status === PROJECT_STATUS_COMPLETED
+
     // const isNeedApproval = project.status === PROJECT_STATUS_IN_REVIEW
     const isNeedApproval = !milestones.filter(ms => ms.selected === true).find(ms => !(ms.status === PHASE_STATUS_IN_REVIEW))
     const canShowApproval = isCustomer && isNeedApproval
@@ -325,20 +332,21 @@ class ManageMilestones extends React.Component {
             <table styleName="milestones-table">
               <colgroup>
                 <col style={{ width: '20px' }} />
-                <col style={{ width: '20px' }} />{/* CHECKBOX */}
+                {hideCheckbox ? null : <col style={{ width: '20px' }} />}{/* CHECKBOX */}
                 <col style={{ width: '8%' }} />{/* MILESTONE */}
                 <col />{/* DESCRIPTION */}
                 <col style={{ width: '12%' }} />{/* START DATE */}
                 <col style={{ width: '11%' }} />{/* END DATE */}
                 <col style={{ width: '10%' }} />{/* STATUS */}
                 <col style={{ width: '13%' }} />{/* COPILOTS */}
-                {(isUpdatable || isCustomer) && (<col style={{ width: '64px' }} />)}{/* ACTION */}
+                {(isUpdatable || isInReview) && (<col style={{ width: '64px' }} />)}{/* ACTION */}
               </colgroup>
               <thead>
                 <MilestoneHeaderRow
                   milestones={milestones}
                   onChangeMilestones={onChangeMilestones}
-                  isUpdatable={isUpdatable || isCustomer}
+                  isUpdatable={isUpdatable || isInReview}
+                  hideCheckbox={hideCheckbox}
                 />
               </thead>
               <tbody>
@@ -365,6 +373,8 @@ class ManageMilestones extends React.Component {
                       onApprove={this.onApprove}
                       phaseMembers={milestone.members}
                       isApproving={milestonesInApproval.indexOf(milestone.id) !== -1}
+                      hideCheckbox={hideCheckbox}
+                      isInReview={isInReview}
                     />,
                     ...this.renderChallengeTable(milestone)
                   ]
@@ -383,11 +393,13 @@ ManageMilestones.propTypes = {
   onChangeMilestones: PT.func,
   onSaveMilestone: PT.func,
   onRemoveMilestone: PT.func,
+  onRemoveAllMilestones: PT.func,
   onGetChallenges: PT.func,
   onApproveMilestones: PT.func,
   projectMembers: PT.arrayOf(PT.shape()),
   isUpdatable: PT.bool,
   isCustomer: PT.bool,
+  isInReview: PT.bool,
   project: PT.shape()
 }
 
diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx b/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
@@ -9,7 +9,7 @@ import './MilestoneHeaderRow.scss'
 
 const TCFormFields = FormsyForm.Fields
 
-function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
+function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable, hideCheckbox }) {
   const checked = milestones.reduce(
     (selected, milestone) => selected = selected && milestone.selected,
     milestones.length > 0
@@ -31,16 +31,18 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
 
   return (
     <tr styleName="milestone-row">
-      {isUpdatable ? <th />: null}
-      <th>
-        <TCFormFields.Checkbox
-          name="select-all"
-          value={checked}
-          onChange={(_, value) => {
-            value ? selectAll() : unselectAll()
-          }}
-        />
-      </th>
+      <th />
+      {
+        hideCheckbox ? null : <th>
+          <TCFormFields.Checkbox
+            name="select-all"
+            value={checked}
+            onChange={(_, value) => {
+              value ? selectAll() : unselectAll()
+            }}
+          />
+        </th>
+      }
       <th>MILESTONE</th>
       <th>DESCRIPTION</th>
       <th>START DATE</th>
@@ -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
diff --git a/src/projects/detail/containers/DashboardContainer.jsx b/src/projects/detail/containers/DashboardContainer.jsx
diff --git a/src/projects/reducers/project.js b/src/projects/reducers/project.js
diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ export class ProjectsPageObject {`
`84`	`84`	`await CommonHelper.fillInputField(searchInput, inputText);`
`85`	`85`	`await this.searchButton.click();`
`86`	`86`
`87`		`- await BrowserHelper.sleep(2000);`
	`87`	`+ await BrowserHelper.sleep(4000);`
	`88`	`+`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -223,3 +223,8 @@ export function deleteProjectPhase(projectId, phaseId) {`
`223`	`223`	return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}`)
`224`	`224`	`.then(() => ({ projectId, phaseId }))`
`225`	`225`	`}`
	`226`	`+`
	`227`	`+export function deleteBulkProjectPhase(projectId, phaseIds) {`
	`228`	+ return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases`, { data: { phaseIds } })
	`229`	`+ .then(() => ({ phaseIds }))`
	`230`	`+}`