Skip to content

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

update contact form to add an empty inputs when no inputs, and clean them on submit

ThieryMichel81dd1097fd58
diff --git a/src/components/atomic-crm/contacts/ContactCreate.tsx b/src/components/atomic-crm/contacts/ContactCreate.tsx
index e02c8939..95c027ab 100644
--- a/src/components/atomic-crm/contacts/ContactCreate.tsx
+++ b/src/components/atomic-crm/contacts/ContactCreate.tsx
@@ -5,20 +5,26 @@ import type { Contact } from "../types";
import { ContactInputs } from "./ContactInputs";
import { FormToolbar } from "../layout/FormToolbar";
+const transformContact = (data: Contact) => {
+ const cleanedEmailJsonb =
+ data.email_jsonb?.filter((e) => e.email !== null) || [];
+ const cleanedPhoneJsonb =
+ data.phone_jsonb?.filter((p) => p.number !== null) || [];
+ return {
+ ...data,
+ first_seen: new Date().toISOString(),
+ last_seen: new Date().toISOString(),
+ tags: [],
+ phone_jsonb: cleanedPhoneJsonb.length > 0 ? cleanedPhoneJsonb : null,
+ email_jsonb: cleanedEmailJsonb.length > 0 ? cleanedEmailJsonb : null,
+ };
+};
+
export const ContactCreate = () => {
const { identity } = useGetIdentity();
+
return (
- <CreateBase
- redirect="show"
- transform={(data: Contact) => ({
- ...data,
- first_seen: new Date().toISOString(),
- last_seen: new Date().toISOString(),
- tags: [],
- phone_jsonb: data.phone_jsonb?.filter((p) => p.number !== null) || [],
- email_jsonb: data.email_jsonb?.filter((e) => e.email !== null) || [],
- })}
- >
+ <CreateBase redirect="show" transform={transformContact}>
<div className="mt-2 flex lg:mr-72">
<div className="flex-1">
<Form defaultValues={{ sales_id: identity?.id }}>
diff --git a/src/components/atomic-crm/contacts/ContactEdit.tsx b/src/components/atomic-crm/contacts/ContactEdit.tsx
index fe5e4d0d..a03164cb 100644
--- a/src/components/atomic-crm/contacts/ContactEdit.tsx
+++ b/src/components/atomic-crm/contacts/ContactEdit.tsx
@@ -6,18 +6,45 @@ import { ContactAside } from "./ContactAside";
import { ContactInputs } from "./ContactInputs";
import { FormToolbar } from "../layout/FormToolbar";
+const transformContact = (data: Contact) => {
+ const cleanedEmailJsonb =
+ data.email_jsonb?.filter((e) => e.email !== null) || [];
+ const cleanedPhoneJsonb =
+ data.phone_jsonb?.filter((p) => p.number !== null) || [];
+ return {
+ ...data,
+ phone_jsonb: cleanedPhoneJsonb.length > 0 ? cleanedPhoneJsonb : null,
+ email_jsonb: cleanedEmailJsonb.length > 0 ? cleanedEmailJsonb : null,
+ };
+};
+
export const ContactEdit = () => (
- <EditBase redirect="show">
+ <EditBase redirect="show" transform={transformContact}>
<ContactEditContent />
</EditBase>
);
+const normalizeContactArrayFields = (record: Contact) => ({
+ ...record,
+ email_jsonb:
+ record.email_jsonb && record.email_jsonb.length > 0
+ ? record.email_jsonb
+ : [{ email: null, type: null }],
+ phone_jsonb:
+ record.phone_jsonb && record.phone_jsonb.length > 0
+ ? record.phone_jsonb
+ : [{ number: null, type: null }],
+});
+
const ContactEditContent = () => {
const { isPending, record } = useEditContext<Contact>();
if (isPending || !record) return null;
return (
<div className="mt-2 flex gap-8">
- <Form className="flex flex-1 flex-col gap-4">
+ <Form
+ className="flex flex-1 flex-col gap-4"
+ record={normalizeContactArrayFields(record)}
+ >
<Card>
<CardContent>
<ContactInputs />
diff --git a/src/components/atomic-crm/contacts/ContactInputs.tsx b/src/components/atomic-crm/contacts/ContactInputs.tsx
index 3bd51ab9..87bcbab3 100644
--- a/src/components/atomic-crm/contacts/ContactInputs.tsx
+++ b/src/components/atomic-crm/contacts/ContactInputs.tsx
@@ -1,5 +1,5 @@
import { email, required, useTranslate } from "ra-core";
-import type { FocusEvent, ClipboardEventHandler } from "react";
+import { type FocusEvent, type ClipboardEventHandler } from "react";
import { useFormContext } from "react-hook-form";
import { Separator } from "@/components/ui/separator";
import { useIsMobile } from "@/hooks/use-mobile";