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

Merge pull request #8566 from AlexSCorey/8539-SurveyRequiredFields

Browse Source 
Adds asterisk to required survey questions in preview modal

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-11-11 18:58:30 +00:00
committed by GitHub
parent 4d480cb95f 619fabc3a1
commit cb4fcb9d80
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
View File

@@ -44,6 +44,7 @@ function SurveyPreviewModal({
<FormGroup <FormGroup
fieldId={`survey-preview-text-${q.variable}`} fieldId={`survey-preview-text-${q.variable}`}
label={q.question_name} label={q.question_name}
isRequired={q.required}
> >
<TextInput <TextInput
id={`survey-preview-text-${q.variable}`} id={`survey-preview-text-${q.variable}`}
@@ -57,6 +58,7 @@ function SurveyPreviewModal({
<FormGroup <FormGroup
fieldId={`survey-preview-textArea-${q.variable}`} fieldId={`survey-preview-textArea-${q.variable}`}
label={q.question_name} label={q.question_name}
isRequired={q.required}
> >
<TextArea <TextArea
id={`survey-preview-textArea-${q.variable}`} id={`survey-preview-textArea-${q.variable}`}
@@ -73,12 +75,14 @@ function SurveyPreviewModal({
label={q.question_name} label={q.question_name}
name={q.variable} name={q.variable}
isDisabled isDisabled
isRequired={q.required}
/> />
)} )}
{['multiplechoice'].includes(q.type) && ( {['multiplechoice'].includes(q.type) && (
<FormGroup <FormGroup
fieldId={`survey-preview-multipleChoice-${q.variable}`} fieldId={`survey-preview-multipleChoice-${q.variable}`}
label={q.question_name} label={q.question_name}
isRequired={q.required}
> >
<Select <Select
id={`survey-preview-multipleChoice-${q.variable}`} id={`survey-preview-multipleChoice-${q.variable}`}
@@ -93,6 +97,7 @@ function SurveyPreviewModal({
<FormGroup <FormGroup
fieldId={`survey-preview-multiSelect-${q.variable}`} fieldId={`survey-preview-multiSelect-${q.variable}`}
label={q.question_name} label={q.question_name}
isRequired={q.required}
> >
<Select <Select
isDisabled isDisabled

12
awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.test.jsx
View File

@@ -94,7 +94,7 @@ describe('<SurveyPreviewModal />', () => {
const question3 = wrapper const question3 = wrapper
.find('FormGroup[label="Text Area Question"]') .find('FormGroup[label="Text Area Question"]')
.find('label'); .find('label');
const question3Value = wrapper.find('TextArea'); const question3Value = wrapper.find('textarea');
const question4 = wrapper.find('FormGroup[label="Password Question"]'); const question4 = wrapper.find('FormGroup[label="Password Question"]');
const question4Value = wrapper.find('TextInputBase[type="password"]'); const question4Value = wrapper.find('TextInputBase[type="password"]');
@@ -106,24 +106,24 @@ describe('<SurveyPreviewModal />', () => {
.find('Select[aria-label="Multi-Select"]') .find('Select[aria-label="Multi-Select"]')
.find('Chip'); .find('Chip');
expect(question1.text()).toBe('Text Question '); expect(question1.text()).toBe('Text Question * ');
expect(question1Value.prop('value')).toBe('Text Question Value'); expect(question1Value.prop('value')).toBe('Text Question Value');
expect(question1Value.prop('isDisabled')).toBe(true); expect(question1Value.prop('isDisabled')).toBe(true);
expect(question2.text()).toBe('Select Question'); expect(question2.text()).toBe('Select Question *');
expect(question2Value.find('.pf-c-select__toggle-text').text()).toBe( expect(question2Value.find('.pf-c-select__toggle-text').text()).toBe(
'Select Question Value' 'Select Question Value'
); );
expect(question2Value.prop('isDisabled')).toBe(true); expect(question2Value.prop('isDisabled')).toBe(true);
expect(question3.text()).toBe('Text Area Question'); expect(question3.text()).toBe('Text Area Question *');
expect(question3Value.prop('value')).toBe('Text Area Question Value'); expect(question3Value.prop('value')).toBe('Text Area Question Value');
expect(question3Value.prop('disabled')).toBe(true); expect(question3Value.prop('disabled')).toBe(true);
expect(question4.text()).toBe('Password Question '); expect(question4.text()).toBe('Password Question * ');
expect(question4Value.prop('placeholder')).toBe('ENCRYPTED'); expect(question4Value.prop('placeholder')).toBe('ENCRYPTED');
expect(question4Value.prop('isDisabled')).toBe(true); expect(question4Value.prop('isDisabled')).toBe(true);
expect(question5.text()).toBe('Multiple select Question'); expect(question5.text()).toBe('Multiple select Question *');
expect(question5Value.length).toBe(4); expect(question5Value.length).toBe(4);
expect( expect(
wrapper.find('Select[aria-label="Multi-Select"]').prop('isDisabled') wrapper.find('Select[aria-label="Multi-Select"]').prop('isDisabled')