commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity

fix: 'handles OOO correctly' test fail in non-UTC servertime (#21899)

Browse Source
This commit is contained in:
Alex van Andel
2025-06-18 12:28:32 +01:00
committed by GitHub
parent bcb340d97e
commit 11a06324be
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/lib/date-ranges.test.ts
+4 -4
View File
@@ -545,13 +545,13 @@ describe("buildDateRanges", () => {
});
expect(dateRanges[0]).toEqual({
start: dayjs("2023-06-13T14:00:00Z").tz(timeZone),
end: dayjs("2023-06-13T19:00:00Z").tz(timeZone),
start: dayjs.utc("2023-06-13T14:00:00Z").tz(timeZone),
end: dayjs.utc("2023-06-13T19:00:00Z").tz(timeZone),
});
expect(dateRanges[1]).toEqual({
start: dayjs("2023-06-14T12:00:00Z").tz(timeZone),
end: dayjs("2023-06-14T21:00:00Z").tz(timeZone),
start: dayjs.utc("2023-06-14T12:00:00Z").tz(timeZone),
end: dayjs.utc("2023-06-14T21:00:00Z").tz(timeZone),
});
expect(oooExcludedDateRanges.length).toBe(1);
expect(oooExcludedDateRanges[0]).toEqual({
packages/lib/date-ranges.ts
+3 -6
View File
@@ -132,12 +132,9 @@ export function processDateOverride({
};
}
// This function processes out-of-office dates and returns a date range for each OOO date.
function processOOO(outOfOffice: Dayjs, timeZone: string) {
const utcOffset = outOfOffice.tz(timeZone).utcOffset();
const utcDate = outOfOffice.subtract(utcOffset, "minute");
const OOOdate = utcDate.tz(timeZone);
const OOOdate = outOfOffice.tz(timeZone, true);
return {
start: OOOdate,
end: OOOdate,
@@ -171,7 +168,7 @@ export function buildDateRanges({
}, [])
);
const OOOdates = outOfOffice
? Object.keys(outOfOffice).map((outOfOffice) => processOOO(dayjs(outOfOffice), timeZone))
? Object.keys(outOfOffice).map((outOfOffice) => processOOO(dayjs.utc(outOfOffice), timeZone))
: [];
const groupedOOO = groupByDate(OOOdates);