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

Schedules form - pass time prop as string. (#14206)

Browse Source
This commit is contained in:
kialam
2023-07-06 07:57:55 -07:00
committed by GitHub
parent 82abd18927
commit a4f808df34
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/src/components/Schedule/shared/DateTimePicker.js
View File

@@ -24,10 +24,10 @@ function DateTimePicker({ dateFieldName, timeFieldName, label }) {
validate: combine([required(null), validateTime()]), validate: combine([required(null), validateTime()]),
}); });
const onDateChange = (inputDate, newDate) => { const onDateChange = (_, dateString, date) => {
dateHelpers.setTouched(); dateHelpers.setTouched();
if (isValidDate(newDate) && inputDate === yyyyMMddFormat(newDate)) { if (isValidDate(date) && dateString === yyyyMMddFormat(date)) {
dateHelpers.setValue(inputDate); dateHelpers.setValue(dateString);
} }
}; };
@@ -62,7 +62,7 @@ function DateTimePicker({ dateFieldName, timeFieldName, label }) {
} }
time={timeField.value} time={timeField.value}
{...timeField} {...timeField}
onChange={(time) => timeHelpers.setValue(time)} onChange={(_, time) => timeHelpers.setValue(time)}
/> />
</DateTimeGroup> </DateTimeGroup>
</FormGroup> </FormGroup>

3
awx/ui/src/components/Schedule/shared/DateTimePicker.test.js
View File

@@ -43,10 +43,11 @@ describe('<DateTimePicker/>', () => {
await act(async () => { await act(async () => {
wrapper.find('DatePicker').prop('onChange')( wrapper.find('DatePicker').prop('onChange')(
null,
'2021-05-29', '2021-05-29',
new Date('Sat May 29 2021 00:00:00 GMT-0400 (Eastern Daylight Time)') new Date('Sat May 29 2021 00:00:00 GMT-0400 (Eastern Daylight Time)')
); );
wrapper.find('TimePicker').prop('onChange')('7:15 PM'); wrapper.find('TimePicker').prop('onChange')(null, '7:15 PM');
}); });
wrapper.update(); wrapper.update();
expect(wrapper.find('DatePicker').prop('value')).toBe('2021-05-29'); expect(wrapper.find('DatePicker').prop('value')).toBe('2021-05-29');

3
awx/ui/src/components/Schedule/shared/ScheduleForm.test.js
View File

@@ -885,6 +885,7 @@ describe('<ScheduleForm />', () => {
).toBe(true); ).toBe(true);
await act(async () => { await act(async () => {
wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')( wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')(
null,
'2020-03-14', '2020-03-14',
new Date('2020-03-14') new Date('2020-03-14')
); );
@@ -905,6 +906,7 @@ describe('<ScheduleForm />', () => {
const laterTime = DateTime.now().plus({ hours: 1 }).toFormat('h:mm a'); const laterTime = DateTime.now().plus({ hours: 1 }).toFormat('h:mm a');
await act(async () => { await act(async () => {
wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')( wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')(
null,
today, today,
new Date(today) new Date(today)
); );
@@ -919,6 +921,7 @@ describe('<ScheduleForm />', () => {
); );
await act(async () => { await act(async () => {
wrapper.find('TimePicker[aria-label="End time"]').prop('onChange')( wrapper.find('TimePicker[aria-label="End time"]').prop('onChange')(
null,
laterTime laterTime
); );
}); });