Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

extract taskPredicate and test them

ThieryMichele2753dc53886
diff --git a/src/components/atomic-crm/dashboard/TasksListByDueDate.tsx b/src/components/atomic-crm/dashboard/TasksListByDueDate.tsx
index 8cdd7430..2daeeec0 100644
--- a/src/components/atomic-crm/dashboard/TasksListByDueDate.tsx
+++ b/src/components/atomic-crm/dashboard/TasksListByDueDate.tsx
@@ -1,62 +1,15 @@
import { type Identifier, useGetIdentity, useGetList } from "ra-core";
import { useIsMobile } from "@/hooks/use-mobile";
-import { startOfToday } from "date-fns/startOfToday";
-import { endOfToday } from "date-fns/endOfToday";
-import { endOfTomorrow } from "date-fns/endOfTomorrow";
-import { endOfWeek } from "date-fns/endOfWeek";
-
-import { getDay } from "date-fns";
import { TaskListFilter } from "./TasksListFilter";
-
-const today = new Date();
-const todayDayOfWeek = getDay(today);
-const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
-const startOfTodayDate = startOfToday();
-const endOfTodayDate = endOfToday();
-const endOfTomorrowDate = endOfTomorrow();
-const endOfWeekDate = endOfWeek(today, { weekStartsOn: 0 });
-
-type Task = {
- id: Identifier;
- due_date: string;
- done_date: string | null;
-};
-
-const isOverdue = (task: Task) =>
- task.done_date == null || new Date(task.due_date) < startOfTodayDate;
-
-const isDueToday = (task: Task) => {
- if (task.done_date != null) {
- return false;
- }
- const dueDate = new Date(task.due_date);
- return dueDate >= startOfTodayDate && dueDate < endOfTodayDate;
-};
-
-const isDueTomorrow = (task: Task) => {
- if (task.done_date != null) {
- return false;
- }
- const dueDate = new Date(task.due_date);
- return dueDate >= endOfTodayDate && dueDate < endOfTomorrowDate;
-};
-
-const isDueThisWeek = (task: Task) => {
- if (task.done_date != null) {
- return false;
- }
- const dueDate = new Date(task.due_date);
- return dueDate >= endOfTomorrowDate && dueDate < endOfWeekDate;
-};
-
-const isDueLater = (task: Task) => {
- if (task.done_date != null) {
- return false;
- }
- const dueDate = new Date(task.due_date);
- return dueDate >= endOfWeekDate;
-};
+import {
+ isBeforeFriday,
+ isDueLater,
+ isDueThisWeek,
+ isDueToday,
+ isDueTomorrow,
+ isOverdue,
+} from "./tasksPredicate";
export const TasksListByDueDate = ({
filterByContact,
diff --git a/src/components/atomic-crm/dashboard/tasksPredicate.test.ts b/src/components/atomic-crm/dashboard/tasksPredicate.test.ts
new file mode 100644
index 00000000..f21d1f45
--- /dev/null
+++ b/src/components/atomic-crm/dashboard/tasksPredicate.test.ts
@@ -0,0 +1,104 @@
+import { describe, it, expect } from "vitest";
+import {
+ isOverdue,
+ isDueToday,
+ isDueTomorrow,
+ isDueThisWeek,
+ isDueLater,
+} from "./tasksPredicate";
+
+const today = new Date();
+const iso = (d: Date) => d.toISOString();
+
+const task = (due: Date, done: boolean = false) => ({
+ id: 1,
+ due_date: iso(due),
+ done_date: done ? iso(today) : null,
+});
+
+describe("tasksPredicate", () => {
+ it("isOverdue returns true for task with due_date in the past", () => {
+ const overdue = task(new Date(today.getTime() - 86400000));
+ expect(isOverdue(overdue)).toBe(true);
+ });
+
+ it("isOverdue returns false for done", () => {
+ const done = task(today, true);
+ expect(isOverdue(done)).toBe(false);
+ });
+
+ it("isDueToday returns true for due_date before the end of the current day", () => {
+ const t = task(today);
+ expect(isDueToday(t)).toBe(true);
+ });
+
+ it("isDueToday returns false for due_date after the end of the current day", () => {
+ const t = task(new Date(today.getTime() + 86400000));
+ expect(isDueToday(t)).toBe(false);
+ });
+
+ it("isDueToday returns false for dueDate in the past", () => {
+ const t = task(new Date(today.getTime() - 86400000));
+ expect(isDueToday(t)).toBe(false);
+ });
+
+ it("isDueToday returns false for done", () => {
+ const t = task(today, true);
+ expect(isDueToday(t)).toBe(false);
+ });
+
+ it("isDueTomorrow returns true for tomorrow", () => {
+ const tomorrow = task(new Date(today.getTime() + 86400000));
+ expect(isDueTomorrow(tomorrow)).toBe(true);
+ });
+
+ it("isDueTomorrow returns false for due_date after the end of tomorrow", () => {
+ const afterTomorrow = task(new Date(today.getTime() + 2 * 86400000));
+ expect(isDueTomorrow(afterTomorrow)).toBe(false);
+ });
+
+ it("isDueTomorrow returns false for due_date before the end of today", () => {
+ const t = task(today);
+ expect(isDueTomorrow(t)).toBe(false);
+ });
+
+ it("isDueTomorrow returns false for done", () => {
+ const tomorrow = task(new Date(today.getTime() + 86400000), true);
+ expect(isDueTomorrow(tomorrow)).toBe(false);
+ });
+
+ it("isDueThisWeek returns true for 3 days from now", () => {
+ const thisWeek = task(new Date(today.getTime() + 3 * 86400000));
+ expect(isDueThisWeek(thisWeek)).toBe(true);
+ });
+
+ it("isDueThisWeek returns false for due_date after the end of the week", () => {
+ const afterThisWeek = task(new Date(today.getTime() + 7 * 86400000));
+ expect(isDueThisWeek(afterThisWeek)).toBe(false);
+ });
+
+ it("isDueThisWeek returns false for due_date before the end of tomorrow", () => {
+ const tomorrow = task(new Date(today.getTime() + 86400000));
+ expect(isDueThisWeek(tomorrow)).toBe(false);
+ });
+
+ it("isDueThisWeek returns false for done", () => {
+ const thisWeek = task(new Date(today.getTime() + 3 * 86400000), true);
+ expect(isDueThisWeek(thisWeek)).toBe(false);
+ });
+
+ it("isDueLater returns true for 7 days from now", () => {
+ const later = task(new Date(today.getTime() + 7 * 86400000));
+ expect(isDueLater(later)).toBe(true);
+ });
+
+ it("isDueLater returns false for due_date before the end of the week", () => {
+ const thisWeek = task(new Date(today.getTime() + 3 * 86400000));
+ expect(isDueLater(thisWeek)).toBe(false);
+ });
+
+ it("isDueLater returns false for done", () => {
+ const later = task(new Date(today.getTime() + 7 * 86400000), true);
+ expect(isDueLater(later)).toBe(false);
+ });
+});
diff --git a/src/components/atomic-crm/dashboard/tasksPredicate.ts b/src/components/atomic-crm/dashboard/tasksPredicate.ts
new file mode 100644
index 00000000..3fbfaa83
--- /dev/null
+++ b/src/components/atomic-crm/dashboard/tasksPredicate.ts
@@ -0,0 +1,56 @@
+import { startOfToday } from "date-fns/startOfToday";
+import { endOfToday } from "date-fns/endOfToday";
+import { endOfTomorrow } from "date-fns/endOfTomorrow";
+import { endOfWeek } from "date-fns/endOfWeek";
+
+import { getDay } from "date-fns";
+import type { Identifier } from "ra-core";
+
+const today = new Date();
+const todayDayOfWeek = getDay(today);
+export const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
+const startOfTodayDate = startOfToday();
+const endOfTodayDate = endOfToday();
+const endOfTomorrowDate = endOfTomorrow();
+const endOfWeekDate = endOfWeek(today, { weekStartsOn: 0 });
+
+type Task = {
+ id: Identifier;
+ due_date: string;
+ done_date: string | null;
+};
+
+export const isOverdue = (task: Task) =>
+ task.done_date == null || new Date(task.due_date) < startOfTodayDate;
+
+export const isDueToday = (task: Task) => {
+ if (task.done_date != null) {
+ return false;
+ }
+ const dueDate = new Date(task.due_date);
+ return dueDate >= startOfTodayDate && dueDate < endOfTodayDate;
+};
+
+export const isDueTomorrow = (task: Task) => {
+ if (task.done_date != null) {
+ return false;
+ }
+ const dueDate = new Date(task.due_date);
+ return dueDate >= endOfTodayDate && dueDate < endOfTomorrowDate;
+};
+
+export const isDueThisWeek = (task: Task) => {
+ if (task.done_date != null) {
+ return false;
+ }
+ const dueDate = new Date(task.due_date);
+ return dueDate >= endOfTomorrowDate && dueDate < endOfWeekDate;
+};
+
+export const isDueLater = (task: Task) => {
+ if (task.done_date != null) {
+ return false;
+ }
+ const dueDate = new Date(task.due_date);
+ return dueDate >= endOfWeekDate;
+};