remove nb_task and nb_notes, fetch in database instead

adguernier · adguernier · commit 7d8bb02f4623 · 2024-06-20T15:35:15.000+02:00
diff --git a/packages/demo/db-seed.ts b/packages/demo/db-seed.ts
@@ -110,7 +110,7 @@ async function main() {
     });
     const { data: persistedDeals, error: errorDeals } = await supabase
         .from('deals')
-        .insert(deals.map(({ nb_notes, id, ...deal }) => deal))
+        .insert(deals.map(({ id, ...deal }) => deal))
         .select();
 
     if (errorDeals) {
diff --git a/packages/demo/src/companies/CompanyShow.tsx b/packages/demo/src/companies/CompanyShow.tsx
@@ -39,6 +39,7 @@ import { LogoField } from './LogoField';
 import { CompanyAside } from './CompanyAside';
 import { Company, Deal, Contact } from '../types';
 import { stageNames } from '../deals/stages';
+import { NbRelations } from '../misc/NbRelations';
 
 export const CompanyShow = () => (
     <ShowBase>
@@ -185,16 +186,16 @@ const ContactsIterator = () => {
                             secondary={
                                 <>
                                     {contact.title}
-                                    {contact.nb_notes
-                                        ? ` - ${contact.nb_notes} note${
-                                              contact.nb_notes > 1 ? 's' : ''
-                                          }`
-                                        : ''}
-                                    {contact.nb_tasks
-                                        ? ` - ${contact.nb_tasks} task${
-                                              contact.nb_tasks > 1 ? 's' : ''
-                                          }`
-                                        : ''}
+                                    <NbRelations
+                                        label="note"
+                                        reference="contactNotes"
+                                        target="contact_id"
+                                    />
+                                    <NbRelations
+                                        label="task"
+                                        reference="tasks"
+                                        target="contact_id"
+                                    />
                                     &nbsp; &nbsp;
                                     <TagsList />
                                 </>
diff --git a/packages/demo/src/contacts/ContactList.tsx b/packages/demo/src/contacts/ContactList.tsx
@@ -34,6 +34,7 @@ import { Status } from '../misc/Status';
 import { TagsList } from './TagsList';
 import { ContactListFilter } from './ContactListFilter';
 import { Contact } from '../types';
+import { NbRelations } from '../misc/NbRelations';
 
 const ContactListContent = () => {
     const {
@@ -91,20 +92,16 @@ const ContactListContent = () => {
                                         >
                                             <TextField source="name" />
                                         </ReferenceField>
-                                        {contact.nb_notes
-                                            ? ` - ${contact.nb_notes} note${
-                                                  contact.nb_notes > 1
-                                                      ? 's'
-                                                      : ''
-                                              }`
-                                            : ''}
-                                        {contact.nb_tasks
-                                            ? ` - ${contact.nb_tasks} task${
-                                                  contact.nb_tasks > 1
-                                                      ? 's'
-                                                      : ''
-                                              }`
-                                            : ''}
+                                        <NbRelations
+                                            label="note"
+                                            reference="contactNotes"
+                                            target="contact_id"
+                                        />
+                                        <NbRelations
+                                            label="task"
+                                            reference="tasks"
+                                            target="contact_id"
+                                        />
                                         &nbsp;&nbsp;
                                         <TagsList />
                                     </>
diff --git a/packages/demo/src/dataGenerator/contactNotes.ts b/packages/demo/src/dataGenerator/contactNotes.ts
@@ -10,7 +10,6 @@ export const generateContactNotes = (db: Db): ContactNote[] => {
     return Array.from(Array(1200).keys()).map(id => {
         const contact = random.arrayElement(db.contacts);
         const date = randomDate(new Date(contact.first_seen)).toISOString();
-        contact.nb_notes++;
         contact.last_seen = date > contact.last_seen ? date : contact.last_seen;
         return {
             id,
diff --git a/packages/demo/src/dataGenerator/contacts.ts b/packages/demo/src/dataGenerator/contacts.ts
@@ -76,7 +76,6 @@ export const generateContacts = (db: Db): Contact[] => {
                 .arrayElements(db.tags, random.arrayElement([0, 0, 0, 1, 1, 2]))
                 .map(tag => tag.id), // finalize
             sales_id: company.sales_id,
-            nb_notes: 0,
         };
     });
 };
diff --git a/packages/demo/src/dataGenerator/dealNotes.ts b/packages/demo/src/dataGenerator/dealNotes.ts
@@ -12,7 +12,6 @@ export const generateDealNotes = (db: Db) => {
         const date = company
             ? randomDate(new Date(company.created_at)).toISOString()
             : randomDate().toISOString();
-        deal.nb_notes++;
         return {
             id,
             deal_id: deal.id,
diff --git a/packages/demo/src/dataGenerator/deals.ts b/packages/demo/src/dataGenerator/deals.ts
@@ -51,7 +51,6 @@ export const generateDeals = (db: Db): Deal[] => {
             ).toISOString(),
             sales_id: company.sales_id,
             index: 0,
-            nb_notes: 0,
         };
     });
     // compute index based on stage
diff --git a/packages/demo/src/misc/NbRelations.tsx b/packages/demo/src/misc/NbRelations.tsx
@@ -0,0 +1,50 @@
+import { Typography, CircularProgress } from '@mui/material';
+import {
+    useRecordContext,
+    useReferenceManyFieldController,
+    useTimeout,
+} from 'ra-core';
+import ErrorIcon from '@mui/icons-material/Error';
+
+export const NbRelations = (props: NbNotesProps) => {
+    const record = useRecordContext(props);
+    const { reference, target, label, timeout = 1000 } = props;
+
+    const oneSecondHasPassed = useTimeout(timeout);
+
+    const { isLoading, error, total } = useReferenceManyFieldController({
+        page: 1,
+        perPage: 1,
+        record,
+        reference,
+        source: 'id',
+        target,
+    });
+
+    const body = isLoading ? (
+        oneSecondHasPassed ? (
+            <CircularProgress size={14} />
+        ) : (
+            ''
+        )
+    ) : error ? (
+        <ErrorIcon color="error" fontSize="small" titleAccess="error" />
+    ) : total ? (
+        `- ${total} ${label}${total > 1 ? 's' : ''}`
+    ) : (
+        ''
+    );
+
+    return (
+        <Typography component="span" variant="body2">
+            {body}
+        </Typography>
+    );
+};
+
+export interface NbNotesProps {
+    reference: string;
+    target: string;
+    timeout?: number;
+    label: string;
+}
diff --git a/packages/demo/src/notes/Note.tsx b/packages/demo/src/notes/Note.tsx
@@ -51,7 +51,6 @@ export const Note = ({
                 notify('Note deleted', { type: 'info', undoable: true });
                 update(reference, {
                     id: record.id,
-                    data: { nb_notes: record.nb_notes - 1 },
                     previousData: record,
                 });
             },
diff --git a/packages/demo/src/types.ts b/packages/demo/src/types.ts
@@ -37,7 +37,6 @@ export interface Contact extends RaRecord {
     tags: Identifier[];
     gender: string;
     sales_id: Identifier;
-    nb_notes: number;
     status: string;
     background: string;
 }
@@ -63,7 +62,6 @@ export interface Deal extends RaRecord {
     start_at: string;
     sales_id: Identifier;
     index: number;
-    nb_notes: number;
 }
 
 export interface Tag extends RaRecord {
diff --git a/supabase/migrations/20230126140204_init.sql b/supabase/migrations/20230126140204_init.sql
@@ -44,8 +44,7 @@ create table "public"."contacts" (
     "has_newsletter" boolean not null,
     "status" character varying not null,
     "tags" bigint[] not null,
-    "sales_id" bigint not null,
-    "nb_notes" smallint not null default 0
+    "sales_id" bigint not null
 );
 
 
@@ -72,8 +71,7 @@ create table "public"."deals" (
     "updated_at" timestamp without time zone not null,
     "start_at" timestamp without time zone not null,
     "sales_id" bigint not null,
-    "index" bigint not null,
-    "nb_notes" smallint not null default 0
+    "index" bigint not null
 );
 
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ export interface Contact extends RaRecord {`
`37`	`37`	`tags: Identifier[];`
`38`	`38`	`gender: string;`
`39`	`39`	`sales_id: Identifier;`
`40`		`- nb_notes: number;`
`41`	`40`	`status: string;`
`42`	`41`	`background: string;`
`43`	`42`	`}`
`@@ -63,7 +62,6 @@ export interface Deal extends RaRecord {`
`63`	`62`	`start_at: string;`
`64`	`63`	`sales_id: Identifier;`
`65`	`64`	`index: number;`
`66`		`- nb_notes: number;`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`export interface Tag extends RaRecord {`