Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): let a new weekly rule follow the due date's weekday

olozano-079d01bc1a83
diff --git a/apps/web/src/components/shared/modals/create-task-modal.test.tsx b/apps/web/src/components/shared/modals/create-task-modal.test.tsx
index 0c575d98e..e195bd51e 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.test.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.test.tsx
@@ -348,6 +348,10 @@ describe("CreateTaskModal", () => {
}),
),
);
+ // The rule follows the due date's weekday until the user picks days.
+ expect(createTask.mock.calls.at(-1)?.[0].recurrence).not.toHaveProperty(
+ "weekdays",
+ );
});
it("waits for the chosen project's columns before submitting", async () => {
diff --git a/apps/web/src/components/task/task-due-date-picker.tsx b/apps/web/src/components/task/task-due-date-picker.tsx
index 397482834..45979e256 100644
--- a/apps/web/src/components/task/task-due-date-picker.tsx
+++ b/apps/web/src/components/task/task-due-date-picker.tsx
@@ -67,7 +67,7 @@ export default function TaskDueDatePicker({
recurrence && "bg-accent text-foreground",
)}
onClick={() =>
- onRecurrenceChange(recurrence ? null : defaultRecurrence(dueDate))
+ onRecurrenceChange(recurrence ? null : defaultRecurrence())
}
>
<Repeat className="h-4 w-4" />
diff --git a/apps/web/src/components/task/task-recurrence-settings.tsx b/apps/web/src/components/task/task-recurrence-settings.tsx
index 681787fda..46496ae63 100644
--- a/apps/web/src/components/task/task-recurrence-settings.tsx
+++ b/apps/web/src/components/task/task-recurrence-settings.tsx
@@ -26,17 +26,16 @@ const PATTERNS: Pattern[] = [
];
const FREQUENCIES: Frequency[] = ["daily", "weekly", "monthly", "yearly"];
-// Weekdays only belong to weekly rules; a new weekly rule starts on the due
-// date's weekday.
+// Weekdays only belong to weekly rules. Until the user picks some, a weekly
+// rule repeats on the due date's weekday.
function withFrequency(
recurrence: TaskRecurrence,
frequency: Frequency,
interval: number,
- defaultWeekday: number,
): TaskRecurrence {
- const { weekdays, ...rule } = recurrence;
+ const { weekdays: _, ...rule } = recurrence;
return frequency === "weekly"
- ? { ...rule, frequency, interval, weekdays: weekdays ?? [defaultWeekday] }
+ ? { ...recurrence, frequency, interval }
: { ...rule, frequency, interval };
}
@@ -74,7 +73,7 @@ export default function TaskRecurrenceSettings({
};
const change = (frequency: Frequency, interval: number) =>
- onChange(withFrequency(recurrence, frequency, interval, defaultWeekday));
+ onChange(withFrequency(recurrence, frequency, interval));
return (
<div className="flex flex-col gap-3 border-t border-border p-3">
diff --git a/apps/web/src/lib/default-recurrence.ts b/apps/web/src/lib/default-recurrence.ts
index 906310230..b8abb9199 100644
--- a/apps/web/src/lib/default-recurrence.ts
+++ b/apps/web/src/lib/default-recurrence.ts
@@ -1,11 +1,11 @@
import type { TaskRecurrence } from "@/types/task/recurrence";
-// Turning repeat on starts weekly, on the due date's weekday.
-export function defaultRecurrence(dueDate: Date | undefined): TaskRecurrence {
+// Turning repeat on starts weekly. Without weekdays the rule repeats on the due
+// date's weekday, so it follows the due date until the user picks days.
+export function defaultRecurrence(): TaskRecurrence {
return {
frequency: "weekly",
interval: 1,
- weekdays: [(dueDate ?? new Date()).getDay()],
// Keeps the next due date on the same local day across DST changes.
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
};