A full-featured CRM built with React, shadcn/ui, and Supabase.
Default note status to the contact status
Anibal Svarcas2d5b50b2fb75
diff --git a/src/components/atomic-crm/notes/NoteCreate.tsx b/src/components/atomic-crm/notes/NoteCreate.tsxindex 9a5e50c0..8a7fb83b 100644--- a/src/components/atomic-crm/notes/NoteCreate.tsx+++ b/src/components/atomic-crm/notes/NoteCreate.tsx@@ -16,7 +16,7 @@ import { SaveButton } from "@/components/admin/form";import { cn } from "@/lib/utils";import { NoteInputs } from "./NoteInputs";-import { getCurrentDate } from "./utils";+import { getCurrentDate, getDefaultContactStatus } from "./utils";import { foreignKeyMapping } from "./foreignKeyMapping";export const NoteCreate = ({@@ -34,12 +34,21 @@ export const NoteCreate = ({if (!record || !identity) return null;+ const defaultStatus =+ reference === "contacts"+ ? getDefaultContactStatus(record.status)+ : undefined;+return (<CreateBase resource={resource} redirect={false}><Form><div className={cn("space-y-3", className)}>- <NoteInputs showStatus={showStatus} />- <NoteCreateButton reference={reference} record={record} />+ <NoteInputs defaultStatus={defaultStatus} showStatus={showStatus} />+ <NoteCreateButton+ defaultStatus={defaultStatus}+ record={record}+ reference={reference}+ /></div></Form></CreateBase>@@ -47,9 +56,11 @@ export const NoteCreate = ({};const NoteCreateButton = ({+ defaultStatus,reference,record,}: {+ defaultStatus?: string;reference: "contacts" | "deals";record: RaRecord<Identifier>;}) => {@@ -73,11 +84,13 @@ const NoteCreateButton = ({attachments: null,};- if (reference === "contacts") {- resetValues.status = "warm";- }-const handleSuccess = (data: any) => {+ if (reference === "contacts") {+ resetValues.status = getDefaultContactStatus(+ data.status ?? defaultStatus,+ );+ }+reset(resetValues, { keepValues: false });refetch();update(reference, {diff --git a/src/components/atomic-crm/notes/NoteCreateSheet.tsx b/src/components/atomic-crm/notes/NoteCreateSheet.tsxindex 3e107b84..000701a9 100644--- a/src/components/atomic-crm/notes/NoteCreateSheet.tsx+++ b/src/components/atomic-crm/notes/NoteCreateSheet.tsx@@ -12,7 +12,7 @@ import {import { CreateSheet } from "../misc/CreateSheet";import { foreignKeyMapping } from "./foreignKeyMapping";import { NoteInputs } from "./NoteInputs";-import { getCurrentDate } from "./utils";+import { getCurrentDate, getDefaultContactStatus } from "./utils";export interface NoteCreateSheetProps {open: boolean;@@ -39,6 +39,9 @@ export const NoteCreateSheet = ({const redirect = useRedirect();const translate = useTranslate();const getContactRepresentation = useGetRecordRepresentation("contacts");+ const defaultStatus = selectContact+ ? undefined+ : getDefaultContactStatus(contact?.status);if (!identity) return null;@@ -91,6 +94,7 @@ export const NoteCreateSheet = ({onOpenChange={onOpenChange}><NoteInputs+ defaultStatus={defaultStatus}showStatusreference="contacts"selectReference={selectContact}diff --git a/src/components/atomic-crm/notes/NoteInputs.test.tsx b/src/components/atomic-crm/notes/NoteInputs.test.tsxindex 3c84a6fb..fe3d7dde 100644--- a/src/components/atomic-crm/notes/NoteInputs.test.tsx+++ b/src/components/atomic-crm/notes/NoteInputs.test.tsx@@ -70,6 +70,16 @@ describe("NoteInputs", () => {await expect.element(screen.getByText("Status")).toBeVisible();});+ it("defaults the status selector to the current contact status", async () => {+ const screen = await render(+ <NoteInputsStory defaultStatus="hot" showStatus />,+ );++ await screen.getByRole("button", { name: "Show options" }).click();++ await expect.element(screen.getByRole("combobox")).toHaveTextContent("Hot");+ });+it("does not render the status selector when showStatus is false", async () => {const screen = await render(<Default />);diff --git a/src/components/atomic-crm/notes/NoteInputs.tsx b/src/components/atomic-crm/notes/NoteInputs.tsxindex 7dca1526..e6382434 100644--- a/src/components/atomic-crm/notes/NoteInputs.tsx+++ b/src/components/atomic-crm/notes/NoteInputs.tsx@@ -1,15 +1,16 @@-import { useState } from "react";-import { required, useTranslate } from "ra-core";+import { useEffect, useState } from "react";+import { required, useGetOne, useTranslate } from "ra-core";import { TextInput } from "@/components/admin/text-input";import { FileInput } from "@/components/admin/file-input";import { SelectInput } from "@/components/admin/select-input";import { DateTimeInput } from "@/components/admin/date-time-input";import { Button } from "@/components/ui/button";import { cn } from "@/lib/utils";+import { useFormContext, useWatch } from "react-hook-form";import { Status } from "../misc/Status";import { useConfigurationContext } from "../root/ConfigurationContext";-import { getCurrentDate } from "./utils";+import { getCurrentDate, getDefaultContactStatus } from "./utils";import { AttachmentField } from "./AttachmentField";import { foreignKeyMapping } from "./foreignKeyMapping";import { AutocompleteInput, ReferenceInput } from "@/components/admin";@@ -18,6 +19,9 @@ import { useIsMobile } from "@/hooks/use-mobile";type NoteFormValues = {attachments?: unknown[] | null;+ contact_id?: number | string;+ deal_id?: number | string;+ status?: string;text?: string | null;};@@ -35,10 +39,12 @@ const validateNoteOrAttachmentRequired = (};export const NoteInputs = ({+ defaultStatus,showStatus,selectReference,reference,}: {+ defaultStatus?: string;showStatus?: boolean;selectReference?: boolean;reference?: "contacts" | "deals";@@ -47,6 +53,47 @@ export const NoteInputs = ({const { noteStatuses } = useConfigurationContext();const translate = useTranslate();const [displayMore, setDisplayMore] = useState(false);+ const { control, formState, setValue } = useFormContext<NoteFormValues>();+ const selectedContactId = useWatch({ control, name: "contact_id" });+ const selectedStatus = useWatch({ control, name: "status" });+ const shouldHydrateStatus =+ showStatus &&+ (defaultStatus !== undefined ||+ (reference === "contacts" && Boolean(selectReference)));+ const { data: selectedContact } = useGetOne(+ "contacts",+ { id: selectedContactId! },+ {+ enabled:+ shouldHydrateStatus &&+ reference === "contacts" &&+ Boolean(selectReference) &&+ selectedContactId != null,+ },+ );+ const resolvedDefaultStatus = shouldHydrateStatus+ ? reference === "contacts" && selectReference+ ? getDefaultContactStatus(selectedContact?.status)+ : getDefaultContactStatus(defaultStatus)+ : undefined;++ useEffect(() => {+ if (!shouldHydrateStatus || !resolvedDefaultStatus) return;+ if (+ formState.dirtyFields.status ||+ selectedStatus === resolvedDefaultStatus+ ) {+ return;+ }++ setValue("status", resolvedDefaultStatus, { shouldDirty: false });+ }, [+ formState.dirtyFields.status,+ resolvedDefaultStatus,+ selectedStatus,+ setValue,+ shouldHydrateStatus,+ ]);// We manually define the input labels because the default ones// would use the resource from the context, which is either "contact_notes" or "deal_notes",@@ -120,7 +167,7 @@ export const NoteInputs = ({value: status.value,}))}optionText={optionRenderer}- defaultValue="warm"+ defaultValue={resolvedDefaultStatus}helperText={false}/>)}