External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix formatting JSON on initialize

Browse Source
This commit is contained in:
Keith J. Grant
2021-04-19 11:00:27 -07:00
parent b817967377
commit 804cf74cd8
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx
View File

@@ -49,6 +49,9 @@ function VariablesDetail({
} }
const modeMatches = isJsonString(value) === (mode === JSON_MODE); const modeMatches = isJsonString(value) === (mode === JSON_MODE);
if (modeMatches) { if (modeMatches) {
if (mode === JSON_MODE) {
return JSON.stringify(JSON.parse(value), null, 2);
}
return value; return value;
} }
return mode === YAML_MODE ? jsonToYaml(value) : yamlToJson(value); return mode === YAML_MODE ? jsonToYaml(value) : yamlToJson(value);

7
awx/ui_next/src/components/CodeEditor/VariablesField.jsx
View File

@@ -57,11 +57,12 @@ function VariablesField({
); );
const [field, meta, helpers] = useField({ name, validate }); const [field, meta, helpers] = useField({ name, validate });
// mode's useState above couldn't be initialized to JSON_MODE because useEffect(function initializeJSON() {
// the field value had to be defined below it
useEffect(function initializeMode() {
if (isJsonString(field.value)) { if (isJsonString(field.value)) {
// mode's useState above couldn't be initialized to JSON_MODE because
// the field value had to be defined below it
setMode(JSON_MODE); setMode(JSON_MODE);
helpers.setValue(JSON.stringify(JSON.parse(field.value), null, 2));
} }
}, []); // eslint-disable-line react-hooks/exhaustive-deps }, []); // eslint-disable-line react-hooks/exhaustive-deps

1
awx/ui_next/src/components/CodeEditor/VariablesField.test.jsx
View File

@@ -215,6 +215,7 @@ describe('VariablesField', () => {
</Formik> </Formik>
); );
}); });
wrapper.update();
expect(wrapper.find('CodeEditor').prop('mode')).toEqual('javascript'); expect(wrapper.find('CodeEditor').prop('mode')).toEqual('javascript');
}); });