Merge pull request #3592 from chmac/3553-round-two

fix: No longer break recurring tasks if scheduled dates are removed

Author: claremacrae

docs/Getting Started/Recurring Tasks.md

@@ -198,6 +198,8 @@ When a task has multiple dates, one of them is selected as reference date based
 2. Scheduled date
 3. Start date
 
+> If the "Remove scheduled date on recurrence" setting is true, the Start Date will be chosen before the Scheduled date.
+
 If more dates than the reference date exist on the original recurring task, the next occurrence will have the same dates.
 All dates of the next occurring task will have the relative distance to the reference date that they had on the original task.
 

src/Task/Occurrence.ts

@@ -57,6 +57,16 @@ export class Occurrence {
             return window.moment(this.dueDate);
         }
 
+        // If the `removeScheduledDateOnRecurrence` setting is enabled, it does
+        // not make sense to pick the scheduled date over the start date because
+        // the scheduled date will be deleted in the newly created task. So if
+        // this setting is enabled, and there is a start date, we pick that date
+        // now before falling back on the standard logic below.
+        const { removeScheduledDateOnRecurrence } = getSettings();
+        if (removeScheduledDateOnRecurrence && this.startDate) {
+            return window.moment(this.startDate);
+        }
+
         if (this.scheduledDate) {
             return window.moment(this.scheduledDate);
         }

tests/Task/Recurrence.test.ts

@@ -284,7 +284,7 @@ describe('Recurrence - with removeScheduledDateOnRecurrence', () => {
             jest.useRealTimers();
         });
 
-        it.failing('calculates correct start date with "dropScheduledDate" and "when done", with no due date', () => {
+        it('calculates correct start date with "dropScheduledDate" and "when done", with no due date', () => {
             // Arrange
 
             // The task is being completed on the 10th of January.