Fix: Preserve timezone used in create and update modal (#301)

- Fix timezone field display in event modals to show original timezone from server
- Fix formatDateToICal to use moment.utc(date).tz(timezone) for correct UTC instant preservation
- Fix parseCalendarEvent to convert event.start/end to ISO UTC strings after parsing
- Fix eventToFullCalendarFormat to ensure event times are ISO UTC before passing to FullCalendar
- Fix getEvent to normalize event.start/end to ISO UTC strings
- Ensure event.timezone is always set (defaults to Etc/UTC if not detected)
- Update eventUtils.test.ts to match new timezone conversion logic
- Fix event time shift issue on calendar grid display

This ensures:
- Events display in correct time slots on calendar grid
- Event times are correctly converted between timezones
- Original timezone from server is preserved and displayed
- All event times are stored as ISO UTC strings internally

* refactor: eliminate datetime format detection code duplication

- Add constants for datetime format strings and magic number (DATETIME_WITH_SECONDS_LENGTH, DATETIME_FORMAT_WITH_SECONDS, DATETIME_FORMAT_WITHOUT_SECONDS)
- Create shared detectDateTimeFormat() function to replace duplicated format detection logic
- Refactor convertFormDateTimeToISO, convertEventDateTimeToISO, and convertDateTimeStringToISO to use shared helper
- Add console.warn logging when invalid datetime is encountered (addresses silent fallback issue)
- Add comprehensive test coverage for dateTimeHelpers with full test suite
This commit is contained in:
lenhanphung
2025-11-20 15:32:15 +07:00
committed by GitHub
parent 8e7b6e18eb
commit bff1af31bd
10 changed files with 951 additions and 138 deletions
+117 -7
View File
@@ -8,6 +8,19 @@ import {
parseCalendarEvent,
} from "./eventUtils";
import ICAL from "ical.js";
import moment from "moment-timezone";
import { detectDateTimeFormat } from "../../components/Event/utils/dateTimeHelpers";
function resolveTimezoneId(tzid?: string): string | undefined {
if (!tzid) return undefined;
if (TIMEZONES.zones[tzid]) {
return tzid;
}
if (TIMEZONES.aliases[tzid]) {
return TIMEZONES.aliases[tzid].aliasTo;
}
return tzid;
}
export async function getEvent(event: CalendarEvent, isMaster?: boolean) {
const response = await api.get(`dav${event.URL}`);
@@ -17,33 +30,130 @@ export async function getEvent(event: CalendarEvent, isMaster?: boolean) {
const vevents = (eventical[2] || []).filter(
([name]: [string]) => name.toLowerCase() === "vevent"
);
const vtimezones = (eventical[2] || []).filter(
([name]: [string]) => name.toLowerCase() === "vtimezone"
);
let targetVevent;
if (isMaster) {
// Find master VEVENT (the one without recurrence-id)
targetVevent = vevents.find(
([, props]: [string, any[]]) =>
!props.find(([k]: string[]) => k.toLowerCase() === "recurrence-id")
);
if (!targetVevent) {
// Fallback to first VEVENT if no master found
targetVevent = vevents[0];
}
} else {
// For non-master, use first VEVENT as before
targetVevent = vevents[0];
}
let timezoneFromVTimezone: string | undefined;
if (vtimezones.length > 0) {
const vtimezone = vtimezones[0];
const tzidProp = vtimezone[1]?.find(
([k]: string[]) => k.toLowerCase() === "tzid"
);
if (tzidProp && tzidProp[3]) {
const resolvedTz = resolveTimezoneId(tzidProp[3]);
if (resolvedTz) {
timezoneFromVTimezone = resolvedTz;
}
}
}
let timezoneFromDTSTART: string | undefined;
const dtstartProp = targetVevent[1]?.find(
([k]: string[]) => k.toLowerCase() === "dtstart"
);
if (dtstartProp) {
const dtstartParams = dtstartProp[1];
const dtstartValue = dtstartProp[3];
if (dtstartParams) {
const tzParam =
dtstartParams.tzid ||
dtstartParams.TZID ||
dtstartParams.Tzid ||
dtstartParams.tZid ||
dtstartParams.tzId;
if (tzParam) {
const resolvedTz = resolveTimezoneId(tzParam);
if (resolvedTz) {
timezoneFromDTSTART = resolvedTz;
}
}
}
if (
!timezoneFromDTSTART &&
typeof dtstartValue === "string" &&
dtstartValue.endsWith("Z")
) {
timezoneFromDTSTART = "Etc/UTC";
}
}
const eventjson = parseCalendarEvent(
targetVevent[1],
event.color ?? {},
event.calId,
event.URL
);
if (isMaster) {
return { ...event, ...eventjson };
const finalTimezone =
timezoneFromVTimezone ||
timezoneFromDTSTART ||
eventjson.timezone ||
"Etc/UTC";
eventjson.timezone = finalTimezone;
if (!eventjson.allday && eventjson.start && finalTimezone) {
const startISO = convertEventDateTimeToISO(eventjson.start, finalTimezone);
if (startISO) {
eventjson.start = startISO;
}
}
return { ...eventjson, ...event };
if (!eventjson.allday && eventjson.end && finalTimezone) {
const endISO = convertEventDateTimeToISO(eventjson.end, finalTimezone);
if (endISO) {
eventjson.end = endISO;
}
}
if (isMaster) {
const merged = { ...event, ...eventjson };
merged.timezone = finalTimezone;
return merged;
}
const merged = { ...event, ...eventjson };
merged.timezone = finalTimezone;
return merged;
}
function convertEventDateTimeToISO(
datetime: string,
eventTimezone: string
): string | undefined {
if (!datetime || !eventTimezone) return undefined;
if (datetime.includes("Z") || datetime.match(/[+-]\d{2}:\d{2}$/)) {
return datetime;
}
const dateOnlyRegex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
if (dateOnlyRegex.test(datetime)) {
return undefined;
}
const format = detectDateTimeFormat(datetime);
const momentDate = moment.tz(datetime, format, eventTimezone);
if (!momentDate.isValid()) {
console.warn(
`[convertEventDateTimeToISO] Invalid datetime: "${datetime}" with format "${format}" in timezone "${eventTimezone}"`
);
return undefined;
}
return momentDate.toISOString();
}
export async function dlEvent(event: CalendarEvent) {