diff --git a/awx/ui/src/components/Schedule/shared/DateTimePicker.js b/awx/ui/src/components/Schedule/shared/DateTimePicker.js index 44d1f10c13..60bcecb851 100644 --- a/awx/ui/src/components/Schedule/shared/DateTimePicker.js +++ b/awx/ui/src/components/Schedule/shared/DateTimePicker.js @@ -24,10 +24,10 @@ function DateTimePicker({ dateFieldName, timeFieldName, label }) { validate: combine([required(null), validateTime()]), }); - const onDateChange = (inputDate, newDate) => { + const onDateChange = (_, dateString, date) => { dateHelpers.setTouched(); - if (isValidDate(newDate) && inputDate === yyyyMMddFormat(newDate)) { - dateHelpers.setValue(inputDate); + if (isValidDate(date) && dateString === yyyyMMddFormat(date)) { + dateHelpers.setValue(dateString); } }; @@ -62,7 +62,7 @@ function DateTimePicker({ dateFieldName, timeFieldName, label }) { } time={timeField.value} {...timeField} - onChange={(time) => timeHelpers.setValue(time)} + onChange={(_, time) => timeHelpers.setValue(time)} /> diff --git a/awx/ui/src/components/Schedule/shared/DateTimePicker.test.js b/awx/ui/src/components/Schedule/shared/DateTimePicker.test.js index a3d0603616..34df00eee6 100644 --- a/awx/ui/src/components/Schedule/shared/DateTimePicker.test.js +++ b/awx/ui/src/components/Schedule/shared/DateTimePicker.test.js @@ -43,10 +43,11 @@ describe('', () => { await act(async () => { wrapper.find('DatePicker').prop('onChange')( + null, '2021-05-29', 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(); expect(wrapper.find('DatePicker').prop('value')).toBe('2021-05-29'); diff --git a/awx/ui/src/components/Schedule/shared/ScheduleForm.test.js b/awx/ui/src/components/Schedule/shared/ScheduleForm.test.js index 61c6313093..9cdcefe81a 100644 --- a/awx/ui/src/components/Schedule/shared/ScheduleForm.test.js +++ b/awx/ui/src/components/Schedule/shared/ScheduleForm.test.js @@ -885,6 +885,7 @@ describe('', () => { ).toBe(true); await act(async () => { wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')( + null, '2020-03-14', new Date('2020-03-14') ); @@ -905,6 +906,7 @@ describe('', () => { const laterTime = DateTime.now().plus({ hours: 1 }).toFormat('h:mm a'); await act(async () => { wrapper.find('DatePicker[aria-label="End date"]').prop('onChange')( + null, today, new Date(today) ); @@ -919,6 +921,7 @@ describe('', () => { ); await act(async () => { wrapper.find('TimePicker[aria-label="End time"]').prop('onChange')( + null, laterTime ); });