External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 16:58:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix extra_vars when not prompted during launch

Browse Source
This commit is contained in:
Keith Grant
2020-05-27 11:15:41 -07:00
parent 1b1a93dd4b
commit 5eeb8b0337
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
View File

@@ -44,7 +44,10 @@ function LaunchPrompt({ config, resource, onLaunch, onCancel, i18n }) {
setValue('limit', values.limit); setValue('limit', values.limit);
setValue('job_tags', values.job_tags); setValue('job_tags', values.job_tags);
setValue('skip_tags', values.skip_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); setValue('scm_branch', values.scm_branch);
onLaunch(postValues); onLaunch(postValues);
}; };

35
awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
View File

@@ -8,27 +8,32 @@ import getSurveyValues from '../getSurveyValues';
function PreviewStep({ resource, config, survey, formErrors }) { function PreviewStep({ resource, config, survey, formErrors }) {
const { values } = useFormikContext(); const { values } = useFormikContext();
const surveyValues = getSurveyValues(values); const surveyValues = getSurveyValues(values);
let extraVars;
if (survey && survey.spec) { const overrides = { ...values };
const passwordFields = survey.spec
.filter(q => q.type === 'password') if (config.ask_variables_on_launch || config.survey_enabled) {
.map(q => q.variable); const initialExtraVars = config.ask_variables_on_launch
const masked = maskPasswords(surveyValues, passwordFields); ? values.extra_vars || '---'
extraVars = yaml.safeDump( : resource.extra_vars;
mergeExtraVars(values.extra_vars || '---', masked) if (survey && survey.spec) {
); const passwordFields = survey.spec
} else { .filter(q => q.type === 'password')
extraVars = values.extra_vars || '---'; .map(q => q.variable);
const masked = maskPasswords(surveyValues, passwordFields);
overrides.extra_vars = yaml.safeDump(
mergeExtraVars(initialExtraVars, masked)
);
} else {
overrides.extra_vars = initialExtraVars;
}
} }
return ( return (
<> <>
<PromptDetail <PromptDetail
resource={resource} resource={resource}
launchConfig={config} launchConfig={config}
overrides={{ overrides={overrides}
...values,
extra_vars: extraVars,
}}
/> />
{formErrors && ( {formErrors && (
<ul css="color: red"> <ul css="color: red">