From 57a65401e7a8355aeb13953823e1bf8dcc99f409 Mon Sep 17 00:00:00 2001 From: Somay Chauhan Date: Fri, 17 Nov 2023 02:39:48 +0530 Subject: [PATCH] fix: weird date override behaviour (#12292) Co-authored-by: Peer Richelsen --- .../components/DateOverrideInputDialog.tsx | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/features/schedules/components/DateOverrideInputDialog.tsx b/packages/features/schedules/components/DateOverrideInputDialog.tsx index 84ec723052..48612ff4ce 100644 --- a/packages/features/schedules/components/DateOverrideInputDialog.tsx +++ b/packages/features/schedules/components/DateOverrideInputDialog.tsx @@ -82,21 +82,22 @@ const DateOverrideForm = ({ const form = useForm({ values: { - range: value - ? value.map((range) => ({ - start: new Date( - dayjs - .utc() - .hour(range.start.getUTCHours()) - .minute(range.start.getUTCMinutes()) - .second(0) - .format() - ), - end: new Date( - dayjs.utc().hour(range.end.getUTCHours()).minute(range.end.getUTCMinutes()).second(0).format() - ), - })) - : defaultRanges, + range: + value && value[0].start.valueOf() !== value[0].end.valueOf() + ? value.map((range) => ({ + start: new Date( + dayjs + .utc() + .hour(range.start.getUTCHours()) + .minute(range.start.getUTCMinutes()) + .second(0) + .format() + ), + end: new Date( + dayjs.utc().hour(range.end.getUTCHours()).minute(range.end.getUTCMinutes()).second(0).format() + ), + })) + : defaultRanges, }, }); @@ -128,7 +129,7 @@ const DateOverrideForm = ({ ? selectedDates.map((date) => { return { start: date.utc(true).startOf("day").toDate(), - end: date.utc(true).startOf("day").add(1, "day").toDate(), + end: date.utc(true).startOf("day").toDate(), }; }) : datesInRanges