realtimex-crm 0.11.2 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "realtimex-crm",
-  "version": "0.11.2",
+  "version": "0.12.2",
   "description": "RealTimeX CRM - A full-featured CRM built with React, shadcn-admin-kit, and Supabase. Fork of Atomic CRM with RealTimeX App SDK integration.",
   "type": "module",
   "main": "./dist/index.js",

package/src/components/atomic-crm/activity/ActivityLogCompanyNoteCreated.tsx

@@ -0,0 +1,60 @@
+import { ReferenceField } from "@/components/admin/reference-field";
+
+import { CompanyAvatar } from "../companies/CompanyAvatar";
+import { RelativeDate } from "../misc/RelativeDate";
+import { SaleName } from "../sales/SaleName";
+import type { ActivityCompanyNoteCreated } from "../types";
+import { useActivityLogContext } from "./ActivityLogContext";
+import { ActivityLogNote } from "./ActivityLogNote";
+
+type ActivityLogCompanyNoteCreatedProps = {
+  activity: ActivityCompanyNoteCreated;
+};
+
+export function ActivityLogCompanyNoteCreated({
+  activity,
+}: ActivityLogCompanyNoteCreatedProps) {
+  const context = useActivityLogContext();
+  const { companyNote } = activity;
+  return (
+    <ActivityLogNote
+      header={
+        <div className="flex flex-row items-center gap-2 flex-grow">
+          <ReferenceField
+            source="company_id"
+            reference="companies"
+            record={companyNote}
+            link={false}
+          >
+            <CompanyAvatar width={20} height={20} />
+          </ReferenceField>
+
+          <span className="text-sm text-muted-foreground flex-grow inline-flex">
+            <ReferenceField
+              source="sales_id"
+              reference="sales"
+              record={activity}
+              link={false}
+            >
+              <SaleName />
+            </ReferenceField>
+            &nbsp;added a note about&nbsp;
+            <ReferenceField
+              source="company_id"
+              reference="companies"
+              record={companyNote}
+              link="show"
+            />
+          </span>
+
+          {context === "company" && (
+            <span className="text-muted-foreground text-sm">
+              <RelativeDate date={activity.date} />
+            </span>
+          )}
+        </div>
+      }
+      text={companyNote.text}
+    />
+  );
+}

package/src/components/atomic-crm/activity/ActivityLogIterator.tsx

@@ -3,6 +3,7 @@ import { Fragment, useState } from "react";
 import { Separator } from "@/components/ui/separator";
 import {
   COMPANY_CREATED,
+  COMPANY_NOTE_CREATED,
   CONTACT_CREATED,
   CONTACT_NOTE_CREATED,
   DEAL_CREATED,
@@ -10,6 +11,7 @@ import {
 } from "../consts";
 import type { Activity } from "../types";
 import { ActivityLogCompanyCreated } from "./ActivityLogCompanyCreated";
+import { ActivityLogCompanyNoteCreated } from "./ActivityLogCompanyNoteCreated";
 import { ActivityLogContactCreated } from "./ActivityLogContactCreated";
 import { ActivityLogContactNoteCreated } from "./ActivityLogContactNoteCreated";
 import { ActivityLogDealCreated } from "./ActivityLogDealCreated";
@@ -76,5 +78,9 @@ function ActivityItem({ activity }: { activity: Activity }) {
     return <ActivityLogDealNoteCreated activity={activity} />;
   }
 
+  if (activity.type === COMPANY_NOTE_CREATED) {
+    return <ActivityLogCompanyNoteCreated activity={activity} />;
+  }
+
   return null;
 }

package/src/components/atomic-crm/companies/CompanyListFilter.tsx

