A full-featured CRM built with React, shadcn/ui, and Supabase.
refactor TasksListFilter to query all tasks in one go
ThieryMichel184ea25ad21e
diff --git a/src/components/atomic-crm/contacts/ContactTasksList.tsx b/src/components/atomic-crm/contacts/ContactTasksList.tsxindex faed8fe3..7ddf451e 100644--- a/src/components/atomic-crm/contacts/ContactTasksList.tsx+++ b/src/components/atomic-crm/contacts/ContactTasksList.tsx@@ -5,7 +5,6 @@ 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";export const ContactTasksList = () => {@@ -55,35 +54,5 @@ export const ContactTasksList = () => {);}- return (- <div className="flex flex-col gap-4">- <TasksListFilter- title="Overdue"- filter={taskFilters.overdue}- filterByContact={record.id}- />- <TasksListFilter- title="Today"- filter={taskFilters.today}- filterByContact={record.id}- />- <TasksListFilter- title="Tomorrow"- filter={taskFilters.tomorrow}- filterByContact={record.id}- />- {isBeforeFriday && (- <TasksListFilter- title="This week"- filter={taskFilters.thisWeek}- filterByContact={record.id}- />- )}- <TasksListFilter- title="Later"- filter={taskFilters.later}- filterByContact={record.id}- />- </div>- );+ return <TasksListFilter filterByContact={record.id} />;};diff --git a/src/components/atomic-crm/dashboard/TasksListFilter.tsx b/src/components/atomic-crm/dashboard/TasksListFilter.tsxindex 25eb49e9..e4aa976a 100644--- a/src/components/atomic-crm/dashboard/TasksListFilter.tsx+++ b/src/components/atomic-crm/dashboard/TasksListFilter.tsx@@ -9,38 +9,35 @@ import {import { TasksIterator } from "../tasks/TasksIterator";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 { isBeforeFriday } from "../tasks/taskFilters";-export const TasksListFilter = ({- title,- filter,- filterByContact,-}: {+const today = new Date();+const startOfTodayDate = startOfToday();+const endOfTodayDate = endOfToday();+const endOfTomorrowDate = endOfTomorrow();+const endOfWeekDate = endOfWeek(today, { weekStartsOn: 0 });++type TaskListProps = {+ isPending: boolean;+ tasks: any[];+ total: number;title: string;- filter: any;filterByContact?: Identifier;-}) => {- const { identity } = useGetIdentity();- const isMobile = useIsMobile();-- const {- data: tasks,- total,- isPending,- } = useGetList(- "tasks",- {- pagination: { page: 1, perPage: 100 },- sort: { field: "due_date", order: "ASC" },- filter: {- ...filter,- ...(filterByContact != null- ? { contact_id: filterByContact }- : { sales_id: identity?.id }),- },- },- { enabled: filterByContact != null ? true : !!identity },- );+ isMobile: boolean;+};+const TaskList = ({+ isPending,+ tasks,+ total,+ title,+ filterByContact,+ isMobile,+}: TaskListProps) => {const listContext = useList({data: tasks,isPending,@@ -77,3 +74,118 @@ export const TasksListFilter = ({</div>);};++export const TasksListFilter = ({+ filterByContact,+}: {+ filterByContact?: Identifier;+}) => {+ const { identity } = useGetIdentity();+ const isMobile = useIsMobile();++ const {+ data: tasks,+ total,+ isPending,+ } = useGetList(+ "tasks",+ {+ pagination: { page: 1, perPage: 1000 },+ sort: { field: "due_date", order: "ASC" },+ filter: {+ ...(filterByContact != null+ ? { contact_id: filterByContact }+ : { sales_id: identity?.id }),+ },+ },+ { enabled: filterByContact != null ? true : !!identity },+ );++ const overdueTasks = tasks?.filter(+ (task) =>+ task.done_date == null || new Date(task.due_date) < startOfTodayDate,+ );++ const todayTasks = tasks?.filter((task) => {+ if (task.done_date != null) {+ return false;+ }+ const dueDate = new Date(task.due_date);+ return dueDate >= startOfTodayDate && dueDate < endOfTodayDate;+ });++ const tomorrowTasks = tasks?.filter((task) => {+ if (task.done_date != null) {+ return false;+ }+ const dueDate = new Date(task.due_date);+ return dueDate >= endOfTodayDate && dueDate < endOfTomorrowDate;+ });++ const thisWeekTasks = tasks?.filter((task) => {+ if (task.done_date != null) {+ return false;+ }+ const dueDate = new Date(task.due_date);+ return dueDate >= endOfTomorrowDate && dueDate < endOfWeekDate;+ });++ const laterTasks = tasks?.filter((task) => {+ if (task.done_date != null) {+ return false;+ }+ const dueDate = new Date(task.due_date);+ return dueDate >= endOfWeekDate;+ });++ if (!tasks || !total || isPending) {+ return null;+ }++ return (+ <div className="flex flex-col gap-4">+ <TaskList+ isPending={isPending}+ tasks={overdueTasks!}+ total={overdueTasks!.length}+ title="Overdue"+ filterByContact={filterByContact}+ isMobile={isMobile}+ />+ <TaskList+ isPending={isPending}+ tasks={todayTasks!}+ total={todayTasks!.length}+ title="Today"+ filterByContact={filterByContact}+ isMobile={isMobile}+ />+ <TaskList+ isPending={isPending}+ tasks={tomorrowTasks!}+ total={tomorrowTasks!.length}+ title="Tomorrow"+ filterByContact={filterByContact}+ isMobile={isMobile}+ />+ {!filterByContact && isBeforeFriday && (+ <TaskList+ isPending={isPending}+ tasks={thisWeekTasks!}+ total={thisWeekTasks!.length}+ title="This week"+ filterByContact={filterByContact}+ isMobile={isMobile}+ />+ )}+ <TaskList+ isPending={isPending}+ tasks={laterTasks!}+ total={laterTasks!.length}+ title="Later"+ filterByContact={filterByContact}+ isMobile={isMobile}+ />+ </div>+ );+};diff --git a/src/components/atomic-crm/tasks/TasksListContent.tsx b/src/components/atomic-crm/tasks/TasksListContent.tsxindex 5e1d6fb6..a8d8c534 100644--- a/src/components/atomic-crm/tasks/TasksListContent.tsx+++ b/src/components/atomic-crm/tasks/TasksListContent.tsx@@ -1,4 +1,3 @@-import { taskFilters, isBeforeFriday } from "./taskFilters";import { TasksListEmpty } from "../dashboard/TasksListEmpty";import { TasksListFilter } from "../dashboard/TasksListFilter";@@ -6,13 +5,7 @@ export const TasksListContent = () => {return (<div className="flex flex-col gap-4"><TasksListEmpty />- <TasksListFilter title="Overdue" filter={taskFilters.overdue} />- <TasksListFilter title="Today" filter={taskFilters.today} />- <TasksListFilter title="Tomorrow" filter={taskFilters.tomorrow} />- {isBeforeFriday && (- <TasksListFilter title="This week" filter={taskFilters.thisWeek} />- )}- <TasksListFilter title="Later" filter={taskFilters.later} />+ <TasksListFilter /></div>);};