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

Merge pull request #10086 from jakemcdermott/fix-9370

Browse Source 
Avoid prop reference error when recreating survey

SUMMARY
For #9370
The survey object is undefined when recreating a survey after deleting it. Add optional chaining on survey fields to avoid prop reference error.

Reviewed-by: Kersom <None>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-05-10 15:34:36 +00:00
committed by GitHub
parent 1c73407edf b94a9c19e7
commit f5cc927a15
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ export default function SurveyQuestionAdd({ survey, updateSurvey }) {
const handleSubmit = async question => {
const formData = { ...question };
try {
if (survey.spec?.some(q => q.variable === formData.variable)) {
if (survey?.spec?.some(q => q.variable === formData.variable)) {
setFormError(
new Error(
`Survey already contains a question with variable named “${formData.variable}”`
@@ -41,9 +41,7 @@ export default function SurveyQuestionAdd({ survey, updateSurvey }) {
formData.choices = choices.trim();
}
delete formData.formattedChoices;
const newSpec = survey.spec ? survey.spec.concat(formData) : [formData];
const newSpec = survey?.spec ? survey.spec.concat(formData) : [formData];
await updateSurvey(newSpec);
history.push(match.url.replace('/add', ''));
} catch (err) {

4
awx/ui_next/src/screens/Template/TemplateSurvey.jsx
View File

@@ -53,8 +53,8 @@ function TemplateSurvey({ template, canEdit }) {
);
const updateSurveySpec = spec => {
updateSurvey({
name: survey.name || '',
description: survey.description || '',
name: survey?.name || '',
description: survey?.description || '',
spec,
});
};