feat: Override any day of the week (#10138)
* feat: Override any day of the week * Having multiple workingHours would duplicate the defaultpull/10096/head^2
parent
9444f925e5
commit
0bc7d4ceda
|
@ -1,10 +1,9 @@
|
||||||
import { useState, useMemo } from "react";
|
import { useState } from "react";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
|
|
||||||
import type { Dayjs } from "@calcom/dayjs";
|
import type { Dayjs } from "@calcom/dayjs";
|
||||||
import dayjs from "@calcom/dayjs";
|
import dayjs from "@calcom/dayjs";
|
||||||
import { classNames } from "@calcom/lib";
|
import { classNames } from "@calcom/lib";
|
||||||
import { daysInMonth, yyyymmdd } from "@calcom/lib/date-fns";
|
|
||||||
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
||||||
import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
|
import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
|
||||||
import type { WorkingHours } from "@calcom/types/schedule";
|
import type { WorkingHours } from "@calcom/types/schedule";
|
||||||
|
@ -50,22 +49,23 @@ const DateOverrideForm = ({
|
||||||
);
|
);
|
||||||
|
|
||||||
const [date, setDate] = useState<Dayjs | null>(value ? dayjs.utc(value[0].start) : null);
|
const [date, setDate] = useState<Dayjs | null>(value ? dayjs.utc(value[0].start) : null);
|
||||||
const includedDates = useMemo(
|
|
||||||
() =>
|
const defaultRanges = (workingHours || []).reduce((dayRanges: TimeRange[], workingHour) => {
|
||||||
workingHours
|
if (date && workingHour.days.includes(date.day())) {
|
||||||
? workingHours.reduce((dates, workingHour) => {
|
dayRanges.push({
|
||||||
for (let dNum = 1; dNum <= daysInMonth(browsingDate || dayjs()); dNum++) {
|
start: dayjs.utc().startOf("day").add(workingHour.startTime, "minute").toDate(),
|
||||||
const d = browsingDate ? browsingDate.date(dNum) : dayjs.utc().date(dNum);
|
end: dayjs.utc().startOf("day").add(workingHour.endTime, "minute").toDate(),
|
||||||
if (workingHour.days.includes(d.day())) {
|
});
|
||||||
dates.push(yyyymmdd(d));
|
}
|
||||||
}
|
return dayRanges;
|
||||||
}
|
}, []);
|
||||||
return dates;
|
// DayRanges does not support empty state, add 9-5 as a default
|
||||||
}, [] as string[])
|
if (!defaultRanges.length) {
|
||||||
: [],
|
defaultRanges.push({
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
start: dayjs.utc().startOf("day").add(540, "minute").toDate(),
|
||||||
[browsingDate]
|
end: dayjs.utc().startOf("day").add(1020, "minute").toDate(),
|
||||||
);
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
values: {
|
values: {
|
||||||
|
@ -83,15 +83,7 @@ const DateOverrideForm = ({
|
||||||
dayjs.utc().hour(range.end.getUTCHours()).minute(range.end.getUTCMinutes()).second(0).format()
|
dayjs.utc().hour(range.end.getUTCHours()).minute(range.end.getUTCMinutes()).second(0).format()
|
||||||
),
|
),
|
||||||
}))
|
}))
|
||||||
: (workingHours || []).reduce((dayRanges, workingHour) => {
|
: defaultRanges,
|
||||||
if (date && workingHour.days.includes(date.day())) {
|
|
||||||
dayRanges.push({
|
|
||||||
start: dayjs.utc().startOf("day").add(workingHour.startTime, "minute").toDate(),
|
|
||||||
end: dayjs.utc().startOf("day").add(workingHour.endTime, "minute").toDate(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return dayRanges;
|
|
||||||
}, [] as TimeRange[]),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -120,7 +112,6 @@ const DateOverrideForm = ({
|
||||||
<div className={classNames(date && "sm:border-subtle w-full sm:border-r sm:pr-6", "sm:p-4 md:p-8")}>
|
<div className={classNames(date && "sm:border-subtle w-full sm:border-r sm:pr-6", "sm:p-4 md:p-8")}>
|
||||||
<DialogHeader title={t("date_overrides_dialog_title")} />
|
<DialogHeader title={t("date_overrides_dialog_title")} />
|
||||||
<DatePicker
|
<DatePicker
|
||||||
includedDates={includedDates}
|
|
||||||
excludedDates={excludedDates}
|
excludedDates={excludedDates}
|
||||||
weekStart={0}
|
weekStart={0}
|
||||||
selected={date}
|
selected={date}
|
||||||
|
@ -138,7 +129,9 @@ const DateOverrideForm = ({
|
||||||
<p className="text-medium text-emphasis text-sm">{t("date_overrides_dialog_which_hours")}</p>
|
<p className="text-medium text-emphasis text-sm">{t("date_overrides_dialog_which_hours")}</p>
|
||||||
<div>
|
<div>
|
||||||
{datesUnavailable ? (
|
{datesUnavailable ? (
|
||||||
<p className="text-subtle rounded border p-2 text-sm">{t("date_overrides_unavailable")}</p>
|
<p className="text-subtle border-default rounded border p-2 text-sm">
|
||||||
|
{t("date_overrides_unavailable")}
|
||||||
|
</p>
|
||||||
) : (
|
) : (
|
||||||
<DayRanges name="range" />
|
<DayRanges name="range" />
|
||||||
)}
|
)}
|
||||||
|
|
Loading…
Reference in New Issue