shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 00:55:06 +03:00
Code Releases Activity

Merge pull request #6988 from AlexSCorey/6946-SurveyFormValidationError

Browse Source 
6946 survey form validation error

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-05-19 15:32:38 +00:00 committed by GitHub
commit e74fb194bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 83 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/screens/Template/Survey/SurveyQuestionAdd.jsx
View File

@ -18,6 +18,13 @@ export default function SurveyQuestionAdd({ survey, updateSurvey }) {
);
return;
}
if (question.type === 'multiselect') {
question.default = question.default
.split('\n')
.filter(v => v !== '' || '\n')
.map(v => v.trim())
.join('\n');
}
const newSpec = survey.spec ? survey.spec.concat(question) : [question];
await updateSurvey(newSpec);
history.push(match.url.replace('/add', ''));

7
awx/ui_next/src/screens/Template/Survey/SurveyQuestionEdit.jsx
View File

@ -39,6 +39,13 @@ export default function SurveyQuestionEdit({ survey, updateSurvey }) {
if (questionIndex === -1) {
throw new Error('Question not found in spec');
}
if (formData.type === 'multiselect') {
formData.default = formData.default
.split('\n')
.filter(v => v !== '' || '\n')
.map(v => v.trim())
.join('\n');
}
await updateSurvey([
...survey.spec.slice(0, questionIndex),
formData,

9
awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
View File

@ -73,12 +73,15 @@ function SurveyQuestionForm({
}) {
const defaultIsNotAvailable = choices => {
return defaultValue => {
if (!choices.includes(defaultValue)) {
return i18n._(
let errorMessage;
const found = [...defaultValue].every(dA => choices.indexOf(dA) > -1);
if (!found) {
errorMessage = i18n._(
t`Default choice must be answered from the choices listed.`
);
}
return undefined;
return errorMessage;
};
};

63
awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.test.jsx
View File

@ -225,4 +225,67 @@ describe('<SurveyQuestionForm />', () => {
wrapper.find('FormField#question-default input').prop('type')
).toEqual('number');
});
test('should not throw validation error', async () => {
let wrapper;
act(() => {
wrapper = mountWithContexts(
<SurveyQuestionForm
question={question}
handleSubmit={noop}
handleCancel={noop}
/>
);
});
await selectType(wrapper, 'multiselect');
await act(async () =>
wrapper.find('TextArea#question-options').prop('onChange')('a \n b', {
target: { value: 'a \n b', name: 'choices' },
})
);
await act(async () =>
wrapper.find('TextArea#question-default').prop('onChange')('b \n a', {
target: { value: 'b \n a', name: 'default' },
})
);
wrapper.find('FormField#question-default').prop('validate')('b \n a', {});
wrapper.update();
expect(
wrapper
.find('FormGroup[fieldId="question-default"]')
.prop('helperTextInvalid')
).toBe(undefined);
});
test('should throw validation error', async () => {
let wrapper;
act(() => {
wrapper = mountWithContexts(
<SurveyQuestionForm
question={question}
handleSubmit={noop}
handleCancel={noop}
/>
);
});
await selectType(wrapper, 'multiselect');
await act(async () =>
wrapper.find('TextArea#question-options').prop('onChange')('a \n b', {
target: { value: 'a \n b', name: 'choices' },
})
);
await act(async () =>
wrapper.find('TextArea#question-default').prop('onChange')('c', {
target: { value: 'c', name: 'default' },
})
);
wrapper.find('FormField#question-default').prop('validate')('c', {});
wrapper.update();
expect(
wrapper
.find('FormGroup[fieldId="question-default"]')
.prop('helperTextInvalid')
).toBe('Default choice must be answered from the choices listed.');
});
});