fix(react-scheduler): fix deleting first oppointment (#3582)

Author: Krijovnick

packages/dx-scheduler-core/src/plugins/editing-state/helpers.test.ts

@@ -71,6 +71,23 @@ describe('EditingState', () => {
         const changes = deleteCurrent(appointmentData);
         expect(changes).toEqual({ deleted: 0 });
       });
+
+      it('should remove first appointment for never ending sequence', () => {
+        const appointmentData = {
+          id: 0,
+          startDate: new Date(Date.UTC(2019, 6, 15, 14, 20)),
+          endDate: new Date(Date.UTC(2019, 6, 15, 16)),
+          rRule: 'FREQ=DAILY',
+          parentData: {
+            rRule: 'FREQ=DAILY',
+            startDate: new Date(Date.UTC(2019, 6, 15, 14, 20)),
+            endDate: new Date(Date.UTC(2019, 6, 15, 16)),
+          },
+        };
+
+        const changes = deleteCurrent(appointmentData);
+        expect(changes).toEqual({ changed: { 0: { exDate: '20190715T142000Z' } } });
+      });
     });
 
     describe('#deleteCurrentAndFollowing', () => {

packages/dx-scheduler-core/src/plugins/editing-state/helpers.ts

@@ -52,14 +52,20 @@ const configureDateSequence: MakeDateSequenceFn = (rRule, exDate, prevStartDate,
     dtstart: prevStartDateUTC,
   }));
   if (currentOptions.count || currentOptions.until) {
-    return rruleSet.all()
+    return {
+      options: currentOptions,
+      dates: rruleSet.all()
       // we shouldn't use `new Date(string)` because this function has different results in Safari
-      .map(nextDate => moment(formatDateToString(nextDate)).toDate());
+      .map(nextDate => moment(formatDateToString(nextDate)).toDate()),
+    };
   }
   const leftBound = prevStartDateUTC;
   const rightBound = moment(getUTCDate(nextStartDate!)).toDate();
-  return rruleSet.between(leftBound, rightBound, true)
-    .map(nextDate => moment(formatDateToString(nextDate)).toDate());
+  return {
+    options: currentOptions,
+    dates: rruleSet.between(leftBound, rightBound, true)
+    .map(nextDate => moment(formatDateToString(nextDate)).toDate()),
+  };
 };
 
 const configureICalendarRules = (rRule: string | undefined, options: object) => {
@@ -100,22 +106,22 @@ const changeCurrentAndFollowing: ChangeFn = (appointmentData, changes, changeAll
 const getAppointmentSequenceData = (
   prevStartDate: Date, startDate: Date, exDate: string, rRule: string | undefined,
 ) => {
-  const initialSequence: Date[] = configureDateSequence(rRule, exDate,
+  const initialSequence = configureDateSequence(rRule, exDate,
     moment.utc(prevStartDate).toDate(), moment.utc(startDate).toDate(),
-  );
+  ).dates;
   const currentChildIndex = initialSequence
     .findIndex(date => moment(date).isSame(startDate as Date));
   return { initialSequence, currentChildIndex };
 };
 
 export const deleteCurrent: DeleteFn = (appointmentData) => {
-  const currentSequence: Date[] = configureDateSequence(
+  const { options, dates } = configureDateSequence(
     appointmentData.rRule, appointmentData.exDate,
     moment.utc(appointmentData.parentData.startDate).toDate(),
     moment.utc(appointmentData.startDate).toDate(),
   );
 
-  if (currentSequence.length === 1) {
+  if ((options.count || options.until) && dates.length === 1) {
     return deleteAll(appointmentData);
   }
 

packages/dx-scheduler-core/src/types/editing-state.types.ts

@@ -1,3 +1,4 @@
+import { Options } from 'rrule';
 import { AppointmentModel, AppointmentId } from './scheduler-core.types';
 
 export type AppointmentChanges = { [key: string]: object };
@@ -13,7 +14,7 @@ export type PreCommitChangesFn = (
 /** @internal */
 export type MakeDateSequenceFn = (
   rRule: string | undefined, exDate: string | undefined, prevStartDate: Date, date: Date,
-) => Array<Date>;
+) => { options: Partial<Options>, dates: Array<Date> };
 
 /** @internal */
 export type EditFn = (appointmentData: Partial<AppointmentModel>, changes: Changes) => ChangeSet;