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

Merge pull request #9814 from nixocio/ui_issue_9176

Browse Source 
Do not validate optional survey

Do not validate optional survey.
See: #9176

Reviewed-by: Marliana Lara <marliana.lara@gmail.com>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-04-09 17:35:22 +00:00 committed by GitHub
commit 6e46183ba6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
View File

@ -54,8 +54,8 @@ SurveyStep.propTypes = {
function TextField({ question, i18n }) {
const validators = [
question.required ? required(null, i18n) : null,
question.min ? minLength(question.min, i18n) : null,
question.max ? maxLength(question.max, i18n) : null,
question.required && question.min ? minLength(question.min, i18n) : null,
question.required && question.max ? maxLength(question.max, i18n) : null,
];
return (
<FormField
@ -124,7 +124,7 @@ function MultiSelectField({ question, i18n }) {
const [isOpen, setIsOpen] = useState(false);
const [field, meta, helpers] = useField({
name: `survey_${question.variable}`,
validate: question.isrequired ? required(null, i18n) : null,
validate: question.required ? required(null, i18n) : null,
});
const id = `survey-question-${question.variable}`;
const hasActualValue = !question.required || meta.value?.length > 0;

3
awx/ui_next/src/util/prompt/getSurveyValues.js
View File

@ -5,6 +5,9 @@ export default function getSurveyValues(values) {
if (Array.isArray(values[key]) && values[key].length === 0) {
return;
}
if (key.startsWith('survey_') && values[key] === '') {
return;
}
surveyValues[key.substr(7)] = values[key];
}
});