mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 00:55:06 +03:00
Fixes empty chip issue when user adds empty new line.
This commit is contained in:
parent
9360d3fabc
commit
10ccb57062
@ -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', ''));
|
||||
|
@ -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,
|
||||
|
@ -68,10 +68,8 @@ function SurveyQuestionForm({
|
||||
}) {
|
||||
const defaultIsNotAvailable = choices => {
|
||||
return defaultValue => {
|
||||
const answerChoices = new Set(choices);
|
||||
const defaultAnswers = new Set(defaultValue);
|
||||
let errorMessage;
|
||||
const found = [...defaultAnswers].every(dA => answerChoices.has(dA));
|
||||
const found = [...defaultValue].every(dA => choices.indexOf(dA) > -1);
|
||||
|
||||
if (!found) {
|
||||
errorMessage = i18n._(
|
||||
|
Loading…
Reference in New Issue
Block a user