Merge pull request #691 from AparnaKarve/fix_edit_plan_with_same_vms_…

…in_csv Fix VM validity during Plan Edit (cherry picked from commit d48f78d)
ManageIQ · Oct 25, 2018 · f2c4ceb · f2c4ceb
1 parent bdf1494
commit f2c4ceb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...t/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/PlanWizardVMStep.js b/...t/screens/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/PlanWizardVMStep.js
@@ -29,10 +29,10 @@ class PlanWizardVMStep extends React.Component {
     }
   }
   onCSVParseSuccess = parsedRows => {
-    const { infrastructure_mapping_id, validateVmsUrl, validateVmsAction } = this.props;
+    const { infrastructure_mapping_id, validateVmsUrl, validateVmsAction, editingPlan } = this.props;
     // skip the header row
     parsedRows.shift();
-    validateVmsAction(validateVmsUrl, infrastructure_mapping_id, parsedRows);
+    validateVmsAction(validateVmsUrl, infrastructure_mapping_id, parsedRows, editingPlan && editingPlan.id);
   };
   onCSVParseFailure = errMsg => {
     const { csvParseErrorAction } = this.props;

diff --git a/...ns/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/PlanWizardVMStepActions.js b/...ns/App/Overview/screens/PlanWizard/components/PlanWizardVMStep/PlanWizardVMStepActions.js
@@ -5,11 +5,14 @@ import { V2V_VM_STEP_RESET, V2V_VALIDATE_VMS, QUERY_V2V_PLAN_VMS } from './PlanW
 
 export { showConfirmModalAction, hideConfirmModalAction } from '../../../../OverviewActions';
 
-const _validateVmsActionCreator = (url, vms) => dispatch => {
-  const postBody = {
+const _validateVmsActionCreator = (url, vms, planId) => dispatch => {
+  let postBody = {
     action: 'validate_vms',
     import: vms
   };
+  if (planId) {
+    postBody = { ...postBody, service_template_id: planId };
+  }
   dispatch({
     type: V2V_VALIDATE_VMS,
     payload: new Promise((resolve, reject) => {
@@ -24,10 +27,10 @@ const _validateVmsActionCreator = (url, vms) => dispatch => {
   });
 };
 
-export const validateVmsAction = (url, id, vms) => {
+export const validateVmsAction = (url, id, vms, planId) => {
   const uri = new URI(`${url}/${id}`);
 
-  return _validateVmsActionCreator(uri.toString(), vms);
+  return _validateVmsActionCreator(uri.toString(), vms, planId);
 };
 
 export const csvImportAction = () => dispatch => {