From 5eeb8b0337cf74f5d6ce9d29de2bbe184da7f329 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Wed, 27 May 2020 11:15:41 -0700
Subject: [PATCH] fix extra_vars when not prompted during launch

---
 .../components/LaunchPrompt/LaunchPrompt.jsx  |  5 ++-
 .../LaunchPrompt/steps/PreviewStep.jsx        | 35 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
index 71d441e572..94f2f8b582 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
@@ -44,7 +44,10 @@ function LaunchPrompt({ config, resource, onLaunch, onCancel, i18n }) {
     setValue('limit', values.limit);
     setValue('job_tags', values.job_tags);
     setValue('skip_tags', values.skip_tags);
-    setValue('extra_vars', mergeExtraVars(values.extra_vars, surveyValues));
+    const extraVars = config.ask_variables_on_launch
+      ? values.extra_vars || '---'
+      : resource.extra_vars;
+    setValue('extra_vars', mergeExtraVars(extraVars, surveyValues));
     setValue('scm_branch', values.scm_branch);
     onLaunch(postValues);
   };
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
index f7e8ed1c36..835fbba18d 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
@@ -8,27 +8,32 @@ import getSurveyValues from '../getSurveyValues';
 function PreviewStep({ resource, config, survey, formErrors }) {
   const { values } = useFormikContext();
   const surveyValues = getSurveyValues(values);
-  let extraVars;
-  if (survey && survey.spec) {
-    const passwordFields = survey.spec
-      .filter(q => q.type === 'password')
-      .map(q => q.variable);
-    const masked = maskPasswords(surveyValues, passwordFields);
-    extraVars = yaml.safeDump(
-      mergeExtraVars(values.extra_vars || '---', masked)
-    );
-  } else {
-    extraVars = values.extra_vars || '---';
+
+  const overrides = { ...values };
+
+  if (config.ask_variables_on_launch || config.survey_enabled) {
+    const initialExtraVars = config.ask_variables_on_launch
+      ? values.extra_vars || '---'
+      : resource.extra_vars;
+    if (survey && survey.spec) {
+      const passwordFields = survey.spec
+        .filter(q => q.type === 'password')
+        .map(q => q.variable);
+      const masked = maskPasswords(surveyValues, passwordFields);
+      overrides.extra_vars = yaml.safeDump(
+        mergeExtraVars(initialExtraVars, masked)
+      );
+    } else {
+      overrides.extra_vars = initialExtraVars;
+    }
   }
+
   return (
     <>
       <PromptDetail
         resource={resource}
         launchConfig={config}
-        overrides={{
-          ...values,
-          extra_vars: extraVars,
-        }}
+        overrides={overrides}
       />
       {formErrors && (
         <ul css="color: red">