Skip to content

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

code review

ThieryMichele633f200be7d
diff --git a/src/components/atomic-crm/contacts/ContactShow.tsx b/src/components/atomic-crm/contacts/ContactShow.tsx
index 96e817a7..ade63c63 100644
--- a/src/components/atomic-crm/contacts/ContactShow.tsx
+++ b/src/components/atomic-crm/contacts/ContactShow.tsx
@@ -125,7 +125,7 @@ const ContactShowContentMobile = () => {
<TabsList className="grid w-full grid-cols-3 h-10">
<TabsTrigger value="notes">Notes</TabsTrigger>
<TabsTrigger value="tasks">
- {`${record.nb_pending_tasks ?? 0} Tasks`}
+ {`${record.nb_tasks ?? 0} Tasks`}
</TabsTrigger>
<TabsTrigger value="details">Details</TabsTrigger>
</TabsList>
diff --git a/src/components/atomic-crm/notes/NotesIterator.tsx b/src/components/atomic-crm/notes/NotesIterator.tsx
index 74c4b148..3f905638 100644
--- a/src/components/atomic-crm/notes/NotesIterator.tsx
+++ b/src/components/atomic-crm/notes/NotesIterator.tsx
@@ -17,7 +17,7 @@ export const NotesIterator = ({
const { infinitePaginationContextValue, isPending, error, data } =
useAddInfinitePagination();
- if (isPending || error || !data) return null;
+ if (isPending || error) return null;
return (
<InfinitePaginationContext.Provider value={infinitePaginationContextValue}>
diff --git a/src/components/atomic-crm/providers/fakerest/dataProvider.ts b/src/components/atomic-crm/providers/fakerest/dataProvider.ts
index 5a950535..0f85b48e 100644
--- a/src/components/atomic-crm/providers/fakerest/dataProvider.ts
+++ b/src/components/atomic-crm/providers/fakerest/dataProvider.ts
@@ -438,7 +438,6 @@ export const dataProvider = withLifecycleCallbacks(
id: contact_id,
data: {
nb_tasks: (contact.nb_tasks ?? 0) + 1,
- nb_pending_tasks: (contact.nb_pending_tasks ?? 0) + 1,
},
previousData: contact,
});
@@ -456,7 +455,7 @@ export const dataProvider = withLifecycleCallbacks(
return params;
},
afterUpdate: async (result, dataProvider) => {
- // update the contact: if the task state has changed, decrement the nb of pending tasks if done else increment it
+ // update the contact: if the task state has changed, decrement the nb of tasks if done else increment it
const { contact_id } = result.data;
const { data: contact } = await dataProvider.getOne("contacts", {
id: contact_id,
@@ -465,10 +464,10 @@ export const dataProvider = withLifecycleCallbacks(
await dataProvider.update("contacts", {
id: contact_id,
data: {
- nb_pending_tasks:
+ nb_tasks:
taskUpdateType === TASK_MARKED_AS_DONE
- ? (contact.nb_pending_tasks ?? 0) - 1
- : (contact.nb_pending_tasks ?? 0) + 1,
+ ? (contact.nb_tasks ?? 0) - 1
+ : (contact.nb_tasks ?? 0) + 1,
},
previousData: contact,
});
@@ -485,7 +484,6 @@ export const dataProvider = withLifecycleCallbacks(
id: contact_id,
data: {
nb_tasks: (contact.nb_tasks ?? 0) - 1,
- nb_pending_tasks: (contact.nb_pending_tasks ?? 0) - 1,
},
previousData: contact,
});
diff --git a/src/components/atomic-crm/types.ts b/src/components/atomic-crm/types.ts
index 5f49e396..7df707df 100644
--- a/src/components/atomic-crm/types.ts
+++ b/src/components/atomic-crm/types.ts
@@ -99,7 +99,6 @@ export type Contact = {
background: string;
phone_jsonb: PhoneNumberAndType[];
nb_tasks?: number;
- nb_pending_tasks?: number;
company_name?: string;
} & Pick<RaRecord, "id">;
diff --git a/supabase/migrations/20260226123636_nb_pending_tasks.sql b/supabase/migrations/20260303095015_nb_tasks_pending_only.sql
similarity index 50%
rename from supabase/migrations/20260226123636_nb_pending_tasks.sql
rename to supabase/migrations/20260303095015_nb_tasks_pending_only.sql
index 93a6774b..7119b9c5 100644
--- a/supabase/migrations/20260226123636_nb_pending_tasks.sql
+++ b/supabase/migrations/20260303095015_nb_tasks_pending_only.sql
@@ -1,28 +1,13 @@
-create or replace view contacts_summary
+drop view if exists contacts_summary;
+
+create view contacts_summary
as
select
- co.id,
- co.first_name,
- co.last_name,
- co.gender,
- co.title,
- co.email_jsonb,
+ co.*,
jsonb_path_query_array(co.email_jsonb, '$[*].email')::text as email_fts,
- co.phone_jsonb,
jsonb_path_query_array(co.phone_jsonb, '$[*].number')::text as phone_fts,
- co.background,
- co.avatar,
- co.first_seen,
- co.last_seen,
- co.has_newsletter,
- co.status,
- co.tags,
- co.company_id,
- co.sales_id,
- co.linkedin_url,
c.name as company_name,
- count(distinct t.id) as nb_tasks,
- count(distinct t.id) filter (where t.done_date is null) as nb_pending_tasks
+ count(distinct t.id) filter (where t.done_date is null) as nb_tasks
from
contacts co
left join