Skip to content

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

note create and edit

Jean-Baptiste Kaiser357b8ea9cd2f
diff --git a/registry.json b/registry.json
index a8ea9330..8a1eee65 100644
--- a/registry.json
+++ b/registry.json
@@ -308,6 +308,10 @@
"path": "src/components/atomic-crm/notes/index.ts",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/notes/foreignKeyMapping.ts",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/notes/StatusSelector.tsx",
"type": "registry:component"
@@ -332,6 +336,14 @@
"path": "src/components/atomic-crm/notes/Note.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/notes/MobileNoteEdit.tsx",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/notes/MobileNoteCreate.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/misc/usePapaParse.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactShow.tsx b/src/components/atomic-crm/contacts/ContactShow.tsx
index 92a42ad1..88afb56b 100644
--- a/src/components/atomic-crm/contacts/ContactShow.tsx
+++ b/src/components/atomic-crm/contacts/ContactShow.tsx
@@ -19,6 +19,7 @@ import type { Contact } from "../types";
import { Avatar } from "./Avatar";
import { ContactAside } from "./ContactAside";
import { ListButton } from "../misc/ListButton";
+import { CreateButton } from "@/components/admin";
export const ContactShow = () => {
const isMobile = useIsMobile();
@@ -97,7 +98,20 @@ const ContactShowContentMobile = () => {
reference="contactNotes"
sort={{ field: "date", order: "DESC" }}
empty={
- <NoteCreate reference="contacts" showStatus className="mt-4" />
+ <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: {
+ reference_id: record.id,
+ reference: "contacts",
+ showStatus: true,
+ },
+ }}
+ label="Add note"
+ />
+ </div>
}
>
<NotesIterator reference="contacts" showStatus />
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index a11b932b..0e638833 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -134,7 +134,26 @@ const CreateButton = () => {
<DropdownMenuItem className="h-12 px-4 text-base">
Contact
</DropdownMenuItem>
- <DropdownMenuItem className="h-12 px-4 text-base">
+ <DropdownMenuItem
+ className="h-12 px-4 text-base"
+ onSelect={() => {
+ navigate(
+ createPath({
+ resource: "contactNotes",
+ type: "create",
+ }),
+ {
+ state: {
+ record: {
+ reference_id: contact_id || undefined,
+ reference: "contacts",
+ showStatus: true,
+ },
+ },
+ },
+ );
+ }}
+ >
Note
</DropdownMenuItem>
<DropdownMenuItem
@@ -146,11 +165,7 @@ const CreateButton = () => {
type: "create",
}),
{
- state: contact_id
- ? {
- record: { contact_id },
- }
- : undefined,
+ state: contact_id ? { record: { contact_id } } : undefined,
},
);
}}
diff --git a/src/components/atomic-crm/misc/ListButton.tsx b/src/components/atomic-crm/misc/ListButton.tsx
index c79f291c..fc6ff01c 100644
--- a/src/components/atomic-crm/misc/ListButton.tsx
+++ b/src/components/atomic-crm/misc/ListButton.tsx
@@ -3,8 +3,8 @@ import { useNavigate } from "react-router";
import { ChevronLeft } from "lucide-react";
import { Button } from "@/components/ui/button";
-export const ListButton = () => {
- const resource = useResourceContext();
+export const ListButton = (props: { resource?: string }) => {
+ const resource = useResourceContext(props);
const navigate = useNavigate();
const createPath = useCreatePath();
const to = createPath({ resource, type: "list" });
diff --git a/src/components/atomic-crm/notes/MobileNoteCreate.tsx b/src/components/atomic-crm/notes/MobileNoteCreate.tsx
new file mode 100644
index 00000000..c97574d8
--- /dev/null
+++ b/src/components/atomic-crm/notes/MobileNoteCreate.tsx
@@ -0,0 +1,62 @@
+import {
+ CreateBase,
+ Form,
+ RecordRepresentation,
+ useCreatePath,
+ useGetIdentity,
+ useGetOne,
+ useRecordFromLocation,
+} from "ra-core";
+
+import { MobileContent } from "../layout/MobileContent";
+import MobileHeader from "../layout/MobileHeader";
+import { ListButton } from "../misc/ListButton";
+import { NoteCreateButton } from "./NoteCreate";
+import { NoteInputs } from "./NoteInputs";
+
+export const MobileNoteCreate = () => {
+ const { identity } = useGetIdentity();
+ const createPath = useCreatePath();
+ const recordFromLocation = useRecordFromLocation() || {};
+ const { reference_id, reference, showStatus } = recordFromLocation;
+ const selectReference = reference_id == null;
+
+ const { data: referenceRecord } = useGetOne(
+ reference,
+ { id: reference_id! },
+ { enabled: !!reference_id && !!reference },
+ );
+
+ if (!reference || !identity) return null;
+
+ return (
+ <CreateBase redirect={createPath({ resource: reference, type: "list" })}>
+ <MobileHeader>
+ <ListButton resource={reference} />
+ <div className="flex flex-1">
+ <h1 className="text-xl font-semibold text-ellipsis overflow-hidden whitespace-nowrap">
+ {!selectReference ? "Create Note for " : "Create Note"}
+ {!selectReference && (
+ <RecordRepresentation
+ record={referenceRecord}
+ resource={reference}
+ />
+ )}
+ </h1>
+ </div>
+ </MobileHeader>
+ <MobileContent>
+ <Form>
+ <div className="space-y-3">
+ <NoteInputs
+ showStatus={showStatus}
+ selectReference={selectReference}
+ reference={reference}
+ />
+ <NoteCreateButton reference={reference} record={referenceRecord} />
+ </div>
+ </Form>
+ </MobileContent>
+ </CreateBase>
+ );
+};
diff --git a/src/components/atomic-crm/notes/MobileNoteEdit.tsx b/src/components/atomic-crm/notes/MobileNoteEdit.tsx
new file mode 100644
index 00000000..7810c8eb
--- /dev/null
+++ b/src/components/atomic-crm/notes/MobileNoteEdit.tsx
@@ -0,0 +1,63 @@
+import {
+ EditBase,
+ Form,
+ RecordRepresentation,
+ useCreatePath,
+ useGetIdentity,
+ useRecordFromLocation,
+} from "ra-core";
+
+import { NoteInputs } from "./NoteInputs";
+import { DeleteButton, ReferenceField, SaveButton } from "@/components/admin";
+import MobileHeader from "../layout/MobileHeader";
+import { ListButton } from "../misc/ListButton";
+import { MobileContent } from "../layout/MobileContent";
+import { foreignKeyMapping } from "./foreignKeyMapping";
+
+export const MobileNoteEdit = () => {
+ const { identity } = useGetIdentity();
+ const createPath = useCreatePath();
+ const recordFromLocation = useRecordFromLocation() || {};
+ const { reference, showStatus } = recordFromLocation;
+
+ if (!identity || !reference) return null;
+
+ return (
+ <EditBase redirect={createPath({ resource: reference, type: "list" })}>
+ <MobileHeader>
+ <ListButton resource={reference} />
+ <div className="flex flex-1">
+ <ReferenceField
+ source={foreignKeyMapping[reference as "contacts" | "deals"]}
+ reference={reference}
+ render={({ referenceRecord }) => (
+ <h1 className="text-xl font-semibold text-ellipsis overflow-hidden whitespace-nowrap">
+ Edit Note
+ {referenceRecord ? (
+ <>
+ {" for "}
+ <RecordRepresentation
+ record={referenceRecord}
+ resource={reference}
+ />
+ </>
+ ) : null}
+ </h1>
+ )}
+ />
+ </div>
+ </MobileHeader>
+ <MobileContent>
+ <Form className="mt-1">
+ <NoteInputs showStatus={showStatus} />
+ <div className="flex flex-col gap-2 mt-6">
+ <SaveButton />
+ <DeleteButton
+ redirect={createPath({ resource: reference, type: "list" })}
+ />
+ </div>
+ </Form>
+ </MobileContent>
+ </EditBase>
+ );
+};
diff --git a/src/components/atomic-crm/notes/Note.tsx b/src/components/atomic-crm/notes/Note.tsx
index 7154261d..947b4c31 100644
--- a/src/components/atomic-crm/notes/Note.tsx
+++ b/src/components/atomic-crm/notes/Note.tsx
@@ -1,6 +1,7 @@
import { CircleX, Edit, Save, Trash2 } from "lucide-react";
import {
Form,
+ useCreatePath,
useDelete,
useNotify,
useResourceContext,
@@ -9,6 +10,7 @@ import {
} from "ra-core";
import { useState } from "react";
import type { FieldValues, SubmitHandler } from "react-hook-form";
+import { Link } from "react-router";
import { ReferenceField } from "@/components/admin/reference-field";
import { Button } from "@/components/ui/button";
import {
@@ -19,7 +21,6 @@ import {
} from "@/components/ui/tooltip";
import { CompanyAvatar } from "../companies/CompanyAvatar";
-import { Avatar } from "../contacts/Avatar";
import { RelativeDate } from "../misc/RelativeDate";
import { Status } from "../misc/Status";
import { SaleName } from "../sales/SaleName";
@@ -41,6 +42,18 @@ export const Note = ({
const [isEditing, setEditing] = useState(false);
const resource = useResourceContext();
const notify = useNotify();
+ const createPath = useCreatePath();
+
+ const editPath = createPath({
+ resource,
+ type: "edit",
+ id: note.id,
+ });
+
+ const linkState =
+ resource === "contactNotes"
+ ? { reference: "contacts", showStatus: true }
+ : { reference: "deals" };
const [update, { isPending }] = useUpdate();
@@ -81,19 +94,16 @@ export const Note = ({
);
};
- return (
+ const content = (
<div
onMouseEnter={() => setHover(true)}
onMouseLeave={() => setHover(false)}
+ className="mb-4"
>
<div className="flex items-center space-x-2 md:space-x-4 w-full">
- {resource === "contactNote" ? (
- <Avatar width={20} height={20} />
- ) : (
- <ReferenceField source="company_id" reference="companies" link="show">
- <CompanyAvatar width={20} height={20} />
- </ReferenceField>
- )}
+ <ReferenceField source="company_id" reference="companies" link="show">
+ <CompanyAvatar width={20} height={20} />
+ </ReferenceField>
<div className="inline-flex h-full items-center text-sm text-muted-foreground">
{isMobile ? "By " : null}
<ReferenceField
@@ -189,4 +199,14 @@ export const Note = ({
)}
</div>
);
+
+ if (isMobile) {
+ return (
+ <Link to={editPath} state={{ record: linkState }}>
+ {content}
+ </Link>
+ );
+ }
+
+ return content;
};
diff --git a/src/components/atomic-crm/notes/NoteCreate.tsx b/src/components/atomic-crm/notes/NoteCreate.tsx
index b73fde30..c86be32c 100644
--- a/src/components/atomic-crm/notes/NoteCreate.tsx
+++ b/src/components/atomic-crm/notes/NoteCreate.tsx
@@ -2,9 +2,10 @@ import {
CreateBase,
Form,
useGetIdentity,
- useListContext,
+ useListContextWithProps,
useNotify,
useRecordContext,
+ useRedirect,
useResourceContext,
useUpdate,
type Identifier,
@@ -16,11 +17,8 @@ import { cn } from "@/lib/utils";
import { NoteInputs } from "./NoteInputs";
import { getCurrentDate } from "./utils";
-
-const foreignKeyMapping = {
- contacts: "contact_id",
- deals: "deal_id",
-};
+import { foreignKeyMapping } from "./foreignKeyMapping";
+import { useIsMobile } from "@/hooks/use-mobile";
export const NoteCreate = ({
reference,
@@ -49,20 +47,22 @@ export const NoteCreate = ({
);
};
-const NoteCreateButton = ({
+export const NoteCreateButton = ({
reference,
record,
}: {
reference: "contacts" | "deals";
- record: RaRecord<Identifier>;
+ record?: RaRecord<Identifier>;
}) => {
+ const isMobile = useIsMobile();
+ const redirect = useRedirect();
const [update] = useUpdate();
const notify = useNotify();
const { identity } = useGetIdentity();
const { reset } = useFormContext();
- const { refetch } = useListContext();
+ const { refetch } = useListContextWithProps();
- if (!record || !identity) return null;
+ if (!identity) return null;
const resetValues: {
date: string;
@@ -80,14 +80,19 @@ const NoteCreateButton = ({
}
const handleSuccess = (data: any) => {
+ const referenceRecordId = record?.id || data[foreignKeyMapping[reference]];
+ if (!referenceRecordId) return;
reset(resetValues, { keepValues: false });
- refetch();
update(reference, {
- id: (record && record.id) as unknown as Identifier,
+ id: referenceRecordId as unknown as Identifier,
data: { last_seen: new Date().toISOString(), status: data.status },
previousData: record,
});
+ if (refetch) refetch();
notify("Note added");
+ if (isMobile) {
+ redirect("show", reference, referenceRecordId);
+ }
};
return (
@@ -97,7 +102,8 @@ const NoteCreateButton = ({
label="Add this note"
transform={(data) => ({
...data,
- [foreignKeyMapping[reference]]: record.id,
+ [foreignKeyMapping[reference]]:
+ record?.id || data[foreignKeyMapping[reference]],
sales_id: identity.id,
date: data.date || getCurrentDate(),
})}
diff --git a/src/components/atomic-crm/notes/NoteInputs.tsx b/src/components/atomic-crm/notes/NoteInputs.tsx
index c97eaa7b..24b3df34 100644
--- a/src/components/atomic-crm/notes/NoteInputs.tsx
+++ b/src/components/atomic-crm/notes/NoteInputs.tsx
@@ -11,8 +11,22 @@ import { cn } from "@/lib/utils";
import { Status } from "../misc/Status";
import { useConfigurationContext } from "../root/ConfigurationContext";
import { getCurrentDate } from "./utils";
+import { foreignKeyMapping } from "./foreignKeyMapping";
+import { AutocompleteInput, ReferenceInput } from "@/components/admin";
+import { required } from "ra-core";
+import { contactOptionText } from "../misc/ContactOption";
+import { useIsMobile } from "@/hooks/use-mobile";
-export const NoteInputs = ({ showStatus }: { showStatus?: boolean }) => {
+export const NoteInputs = ({
+ showStatus,
+ selectReference,
+ reference,
+}: {
+ showStatus?: boolean;
+ selectReference?: boolean;
+ reference?: "contacts" | "deals";
+}) => {
+ const isMobile = useIsMobile();
const { noteStatuses } = useConfigurationContext();
const { setValue } = useFormContext();
const [displayMore, setDisplayMore] = useState(false);
@@ -28,7 +42,23 @@ export const NoteInputs = ({ showStatus }: { showStatus?: boolean }) => {
rows={6}
/>
- {!displayMore && (
+ {selectReference && reference && (
+ <ReferenceInput
+ source={foreignKeyMapping[reference]}
+ reference={reference}
+ >
+ <AutocompleteInput
+ label={reference === "contacts" ? "Contact" : "Deal"}
+ optionText={
+ reference === "contacts" ? contactOptionText : undefined
+ }
+ helperText={false}
+ validate={required()}
+ />
+ </ReferenceInput>
+ )}
+
+ {!displayMore && !isMobile && (
<div className="flex justify-end items-center gap-2">
<Button
variant="link"
@@ -49,11 +79,12 @@ export const NoteInputs = ({ showStatus }: { showStatus?: boolean }) => {
<div
className={cn(
- "space-y-3 mt-3 overflow-hidden transition-transform ease-in-out duration-300 origin-top",
- !displayMore ? "scale-y-0 max-h-0 h-0" : "scale-y-100",
+ "space-y-3 mt-3 overflow-hidden origin-top",
+ !isMobile ? "transition-transform ease-in-out duration-300 " : "",
+ !displayMore && !isMobile ? "scale-y-0 max-h-0 h-0" : "scale-y-100",
)}
>
- <div className="grid grid-cols-2 gap-4">
+ <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
{showStatus && (
<SelectInput
source="status"
diff --git a/src/components/atomic-crm/notes/NotesIterator.tsx b/src/components/atomic-crm/notes/NotesIterator.tsx
index 695fb3ac..8a0e2763 100644
--- a/src/components/atomic-crm/notes/NotesIterator.tsx
+++ b/src/components/atomic-crm/notes/NotesIterator.tsx
@@ -4,6 +4,7 @@ import { Separator } from "@/components/ui/separator";
import { Note } from "./Note";
import { NoteCreate } from "./NoteCreate";
+import { useIsMobile } from "@/hooks/use-mobile";
export const NotesIterator = ({
reference,
@@ -12,13 +13,16 @@ export const NotesIterator = ({
reference: "contacts" | "deals";
showStatus?: boolean;
}) => {
+ const isMobile = useIsMobile();
const { data, error, isPending } = useListContext();
if (isPending || error) return null;
return (
- <div className="mt-4">
- <NoteCreate reference={reference} showStatus={showStatus} />
+ <div className="md:mt-4">
+ {isMobile ? null : (
+ <NoteCreate reference={reference} showStatus={showStatus} />
+ )}
{data && (
- <div className="mt-4 space-y-4">
+ <div className="md:mt-4 space-y-4">
{data.map((note, index) => (
<Fragment key={index}>
<Note
diff --git a/src/components/atomic-crm/notes/foreignKeyMapping.ts b/src/components/atomic-crm/notes/foreignKeyMapping.ts
new file mode 100644
index 00000000..b70e53a1
--- /dev/null
+++ b/src/components/atomic-crm/notes/foreignKeyMapping.ts
@@ -0,0 +1,4 @@
+export const foreignKeyMapping = {
+ contacts: "contact_id",
+ deals: "deal_id",
+};
diff --git a/src/components/atomic-crm/root/CRM.tsx b/src/components/atomic-crm/root/CRM.tsx
index 21d71f39..593bc796 100644
--- a/src/components/atomic-crm/root/CRM.tsx
+++ b/src/components/atomic-crm/root/CRM.tsx
@@ -47,6 +47,8 @@ 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";
export type CRMProps = {
dataProvider?: DataProvider;
@@ -215,7 +217,11 @@ const MobileAdmin = (props: CoreAdminProps) => {
<Route path={OAuthConsentPage.path} element={<OAuthConsentPage />} />
</CustomRoutes>
<Resource name="contacts" {...contacts} />
- <Resource name="contactNotes" />
+ <Resource
+ name="contactNotes"
+ edit={MobileNoteEdit}
+ create={MobileNoteCreate}
+ />
<Resource
name="tasks"
list={MobileTasksList}