diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx index 917e232e3f0f3..488140660f4ea 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx @@ -200,7 +200,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent = ({ ); const selectEndDT = useCallback( (date) => { - setEndDT(date); + setEndDT(date.add(1, 'minutes')); setSelectingEndTime(true); setSelectingEndDate(false); }, @@ -210,8 +210,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent = ({ const onSelectFromInline = useCallback( (date) => { const dateAsMoment = moment(date); - const newDateAfterStart = - !startDT || dateAsMoment.isAfter(startDT) || dateAsMoment.isSame(startDT); + const newDateAfterStart = !startDT || dateAsMoment.isSameOrAfter(startDT); const isEndDateTimeChange = dateAsMoment.isSame(endDT, 'day') && !dateAsMoment.isSame(endDT, 'minute'); const isStartDateTimeChange = @@ -309,7 +308,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent = ({ selected={endDT} onChange={setEndDT} minDate={startDT ?? minDate} - isInvalid={startDT?.isAfter(endDT)} + isInvalid={startDT?.isSameOrAfter(endDT)} /> } /> @@ -376,7 +375,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent = ({