Scheduler: timezone utils refactoring (#30654)

Author: aleksei-semikozov

e2e/testcafe-devextreme/tests/scheduler/timezones/etalons/appointments_support_old_timezone_db.png

@@ -23,10 +23,10 @@ describe('Date utils', () => {
       .it('should add ms offsets to date correctly', ({
         offsets,
         expectedResult,
-      }) => {
+      }: { offsets: number[]; expectedResult: Date }) => {
         const date = new Date('2023-09-05T00:00:00Z');
 
-        const result = dateUtilsTs.addOffsets(date, offsets);
+        const result = dateUtilsTs.addOffsets(date, ...offsets);
 
         expect(result).toEqual(expectedResult);
       });

e2e/testcafe-devextreme/tests/scheduler/timezones/globalConfigTimezoneDB.ts

@@ -1,14 +1,17 @@
-// TODO Vinogradov: Refactor offsets: number[] -> ...offsets: number[]
-const addOffsets = (date: Date, offsets: number[]): Date => {
+const addOffsets = (date: Date, ...offsets: number[]): Date => {
   const newDateMs = offsets.reduce(
     (result, offset) => result + offset,
     date.getTime(),
   );
 
   return new Date(newDateMs);
 };
-// eslint-disable-next-line @stylistic/max-len
-const isValidDate = (date: unknown): date is Date | string | number => Boolean(date && !isNaN(new Date(date as Date).valueOf()));
+
+const isValidDate = (
+  date: unknown,
+): date is Date | string | number => Boolean(
+  date && !isNaN(new Date(date as Date).valueOf()),
+);
 
 export const dateUtilsTs = {
   addOffsets,

packages/devextreme/js/__internal/core/utils/date.test.ts

@@ -759,12 +759,12 @@ class SchedulerAppointments extends CollectionWidget {
     } else {
       const startDate = this._getEndResizeAppointmentStartDate(e, sourceAppointment, info.appointment);
       const { endDate } = info.appointment;
-      const shiftedStartDate = dateUtilsTs.addOffsets(startDate, [-viewOffset]);
-      const shiftedEndDate = dateUtilsTs.addOffsets(endDate, [-viewOffset]);
+      const shiftedStartDate = dateUtilsTs.addOffsets(startDate, -viewOffset);
+      const shiftedEndDate = dateUtilsTs.addOffsets(endDate, -viewOffset);
 
       dateRange = this._getDateRange(e, shiftedStartDate, shiftedEndDate);
-      dateRange.startDate = dateUtilsTs.addOffsets(dateRange.startDate, [viewOffset]);
-      dateRange.endDate = dateUtilsTs.addOffsets(dateRange.endDate, [viewOffset]);
+      dateRange.startDate = dateUtilsTs.addOffsets(dateRange.startDate, viewOffset);
+      dateRange.endDate = dateUtilsTs.addOffsets(dateRange.endDate, viewOffset);
     }
 
     this.updateResizedAppointment(
@@ -825,8 +825,8 @@ class SchedulerAppointments extends CollectionWidget {
     const startDateDelta = gridAdapter.startDate.getTime() - convertedBackAdapter.startDate.getTime();
     const endDateDelta = gridAdapter.endDate.getTime() - convertedBackAdapter.endDate.getTime();
 
-    gridAdapter.startDate = dateUtilsTs.addOffsets(gridAdapter.startDate, [startDateDelta]);
-    gridAdapter.endDate = dateUtilsTs.addOffsets(gridAdapter.endDate, [endDateDelta]);
+    gridAdapter.startDate = dateUtilsTs.addOffsets(gridAdapter.startDate, startDateDelta);
+    gridAdapter.endDate = dateUtilsTs.addOffsets(gridAdapter.endDate, endDateDelta);
 
     const data = gridAdapter
       .calculateDates(timeZoneCalculator, 'fromGrid')

packages/devextreme/js/__internal/core/utils/date.ts

@@ -32,7 +32,7 @@ const getCellData = (
   // but long appointments are not. So for all day appointments endDate === startDate,
   // for long appointments endDate = startDate + 1 day.
   if (!isAllDay) {
-    cellData.endDate = dateUtilsTs.addOffsets(cellData.startDate, [toMs('day')]);
+    cellData.endDate = dateUtilsTs.addOffsets(cellData.startDate, toMs('day'));
   }
 
   return cellData;

packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts

@@ -2,11 +2,13 @@
 import errors from '@js/core/errors';
 import dateUtils from '@js/core/utils/date';
 import { each } from '@js/core/utils/iterator';
+import { dateUtilsTs } from '@ts/core/utils/date';
 import { RRule, RRuleSet } from 'rrule';
 
 import timeZoneUtils from './m_utils_time_zone';
 
 const toMs = dateUtils.dateToMilliseconds;
+const { addOffsets } = dateUtilsTs;
 
 const ruleNames = ['freq', 'interval', 'byday', 'byweekno', 'byyearday', 'bymonth', 'bymonthday', 'count', 'until', 'byhour', 'byminute', 'bysecond', 'bysetpos', 'wkst'];
 const freqNames = ['DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY', 'SECONDLY', 'MINUTELY', 'HOURLY'];
@@ -81,11 +83,11 @@ class RecurrenceProcessor {
     const duration = options.end ? options.end.getTime() - options.start.getTime() : 0;
 
     // NOTE: Remove local timezone offsets from Rrule date params.
-    const startIntervalDate = timeZoneUtils.setOffsetsToDate(options.start, [-clientOffsets.startDate, appointmentTimezoneOffset]);
+    const startIntervalDate = addOffsets(options.start, -clientOffsets.startDate, appointmentTimezoneOffset);
     const minViewTime = options.min.getTime() - clientOffsets.minViewDate + appointmentTimezoneOffset;
     // NOTE: Shift minViewDate, because recurrent appointment may start before start view date.
     const minViewDate = new Date(minViewTime - duration);
-    const maxViewDate = timeZoneUtils.setOffsetsToDate(options.max, [-clientOffsets.maxViewDate, appointmentTimezoneOffset]);
+    const maxViewDate = addOffsets(options.max, -clientOffsets.maxViewDate, appointmentTimezoneOffset);
 
     // NOTE: Check DST after start date without local timezone offset conversion.
     const startDateDSTDifferenceMs = timeZoneUtils.getDiffBetweenClientTimezoneOffsets(options.start, startIntervalDate);
@@ -102,14 +104,15 @@ class RecurrenceProcessor {
   }
 
   _convertRruleResult(rruleIntervalParams, options, rruleDate) {
-    const convertedBackDate = timeZoneUtils.setOffsetsToDate(rruleDate, [
+    const convertedBackDate = addOffsets(
+      rruleDate,
       ...this._getLocalMachineOffset(rruleDate),
       -options.appointmentTimezoneOffset,
       rruleIntervalParams.startIntervalDateDSTShift,
-    ]);
+    );
     const convertedDateDSTShift = timeZoneUtils.getDiffBetweenClientTimezoneOffsets(convertedBackDate, rruleDate);
     const switchToSummerTime = convertedDateDSTShift < 0;
-    const resultDate = timeZoneUtils.setOffsetsToDate(convertedBackDate, [convertedDateDSTShift]);
+    const resultDate = addOffsets(convertedBackDate, convertedDateDSTShift);
     const resultDateDSTShift = timeZoneUtils.getDiffBetweenClientTimezoneOffsets(resultDate, convertedBackDate);
 
     if (resultDateDSTShift && switchToSummerTime) {
@@ -281,9 +284,10 @@ class RecurrenceProcessor {
     }
 
     if (until) {
-      ruleOptions.until = timeZoneUtils.setOffsetsToDate(
+      ruleOptions.until = addOffsets(
         until,
-        [-timeZoneUtils.getClientTimezoneOffset(until), options.appointmentTimezoneOffset],
+        -timeZoneUtils.getClientTimezoneOffset(until),
+        options.appointmentTimezoneOffset,
       );
     }
 
@@ -299,9 +303,9 @@ class RecurrenceProcessor {
         const rruleTimezoneOffsets = typeof options.getExceptionDateTimezoneOffsets === 'function'
           ? options.getExceptionDateTimezoneOffsets(date)
           : [-timeZoneUtils.getClientTimezoneOffset(date), options.appointmentTimezoneOffset];
-        const exceptionDateInPseudoUtc = timeZoneUtils.setOffsetsToDate(
+        const exceptionDateInPseudoUtc = addOffsets(
           date,
-          rruleTimezoneOffsets,
+          ...rruleTimezoneOffsets,
         );
 
         this.rRuleSet!.exdate(exceptionDateInPseudoUtc);

packages/devextreme/js/__internal/scheduler/appointments/resizing/m_core.ts

@@ -1599,7 +1599,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
       }
 
       const result = this.timeZoneCalculator.createDate(date, 'fromGrid');
-      return dateUtilsTs.addOffsets(result, [-viewOffset]);
+      return dateUtilsTs.addOffsets(result, -viewOffset);
     };
 
     const targetCell = this.getTargetCellData();
@@ -1612,9 +1612,9 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     const cellEndDate = getConvertedFromGrid(targetCell.endDate);
 
     let appointmentStartDate = new Date(appointment.startDate);
-    appointmentStartDate = dateUtilsTs.addOffsets(appointmentStartDate, [-viewOffset]);
+    appointmentStartDate = dateUtilsTs.addOffsets(appointmentStartDate, -viewOffset);
     let appointmentEndDate = new Date(appointment.endDate);
-    appointmentEndDate = dateUtilsTs.addOffsets(appointmentEndDate, [-viewOffset]);
+    appointmentEndDate = dateUtilsTs.addOffsets(appointmentEndDate, -viewOffset);
     let resultedStartDate = cellStartDate ?? appointmentStartDate;
 
     if (!dateUtilsTs.isValidDate(appointmentStartDate)) {
@@ -1635,7 +1635,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
       const startDate = this.timeZoneCalculator.createDate(appointmentStartDate, 'toGrid');
       const timeInMs = startDate.getTime() - dateUtils.trimTime(startDate).getTime();
 
-      const targetCellStartDate = dateUtilsTs.addOffsets(targetCell.startDate, [-viewOffset]);
+      const targetCellStartDate = dateUtilsTs.addOffsets(targetCell.startDate, -viewOffset);
       resultedStartDate = new Date(dateUtils.trimTime(targetCellStartDate).getTime() + timeInMs);
       resultedStartDate = this.timeZoneCalculator.createDate(resultedStartDate, 'fromGrid');
     }
@@ -1667,8 +1667,8 @@ class Scheduler extends SchedulerOptionsBaseWidget {
       }
     }
 
-    result.startDate = dateUtilsTs.addOffsets(result.startDate, [viewOffset]);
-    result.endDate = dateUtilsTs.addOffsets(resultedEndDate, [viewOffset]);
+    result.startDate = dateUtilsTs.addOffsets(result.startDate, viewOffset);
+    result.endDate = dateUtilsTs.addOffsets(resultedEndDate, viewOffset);
     const rawResult = result.source;
 
     setAppointmentGroupValues(rawResult, this.resourceManager.resourceById, targetCell.groups);