@@ -23,6 +23,7 @@ export const CompanyListFilter = () => {
       <FilterCategory icon={<Building className="h-4 w-4" />} label="Size">
         {sizes.map((size) => (
           <ToggleFilterButton
+            key={size.id}
             className="w-full justify-between"
             label={size.name}
             value={{ size: size.id }}
@@ -33,6 +34,7 @@ export const CompanyListFilter = () => {
       <FilterCategory icon={<Truck className="h-4 w-4" />} label="Sector">
         {sectors.map((sector) => (
           <ToggleFilterButton
+            key={sector.id}
             className="w-full justify-between"
             label={sector.name}
             value={{ sector: sector.id }}

package/src/components/atomic-crm/companies/CompanyShow.tsx

@@ -24,6 +24,8 @@ import { Avatar } from "../contacts/Avatar";
 import { TagsList } from "../contacts/TagsList";
 import { findDealLabel } from "../deals/deal";
 import { Status } from "../misc/Status";
+import { NoteCreate } from "../notes/NoteCreate";
+import { NotesIterator } from "../notes/NotesIterator";
 import { useConfigurationContext } from "../root/ConfigurationContext";
 import type { Company, Contact, Deal } from "../types";
 import { CompanyAside } from "./CompanyAside";
@@ -64,7 +66,7 @@ const CompanyShowContent = () => {
               <h5 className="text-xl ml-2 flex-1">{record.name}</h5>
             </div>
             <Tabs defaultValue={currentTab} onValueChange={handleTabChange}>
-              <TabsList className="grid w-full grid-cols-3">
+              <TabsList className="grid w-full grid-cols-4">
                 <TabsTrigger value="activity">Activity</TabsTrigger>
                 <TabsTrigger value="contacts">
                   {record.nb_contacts
@@ -73,6 +75,13 @@ const CompanyShowContent = () => {
                       : `${record.nb_contacts} Contacts`
                     : "No Contacts"}
                 </TabsTrigger>
+                <TabsTrigger value="notes">
+                  {record.nb_notes
+                    ? record.nb_notes === 1
+                      ? "1 Note"
+                      : `${record.nb_notes} Notes`
+                    : "Notes"}
+                </TabsTrigger>
                 {record.nb_deals ? (
                   <TabsTrigger value="deals">
                     {record.nb_deals === 1
@@ -111,6 +120,16 @@ const CompanyShowContent = () => {
                   </div>
                 )}
               </TabsContent>
+              <TabsContent value="notes">
+                <ReferenceManyField
+                  reference="companyNotes"
+                  target="company_id"
+                  sort={{ field: "date", order: "DESC" }}
+                  empty={<NoteCreate reference="companies" className="mt-4" />}
+                >
+                  <NotesIterator reference="companies" />
+                </ReferenceManyField>
+              </TabsContent>
               <TabsContent value="deals">
                 {record.nb_deals ? (
                   <ReferenceManyField

package/src/components/atomic-crm/consts.ts

@@ -1,4 +1,5 @@
 export const COMPANY_CREATED = "company.created" as const;
+export const COMPANY_NOTE_CREATED = "companyNote.created" as const;
 export const CONTACT_CREATED = "contact.created" as const;
 export const CONTACT_NOTE_CREATED = "contactNote.created" as const;
 export const DEAL_CREATED = "deal.created" as const;

package/src/components/atomic-crm/dashboard/DealsChart.tsx

@@ -52,29 +52,45 @@ export const DealsChart = memo(() => {
         won: dealsByMonth[month]
           .filter((deal: Deal) => deal.stage === "won")
           .reduce((acc: number, deal: Deal) => {
-            acc += deal.amount;
+            const amount = deal.amount ?? 0;
+            if (!isNaN(amount)) {
+              acc += amount;
+            }
             return acc;
           }, 0),
         pending: dealsByMonth[month]
           .filter((deal: Deal) => !["won", "lost"].includes(deal.stage))
           .reduce((acc: number, deal: Deal) => {
+            const amount = deal.amount ?? 0;
             // @ts-expect-error - multiplier type issue
-            acc += deal.amount * multiplier[deal.stage];
+            const mult = multiplier[deal.stage] ?? 0;
+            if (!isNaN(amount) && !isNaN(mult)) {
+              acc += amount * mult;
+            }
             return acc;
           }, 0),
         lost: dealsByMonth[month]
           .filter((deal: Deal) => deal.stage === "lost")
           .reduce((acc: number, deal: Deal) => {
-            acc -= deal.amount;
+            const amount = deal.amount ?? 0;
+            if (!isNaN(amount)) {
+              acc -= amount;
+            }
             return acc;
           }, 0),
       };
     });
 
-    return amountByMonth;
+    // Filter out any months with NaN values
+    return amountByMonth.filter(
+      (month) =>
+        !isNaN(month.won) && !isNaN(month.pending) && !isNaN(month.lost),
+    );
   }, [data]);
 
   if (isPending) return null; // FIXME return skeleton instead
+  if (months.length === 0) return null; // No data to display
+
   const range = months.reduce(
     (acc, month) => {
       acc.min = Math.min(acc.min, month.lost);
@@ -83,6 +99,13 @@ export const DealsChart = memo(() => {
     },
     { min: 0, max: 0 },
   );
+
+  // Ensure we have a valid range for the chart
+  const chartRange = {
+    min: range.min === 0 && range.max === 0 ? -100 : range.min * 1.2,
+    max: range.min === 0 && range.max === 0 ? 100 : range.max * 1.2,
+  };
+
   return (
     <div className="flex flex-col">
       <div className="flex items-center mb-4">
@@ -103,8 +126,8 @@ export const DealsChart = memo(() => {
           padding={0.3}
           valueScale={{
             type: "linear",
-            min: range.min * 1.2,
-            max: range.max * 1.2,
+            min: chartRange.min,
+            max: chartRange.max,
           }}
           indexScale={{ type: "band", round: true }}
           enableGridX={true}

package/src/components/atomic-crm/notes/NoteCreate.tsx

@@ -20,6 +20,7 @@ import { getCurrentDate } from "./utils";
 const foreignKeyMapping = {
   contacts: "contact_id",
   deals: "deal_id",
+  companies: "company_id",
 };
 
 export const NoteCreate = ({
@@ -27,7 +28,7 @@ export const NoteCreate = ({
   showStatus,
   className,
 }: {
-  reference: "contacts" | "deals";
+  reference: "contacts" | "deals" | "companies";
   showStatus?: boolean;
   className?: string;
 }) => {
@@ -53,7 +54,7 @@ const NoteCreateButton = ({
   reference,
   record,
 }: {
-  reference: "contacts" | "deals";
+  reference: "contacts" | "deals" | "companies";
   record: RaRecord<Identifier>;
 }) => {
   const [update] = useUpdate();
@@ -82,9 +83,15 @@ const NoteCreateButton = ({
   const handleSuccess = (data: any) => {
     reset(resetValues, { keepValues: false });
     refetch();
+
+    const updateData: any = { last_seen: new Date().toISOString() };
+    if (reference === "contacts") {
+      updateData.status = data.status;
+    }
+
     update(reference, {
       id: (record && record.id) as unknown as Identifier,
-      data: { last_seen: new Date().toISOString(), status: data.status },
+      data: updateData,
       previousData: record,
     });
     notify("Note added");

package/src/components/atomic-crm/notes/NotesIterator.tsx

@@ -9,7 +9,7 @@ export const NotesIterator = ({
   reference,
   showStatus,
 }: {
-  reference: "contacts" | "deals";
+  reference: "contacts" | "deals" | "companies";
   showStatus?: boolean;
 }) => {
   const { data, error, isPending } = useListContext();

package/src/components/atomic-crm/providers/commons/activity.ts

@@ -2,6 +2,7 @@ import type { DataProvider, Identifier } from "ra-core";
 
 import {
   COMPANY_CREATED,
+  COMPANY_NOTE_CREATED,
   CONTACT_CREATED,
   CONTACT_NOTE_CREATED,
   DEAL_CREATED,
@@ -10,6 +11,7 @@ import {
 import type {
   Activity,
   Company,
+  CompanyNote,
   Contact,
   ContactNote,
   Deal,
@@ -37,14 +39,15 @@ export async function getActivityLog(
     filter["sales_id@in"] = `(${salesId})`;
   }
 
-  const [newCompanies, newContactsAndNotes, newDealsAndNotes] =
+  const [newCompanies, newContactsAndNotes, newDealsAndNotes, newCompanyNotes] =
     await Promise.all([
       getNewCompanies(dataProvider, companyFilter),
       getNewContactsAndNotes(dataProvider, filter),
       getNewDealsAndNotes(dataProvider, filter),
+      getNewCompanyNotes(dataProvider, filter),
     ]);
   return (
-    [...newCompanies, ...newContactsAndNotes, ...newDealsAndNotes]
+    [...newCompanies, ...newContactsAndNotes, ...newDealsAndNotes, ...newCompanyNotes]
       // sort by date desc
       .sort((a, b) =>
         a.date && b.date ? a.date.localeCompare(b.date) * -1 : 0,
@@ -172,3 +175,36 @@ async function getNewDealsAndNotes(
 
   return [...newDeals, ...newDealNotes];
 }
+
+async function getNewCompanyNotes(
+  dataProvider: DataProvider,
+  filter: any,
+): Promise<Activity[]> {
+  const recentCompanyNotesFilter = {} as any;
+
+  if (filter.sales_id) {
+    recentCompanyNotesFilter.sales_id = filter.sales_id;
+  }
+  if (filter.company_id) {
+    recentCompanyNotesFilter.company_id = filter.company_id;
+  }
+
+  const { data: companyNotes } = await dataProvider.getList<CompanyNote>(
+    "companyNotes",
+    {
+      filter: recentCompanyNotesFilter,
+      pagination: { page: 1, perPage: 250 },
+      sort: { field: "date", order: "DESC" },
+    },
+  );
+
+  const newCompanyNotes = companyNotes.map((companyNote) => ({
+    id: `companyNote.${companyNote.id}.created`,
+    type: COMPANY_NOTE_CREATED,
+    sales_id: companyNote.sales_id,
+    companyNote,
+    date: companyNote.date,
+  }));
+
+  return newCompanyNotes;
+}

package/src/components/atomic-crm/providers/fakerest/dataGenerator/companyNotes.ts

@@ -0,0 +1,20 @@
+import { datatype, lorem, random } from "faker/locale/en_US";
+
+import type { CompanyNote } from "../../../types";
+import type { Db } from "./types";
+import { randomDate } from "./utils";
+
+export const generateCompanyNotes = (db: Db): CompanyNote[] => {
+  return Array.from(Array(600).keys()).map((id) => {
+    const company = random.arrayElement(db.companies);
+    const date = randomDate(new Date(company.created_at));
+
+    return {
+      id,
+      company_id: company.id,
+      text: lorem.paragraphs(datatype.number({ min: 1, max: 4 })),
+      date: date.toISOString(),
+      sales_id: company.sales_id,
+    };
+  });
+};

package/src/components/atomic-crm/providers/fakerest/dataGenerator/index.ts

@@ -1,4 +1,5 @@
 import { generateCompanies } from "./companies";
+import { generateCompanyNotes } from "./companyNotes";
 import { generateContactNotes } from "./contactNotes";
 import { generateContacts } from "./contacts";
 import { generateDealNotes } from "./dealNotes";
@@ -14,6 +15,7 @@ export default (): Db => {
   db.sales = generateSales(db);
   db.tags = generateTags(db);
   db.companies = generateCompanies(db);
+  db.companyNotes = generateCompanyNotes(db);
   db.contacts = generateContacts(db);
   db.contactNotes = generateContactNotes(db);
   db.deals = generateDeals(db);

package/src/components/atomic-crm/providers/fakerest/dataGenerator/types.ts

@@ -1,5 +1,6 @@
 import type {
   Company,
+  CompanyNote,
   Contact,
   ContactNote,
   Deal,
@@ -11,6 +12,7 @@ import type {
 
 export interface Db {
   companies: Required<Company>[];
+  companyNotes: CompanyNote[];
   contacts: Required<Contact>[];
   contactNotes: ContactNote[];
   deals: Deal[];

package/src/components/atomic-crm/root/CRM.tsx

@@ -169,6 +169,7 @@ export const CRM = ({
           <Resource name="deals" {...deals} />
           <Resource name="contacts" {...contacts} />
           <Resource name="companies" {...companies} />
+          <Resource name="companyNotes" />
           <Resource name="contactNotes" />
           <Resource name="dealNotes" />
           <Resource name="tasks" />

package/src/components/atomic-crm/types.ts

@@ -69,6 +69,8 @@ export type Company = {
   context_links?: string[];
   nb_contacts?: number;
   nb_deals?: number;
+  nb_notes?: number;
+  last_seen?: string;
 } & Pick<RaRecord, "id">;
 
 export type EmailAndType = {
@@ -138,6 +140,17 @@ export type DealNote = {
   status?: undefined;
 } & Pick<RaRecord, "id">;
 
+export type CompanyNote = {
+  company_id: Identifier;
+  text: string;
+  date: string;
+  sales_id: Identifier;
+  attachments?: AttachmentNote[];
+
+  // This is defined for compatibility with `ContactNote`
+  status?: undefined;
+} & Pick<RaRecord, "id">;
+
 export type Tag = {
   name: string;
   color: string;
@@ -190,6 +203,13 @@ export type ActivityDealNoteCreated = {
   date: string;
 };
 
+export type ActivityCompanyNoteCreated = {
+  type: typeof COMPANY_NOTE_CREATED;
+  sales_id?: Identifier;
+  companyNote: CompanyNote;
+  date: string;
+};
+
 export type Activity = RaRecord &
   (
     | ActivityCompanyCreated
@@ -197,6 +217,7 @@ export type Activity = RaRecord &
     | ActivityContactNoteCreated
     | ActivityDealCreated
     | ActivityDealNoteCreated
+    | ActivityCompanyNoteCreated
   );
 
 export interface RAFile {

package/src/components/ui/input.tsx

@@ -2,7 +2,16 @@ import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
+function Input({
+  className,
+  type,
+  helperText: _helperText,
+  alwaysOn: _alwaysOn,
+  ...props
+}: React.ComponentProps<"input"> & {
+  helperText?: string;
+  alwaysOn?: boolean;
+}) {
   return (
     <input
       type={type}

package/src/components/ui/textarea.tsx

@@ -2,7 +2,15 @@ import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
-function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
+function Textarea({
+  className,
+  helperText: _helperText,
+  alwaysOn: _alwaysOn,
+  ...props
+}: React.ComponentProps<"textarea"> & {
+  helperText?: string;
+  alwaysOn?: boolean;
+}) {
   return (
     <textarea
       data-slot="textarea"

package/supabase/migrations/20251223185638_remove_large_payload_storage.sql

@@ -31,6 +31,15 @@ DROP INDEX IF EXISTS idx_activities_pending_storage;
 -- Remove the CHECK constraint on payload_storage_status to allow NULL and 'in_storage' only
 -- First drop the constraint, then add a new one
 ALTER TABLE activities DROP CONSTRAINT IF EXISTS activities_payload_storage_status_check;
+
+-- Clean up any existing data that doesn't match the new constraint
+-- Convert 'pending_move' or any other status to 'in_storage'
+UPDATE activities
+SET payload_storage_status = 'in_storage'
+WHERE payload_storage_status IS NOT NULL
+  AND payload_storage_status != 'in_storage';
+
+-- Now add the constraint
 ALTER TABLE activities ADD CONSTRAINT activities_payload_storage_status_check
   CHECK (payload_storage_status IS NULL OR payload_storage_status = 'in_storage');
 

package/supabase/migrations/20251224000002_add_company_notes.sql

@@ -0,0 +1,67 @@
+-- Create companyNotes table (similar to dealNotes)
+create table "public"."companyNotes" (
+    "id" bigint generated by default as identity not null,
+    "company_id" bigint not null,
+    "text" text,
+    "date" timestamp with time zone default now(),
+    "sales_id" bigint,
+    "attachments" jsonb[]
+);
+
+-- Primary key
+CREATE UNIQUE INDEX "companyNotes_pkey" ON public."companyNotes" USING btree (id);
+alter table "public"."companyNotes" add constraint "companyNotes_pkey" PRIMARY KEY using index "companyNotes_pkey";
+
+-- Foreign keys with CASCADE
+alter table "public"."companyNotes" add constraint "companyNotes_company_id_fkey"
+  FOREIGN KEY (company_id) REFERENCES companies(id) ON UPDATE CASCADE ON DELETE CASCADE not valid;
+alter table "public"."companyNotes" validate constraint "companyNotes_company_id_fkey";
+
+alter table "public"."companyNotes" add constraint "companyNotes_sales_id_fkey"
+  FOREIGN KEY (sales_id) REFERENCES sales(id) ON UPDATE CASCADE ON DELETE CASCADE not valid;
+alter table "public"."companyNotes" validate constraint "companyNotes_sales_id_fkey";
+
+-- RLS policies (permissive)
+alter table "public"."companyNotes" enable row level security;
+
+create policy "Enable insert for authenticated users only"
+on "public"."companyNotes"
+as permissive
+for insert
+to authenticated
+with check (true);
+
+create policy "Enable read access for authenticated users"
+on "public"."companyNotes"
+as permissive
+for select
+to authenticated
+using (true);
+
+create policy "Company Notes Delete Policy"
+on "public"."companyNotes"
+as permissive
+for delete
+to authenticated
+using (true);
+
+create policy "Company Notes Update Policy"
+on "public"."companyNotes"
+as permissive
+for update
+to authenticated
+using (true);
+
+-- Grants
+grant delete on table "public"."companyNotes" to "authenticated";
+grant insert on table "public"."companyNotes" to "authenticated";
+grant select on table "public"."companyNotes" to "authenticated";
+grant update on table "public"."companyNotes" to "authenticated";
+
+grant delete on table "public"."companyNotes" to "service_role";
+grant insert on table "public"."companyNotes" to "service_role";
+grant references on table "public"."companyNotes" to "service_role";
+grant select on table "public"."companyNotes" to "service_role";
+grant trigger on table "public"."companyNotes" to "service_role";
+grant truncate on table "public"."companyNotes" to "service_role";
+grant update on table "public"."companyNotes" to "service_role";

package/supabase/migrations/20251224000003_add_company_last_seen.sql

@@ -0,0 +1,5 @@
+-- Add last_seen to companies for activity tracking
+alter table "public"."companies" add column "last_seen" timestamp with time zone;
+
+-- Backfill with created_at
+update "public"."companies" set last_seen = created_at where last_seen is null;

package/supabase/migrations/20251224000004_update_companies_summary_view.sql

@@ -0,0 +1,16 @@
+-- Drop and recreate view with nb_notes
+drop view if exists "public"."companies_summary";
+
+create view "public"."companies_summary"
+    with (security_invoker=on)
+    as
+select
+    c.*,
+    count(distinct d.id) as nb_deals,
+    count(distinct co.id) as nb_contacts,
+    count(distinct cn.id) as nb_notes
+from "public"."companies" c
+left join "public"."deals" d on c.id = d.company_id
+left join "public"."contacts" co on c.id = co.company_id
+left join "public"."companyNotes" cn on c.id = cn.company_id
+group by c.id;