Skip to content

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

refactor: move task filters to a separate file

Jean-Baptiste Kaiser3b809e8a4c88
diff --git a/registry.json b/registry.json
index bf098e7c..80d2ffcf 100644
--- a/registry.json
+++ b/registry.json
@@ -32,6 +32,10 @@
"path": "src/components/atomic-crm/consts.ts",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/tasks/taskFilters.ts",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/tasks/TasksIterator.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactTasksList.tsx b/src/components/atomic-crm/contacts/ContactTasksList.tsx
index f28f1050..f24aed7d 100644
--- a/src/components/atomic-crm/contacts/ContactTasksList.tsx
+++ b/src/components/atomic-crm/contacts/ContactTasksList.tsx
@@ -1,46 +1,12 @@
-import {
- endOfToday,
- endOfTomorrow,
- endOfWeek,
- getDay,
- startOfToday,
-} from "date-fns";
import { useRecordContext, useGetList } from "ra-core";
import { useState } from "react";
import { Button } from "@/components/ui/button";
import { TasksListFilter } from "../dashboard/TasksListFilter";
import { TaskCreateSheet } from "../tasks/TaskCreateSheet";
+import { taskFilters, isBeforeFriday } from "../tasks/taskFilters";
import type { Contact } from "../types";
-const today = new Date();
-const todayDayOfWeek = getDay(today);
-const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
-const startOfTodayDateISO = startOfToday().toISOString();
-const endOfTodayDateISO = endOfToday().toISOString();
-const endOfTomorrowDateISO = endOfTomorrow().toISOString();
-const endOfWeekDateISO = endOfWeek(today, { weekStartsOn: 0 }).toISOString();
-
-const taskFilters = {
- overdue: { "done_date@is": null, "due_date@lt": startOfTodayDateISO },
- today: {
- "done_date@is": null,
- "due_date@gte": startOfTodayDateISO,
- "due_date@lte": endOfTodayDateISO,
- },
- tomorrow: {
- "done_date@is": null,
- "due_date@gt": endOfTodayDateISO,
- "due_date@lt": endOfTomorrowDateISO,
- },
- thisWeek: {
- "done_date@is": null,
- "due_date@gte": endOfTomorrowDateISO,
- "due_date@lte": endOfWeekDateISO,
- },
- later: { "done_date@is": null, "due_date@gt": endOfWeekDateISO },
-};
-
export const ContactTasksList = () => {
const record = useRecordContext<Contact>();
const [taskCreateOpen, setTaskCreateOpen] = useState(false);
diff --git a/src/components/atomic-crm/dashboard/TasksList.tsx b/src/components/atomic-crm/dashboard/TasksList.tsx
index b79cc5ef..7b757718 100644
--- a/src/components/atomic-crm/dashboard/TasksList.tsx
+++ b/src/components/atomic-crm/dashboard/TasksList.tsx
@@ -1,45 +1,11 @@
-import {
- endOfToday,
- endOfTomorrow,
- endOfWeek,
- getDay,
- startOfToday,
-} from "date-fns";
import { CheckSquare } from "lucide-react";
import { Card } from "@/components/ui/card";
import { AddTask } from "../tasks/AddTask";
+import { taskFilters, isBeforeFriday } from "../tasks/taskFilters";
import { TasksListEmpty } from "./TasksListEmpty";
import { TasksListFilter } from "./TasksListFilter";
-const today = new Date();
-const todayDayOfWeek = getDay(today);
-const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
-const startOfTodayDateISO = startOfToday().toISOString();
-const endOfTodayDateISO = endOfToday().toISOString();
-const endOfTomorrowDateISO = endOfTomorrow().toISOString();
-const endOfWeekDateISO = endOfWeek(today, { weekStartsOn: 0 }).toISOString();
-
-const taskFilters = {
- overdue: { "done_date@is": null, "due_date@lt": startOfTodayDateISO },
- today: {
- "done_date@is": null,
- "due_date@gte": startOfTodayDateISO,
- "due_date@lte": endOfTodayDateISO,
- },
- tomorrow: {
- "done_date@is": null,
- "due_date@gt": endOfTodayDateISO,
- "due_date@lt": endOfTomorrowDateISO,
- },
- thisWeek: {
- "done_date@is": null,
- "due_date@gte": endOfTomorrowDateISO,
- "due_date@lte": endOfWeekDateISO,
- },
- later: { "done_date@is": null, "due_date@gt": endOfWeekDateISO },
-};
-
export const TasksList = () => {
return (
<div className="flex flex-col gap-2">
@@ -72,4 +38,4 @@ export const TasksListContent = () => {
<TasksListFilter title="Later" filter={taskFilters.later} />
</div>
);
-};
\ No newline at end of file
+};
diff --git a/src/components/atomic-crm/tasks/taskFilters.ts b/src/components/atomic-crm/tasks/taskFilters.ts
new file mode 100644
index 00000000..15fe4b70
--- /dev/null
+++ b/src/components/atomic-crm/tasks/taskFilters.ts
@@ -0,0 +1,35 @@
+import {
+ endOfToday,
+ endOfTomorrow,
+ endOfWeek,
+ getDay,
+ startOfToday,
+} from "date-fns";
+
+const today = new Date();
+const todayDayOfWeek = getDay(today);
+export const isBeforeFriday = todayDayOfWeek < 5; // Friday is represented by 5
+const startOfTodayDateISO = startOfToday().toISOString();
+const endOfTodayDateISO = endOfToday().toISOString();
+const endOfTomorrowDateISO = endOfTomorrow().toISOString();
+const endOfWeekDateISO = endOfWeek(today, { weekStartsOn: 0 }).toISOString();
+
+export const taskFilters = {
+ overdue: { "done_date@is": null, "due_date@lt": startOfTodayDateISO },
+ today: {
+ "done_date@is": null,
+ "due_date@gte": startOfTodayDateISO,
+ "due_date@lte": endOfTodayDateISO,
+ },
+ tomorrow: {
+ "done_date@is": null,
+ "due_date@gt": endOfTodayDateISO,
+ "due_date@lt": endOfTomorrowDateISO,
+ },
+ thisWeek: {
+ "done_date@is": null,
+ "due_date@gte": endOfTomorrowDateISO,
+ "due_date@lte": endOfWeekDateISO,
+ },
+ later: { "done_date@is": null, "due_date@gt": endOfWeekDateISO },
+};