Skip to content

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

contact note create sheet

Jean-Baptiste Kaiser3e740c09b969
diff --git a/registry.json b/registry.json
index 26442350..830d3ad8 100644
--- a/registry.json
+++ b/registry.json
@@ -324,6 +324,10 @@
"path": "src/components/atomic-crm/notes/NoteInputs.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/notes/NoteCreateSheet.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/notes/NoteCreate.tsx",
"type": "registry:component"
@@ -632,6 +636,10 @@
"path": "src/components/atomic-crm/contacts/ContactEdit.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/contacts/ContactCreateSheet.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/contacts/ContactCreate.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactCreateSheet.tsx b/src/components/atomic-crm/contacts/ContactCreateSheet.tsx
new file mode 100644
index 00000000..fbb798c4
--- /dev/null
+++ b/src/components/atomic-crm/contacts/ContactCreateSheet.tsx
@@ -0,0 +1,33 @@
+import { useGetIdentity } from "ra-core";
+import { CreateSheet } from "../misc/CreateSheet";
+import { ContactInputs } from "./ContactInputs";
+import type { Contact } from "../types";
+
+export interface ContactCreateSheetProps {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+}
+
+export const ContactCreateSheet = ({
+ open,
+ onOpenChange,
+}: ContactCreateSheetProps) => {
+ const { identity } = useGetIdentity();
+ return (
+ <CreateSheet
+ resource="contacts"
+ title="Create Contact"
+ defaultValues={{ sales_id: identity?.id }}
+ transform={(data: Contact) => ({
+ ...data,
+ first_seen: new Date().toISOString(),
+ last_seen: new Date().toISOString(),
+ tags: [],
+ })}
+ open={open}
+ onOpenChange={onOpenChange}
+ >
+ <ContactInputs />
+ </CreateSheet>
+ );
+};
diff --git a/src/components/atomic-crm/contacts/ContactShow.tsx b/src/components/atomic-crm/contacts/ContactShow.tsx
index 59b974f3..2317db5a 100644
--- a/src/components/atomic-crm/contacts/ContactShow.tsx
+++ b/src/components/atomic-crm/contacts/ContactShow.tsx
@@ -8,9 +8,12 @@ import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
import { useIsMobile } from "@/hooks/use-mobile";
import MobileHeader from "../layout/MobileHeader";
import { MobileContent } from "../layout/MobileContent";
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
import { CompanyAvatar } from "../companies/CompanyAvatar";
import { NoteCreate, NotesIterator } from "../notes";
+import { NoteCreateSheet } from "../notes/NoteCreateSheet";
import { TagsListEdit } from "./TagsListEdit";
import { ContactPersonalInfo } from "./ContactPersonalInfo";
import { ContactBackgroundInfo } from "./ContactBackgroundInfo";
@@ -20,7 +23,6 @@ import { Avatar } from "./Avatar";
import { ContactAside } from "./ContactAside";
import { MobileBackButton } from "../misc/MobileBackButton";
import { EditButton } from "../misc/EditButton";
-import { CreateButton } from "@/components/admin";
export const ContactShow = () => {
const isMobile = useIsMobile();
@@ -34,10 +36,16 @@ export const ContactShow = () => {
const ContactShowContentMobile = () => {
const { record, isPending } = useShowContext<Contact>();
+ const [noteCreateOpen, setNoteCreateOpen] = useState(false);
if (isPending || !record) return null;
return (
<>
+ <NoteCreateSheet
+ open={noteCreateOpen}
+ onOpenChange={setNoteCreateOpen}
+ contact_id={record.id}
+ />
<MobileHeader>
<MobileBackButton />
<div className="flex flex-1">
@@ -102,13 +110,12 @@ const ContactShowContentMobile = () => {
empty={
<div className="flex flex-col items-center justify-center py-8 text-center">
<p className="text-muted-foreground mb-4">No notes yet</p>
- <CreateButton
- resource="contactNotes"
- state={{
- record: { contact_id: record.id },
- }}
- label="Add note"
- />
+ <Button
+ variant="outline"
+ onClick={() => setNoteCreateOpen(true)}
+ >
+ Add note
+ </Button>
</div>
}
>
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index cf16cb49..fb926748 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -35,10 +35,9 @@ import {
useMatch,
useNavigate,
} from "react-router";
-import { CreateSheet } from "../misc/CreateSheet";
-import { ContactInputs } from "../contacts/ContactInputs";
+import { ContactCreateSheet } from "../contacts/ContactCreateSheet";
import { useState } from "react";
-import { type Contact } from "../types";
+import { NoteCreateSheet } from "../notes/NoteCreateSheet";
export const MobileNavigation = () => {
const location = useLocation();
@@ -123,6 +122,7 @@ const CreateButton = () => {
const createPath = useCreatePath();
const [contactCreateOpen, setContactCreateOpen] = useState(false);
+ const [noteCreateOpen, setNoteCreateOpen] = useState(false);
return (
<>
@@ -130,6 +130,11 @@ const CreateButton = () => {
open={contactCreateOpen}
onOpenChange={setContactCreateOpen}
/>
+ <NoteCreateSheet
+ open={noteCreateOpen}
+ onOpenChange={setNoteCreateOpen}
+ contact_id={contact_id}
+ />
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
@@ -153,15 +158,7 @@ const CreateButton = () => {
<DropdownMenuItem
className="h-12 px-4 text-base"
onSelect={() => {
- navigate(
- createPath({
- resource: "contactNotes",
- type: "create",
- }),
- {
- state: contact_id ? { record: { contact_id } } : undefined,
- },
- );
+ setNoteCreateOpen(true);
}}
>
Note
@@ -188,33 +185,6 @@ const CreateButton = () => {
);
};
-const ContactCreateSheet = ({
- open,
- onOpenChange,
-}: {
- open: boolean;
- onOpenChange: (open: boolean) => void;
-}) => {
- const { identity } = useGetIdentity();
- return (
- <CreateSheet
- resource="contacts"
- title="Create Contact"
- defaultValues={{ sales_id: identity?.id }}
- transform={(data: Contact) => ({
- ...data,
- first_seen: new Date().toISOString(),
- last_seen: new Date().toISOString(),
- tags: [],
- })}
- open={open}
- onOpenChange={onOpenChange}
- >
- <ContactInputs />
- </CreateSheet>
- );
-};
-
const SettingsButton = () => {
const authProvider = useAuthProvider();
const { data: identity } = useGetIdentity();
diff --git a/src/components/atomic-crm/misc/CreateSheet.tsx b/src/components/atomic-crm/misc/CreateSheet.tsx
index a0137d74..2a59408b 100644
--- a/src/components/atomic-crm/misc/CreateSheet.tsx
+++ b/src/components/atomic-crm/misc/CreateSheet.tsx
@@ -39,7 +39,7 @@ export interface CreateSheetProps extends CreateBaseProps {
/**
* The title displayed in the sheet header
*/
- title?: string;
+ title?: ReactNode;
/**
* Default values for the form
@@ -90,10 +90,10 @@ export const CreateSheet = ({
const notify = useNotify();
const redirect = useRedirect();
- // Handle success - close sheet if redirect is false
+ // Handle success - close sheet in addition to default behavior
const handleSuccess = (...args: any[]) => {
if (mutationOptions?.onSuccess) {
- mutationOptions.onSuccess(
+ return mutationOptions.onSuccess(
...(args as Parameters<typeof mutationOptions.onSuccess>),
);
}
diff --git a/src/components/atomic-crm/notes/NoteCreateSheet.tsx b/src/components/atomic-crm/notes/NoteCreateSheet.tsx
new file mode 100644
index 00000000..af49b4f5
--- /dev/null
+++ b/src/components/atomic-crm/notes/NoteCreateSheet.tsx
@@ -0,0 +1,92 @@
+import {
+ type Identifier,
+ RecordRepresentation,
+ useDataProvider,
+ useGetIdentity,
+ useGetOne,
+ useNotify,
+ useRedirect,
+ useUpdate,
+} from "ra-core";
+import { CreateSheet } from "../misc/CreateSheet";
+import { foreignKeyMapping } from "./foreignKeyMapping";
+import { NoteInputs } from "./NoteInputs";
+import { getCurrentDate } from "./utils";
+
+export interface NoteCreateSheetProps {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ contact_id?: Identifier;
+}
+
+export const NoteCreateSheet = ({
+ open,
+ onOpenChange,
+ contact_id,
+}: NoteCreateSheetProps) => {
+ const { identity } = useGetIdentity();
+
+ const selectContact = contact_id == null;
+ const { data: contact } = useGetOne(
+ "contacts",
+ { id: contact_id! },
+ { enabled: !!contact_id },
+ );
+ const [update] = useUpdate();
+ const dataProvider = useDataProvider();
+ const notify = useNotify();
+ const redirect = useRedirect();
+
+ if (!identity) return null;
+
+ const handleSuccess = async (data: any) => {
+ const referenceRecordId = data[foreignKeyMapping["contacts"]];
+ if (!referenceRecordId) return;
+ const { data: contact } = await dataProvider.getOne("contacts", {
+ id: referenceRecordId,
+ });
+ if (!contact) return;
+ update("contacts", {
+ id: referenceRecordId as unknown as Identifier,
+ data: { last_seen: new Date().toISOString(), status: data.status },
+ previousData: contact,
+ });
+ notify("Note added");
+ redirect("show", "contacts", referenceRecordId);
+ onOpenChange(false);
+ };
+
+ return (
+ <CreateSheet
+ resource="contactNotes"
+ title={
+ <>
+ {!selectContact ? "Create Note for " : "Create Note"}
+ {!selectContact && (
+ <RecordRepresentation record={contact} resource="contacts" />
+ )}
+ </>
+ }
+ redirect={false}
+ defaultValues={{ sales_id: identity?.id }}
+ transform={(data: any) => ({
+ ...data,
+ [foreignKeyMapping["contacts"]]:
+ contact_id || data[foreignKeyMapping["contacts"]],
+ sales_id: identity.id,
+ date: data.date || getCurrentDate(),
+ })}
+ mutationOptions={{
+ onSuccess: handleSuccess,
+ }}
+ open={open}
+ onOpenChange={onOpenChange}
+ >
+ <NoteInputs
+ showStatus
+ reference="contacts"
+ selectReference={selectContact}
+ />
+ </CreateSheet>
+ );
+};
diff --git a/src/components/atomic-crm/root/CRM.tsx b/src/components/atomic-crm/root/CRM.tsx
index a8a43597..a4e95fc5 100644
--- a/src/components/atomic-crm/root/CRM.tsx
+++ b/src/components/atomic-crm/root/CRM.tsx
@@ -47,8 +47,6 @@ import { useIsMobile } from "@/hooks/use-mobile.ts";
import { MobileTasksList } from "../tasks/MobileTasksList.tsx";
import { MobileTaskEdit } from "../tasks/MobileTaskEdit.tsx";
import { MobileTaskCreate } from "../tasks/MobileTaskCreate.tsx";
-import { MobileNoteEdit } from "../notes/MobileNoteEdit.tsx";
-import { MobileNoteCreate } from "../notes/MobileNoteCreate.tsx";
import { ContactList } from "../contacts/ContactList.tsx";
import { ContactShow } from "../contacts/ContactShow.tsx";
@@ -218,11 +216,11 @@ const MobileAdmin = (props: CoreAdminProps) => {
/>
<Route path={OAuthConsentPage.path} element={<OAuthConsentPage />} />
</CustomRoutes>
- <Resource name="contacts" list={ContactList} show={ContactShow} />
<Resource
- name="contactNotes"
- edit={MobileNoteEdit}
- create={MobileNoteCreate}
+ name="contacts"
+ list={ContactList}
+ show={ContactShow}
+ recordRepresentation={contacts.recordRepresentation}
/>
<Resource
name="tasks"