Fix(crm): Remove start_at from deals as it is the same as created_at

marmelab · Jul 26, 2024 · 8df44f2 · 8df44f2
1 parent a1dda3c
commit 8df44f2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/examples/crm/src/dashboard/DealsChart.tsx b/examples/crm/src/dashboard/DealsChart.tsx
@@ -18,7 +18,7 @@ export const DealsChart = () => {
     const { data, isPending } = useGetList<Deal>('deals', {
         pagination: { perPage: 100, page: 1 },
         sort: {
-            field: 'start_at',
+            field: 'created_at',
             order: 'ASC',
         },
     });
@@ -27,7 +27,7 @@ export const DealsChart = () => {
         if (!data) return [];
         const dealsByMonth = data.reduce((acc, deal) => {
             const month = startOfMonth(
-                deal.start_at ?? new Date()
+                deal.created_at ?? new Date()
             ).toISOString();
             if (!acc[month]) {
                 acc[month] = [];
@@ -36,6 +36,8 @@ export const DealsChart = () => {
             return acc;
         }, {} as any);
 
+        console.log(dealsByMonth);
+
         const amountByMonth = Object.keys(dealsByMonth).map(month => {
             return {
                 date: format(month, 'MMM'),

diff --git a/examples/crm/src/dataGenerator/deals.ts b/examples/crm/src/dataGenerator/deals.ts
@@ -22,10 +22,9 @@ export const generateDeals = (db: Db): Deal[] => {
             new Date(company.created_at)
         ).toISOString();
 
-        const start_at = created_at;
         const expected_closing_date = randomDate(
-            new Date(start_at),
-            add(new Date(start_at), { months: 6 })
+            new Date(created_at),
+            add(new Date(created_at), { months: 6 })
         ).toISOString();
 
         return {
@@ -37,9 +36,8 @@ export const generateDeals = (db: Db): Deal[] => {
             stage: random.arrayElement(defaultDealStages).value,
             description: lorem.paragraphs(random.number({ min: 1, max: 4 })),
             amount: random.number(1000) * 100,
-            created_at: created_at,
+            created_at,
             updated_at: randomDate(new Date(created_at)).toISOString(),
-            start_at,
             expected_closing_date,
             sales_id: company.sales_id,
             index: 0,

diff --git a/examples/crm/src/dataProvider.ts b/examples/crm/src/dataProvider.ts
@@ -411,7 +411,6 @@ export const dataProvider = withLifecycleCallbacks(
                     ...params,
                     data: {
                         ...params.data,
-                        start_at: new Date().toISOString(),
                         created_at: new Date().toISOString(),
                         updated_at: new Date().toISOString(),
                     },

diff --git a/examples/crm/src/deals/DealCreate.tsx b/examples/crm/src/deals/DealCreate.tsx
@@ -92,7 +92,6 @@ export const DealCreate = ({ open }: { open: boolean }) => {
                         sales_id: identity?.id,
                         contact_ids: [],
                         index: 0,
-                        start_at: new Date().toISOString(),
                     }}
                 >
                     <DialogContent>

diff --git a/examples/crm/src/types.ts b/examples/crm/src/types.ts
@@ -80,7 +80,6 @@ export interface Deal extends RaRecord {
     created_at: string;
     updated_at: string;
     archived_at?: string;
-    start_at: string;
     expected_closing_date: string;
     sales_id: Identifier;
     index: number;