Skip to content

Commit

Permalink
Updates js-yaml to 4.x and updates files.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSCorey committed Jun 14, 2022
1 parent 816518c commit bda335c
Show file tree
Hide file tree
Showing 10 changed files with 116 additions and 153 deletions.
196 changes: 104 additions & 92 deletions awx/ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion awx/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"formik": "2.2.9",
"has-ansi": "5.0.1",
"html-entities": "2.3.2",
"js-yaml": "^3.13.1",
"js-yaml": "4.1.0",
"luxon": "^2.4.0",
"prop-types": "^15.6.2",
"react": "17.0.2",
Expand Down
6 changes: 2 additions & 4 deletions awx/ui/src/components/LaunchPrompt/steps/PreviewStep.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ function PreviewStep({ resource, launchConfig, surveyConfig, formErrors }) {
.filter((q) => q.type === 'password')
.map((q) => q.variable);
const masked = maskPasswords(surveyValues, passwordFields);
overrides.extra_vars = yaml.safeDump(
overrides.extra_vars = yaml.dump(
mergeExtraVars(initialExtraVars, masked)
);
} else {
overrides.extra_vars = yaml.safeDump(
mergeExtraVars(initialExtraVars, {})
);
overrides.extra_vars = yaml.dump(mergeExtraVars(initialExtraVars, {}));
}
} catch (e) {
//
Expand Down
4 changes: 2 additions & 2 deletions awx/ui/src/components/Schedule/ScheduleAdd/ScheduleAdd.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ function ScheduleAdd({
launchConfiguration?.ask_variables_on_launch &&
(values.extra_vars || '---');
if (surveyConfiguration?.spec) {
extraVars = yaml.safeDump(mergeExtraVars(initialExtraVars, surveyValues));
extraVars = yaml.dump(mergeExtraVars(initialExtraVars, surveyValues));
} else {
extraVars = yaml.safeDump(mergeExtraVars(initialExtraVars, {}));
extraVars = yaml.dump(mergeExtraVars(initialExtraVars, {}));
}
submitValues.extra_data = extraVars && parseVariableField(extraVars);
delete values.extra_vars;
Expand Down
Loading

0 comments on commit bda335c

Please sign in to comment.