@hed-hog/contact 0.0.270 → 0.0.274

package/hedhog/frontend/app/person/_components/person-form-sheet.tsx.ejs

@@ -26,21 +26,21 @@ import {
   SelectValue,
 } from '@/components/ui/select';
 import { Separator } from '@/components/ui/separator';
-import {
-  Sheet,
-  SheetContent,
-  SheetDescription,
-  SheetHeader,
-  SheetTitle,
-} from '@/components/ui/sheet';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@/components/ui/tooltip';
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from '@/components/ui/sheet';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip';
 import { COUNTRIES } from '@/constants/countries';
 import { cn } from '@/lib/utils';
-import { useApp } from '@hed-hog/next-app-provider';
+import { useApp, useQuery } from '@hed-hog/next-app-provider';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { format } from 'date-fns';
 import { enUS, ptBR } from 'date-fns/locale';
@@ -75,6 +75,9 @@ import {
   type PersonContact,
   type PersonDocument,
   type PersonGender,
+  type PersonLifecycleStage,
+  type PersonSource,
+  type UserOption,
 } from './person-types';
 
 type PersonFormSheetProps = {
@@ -97,6 +100,10 @@ type PersonFormValues = {
   trade_name?: string | null;
   foundation_date?: Date | null;
   legal_nature?: string | null;
+  owner_user_id?: number | null;
+  source?: PersonSource | null;
+  lifecycle_stage?: PersonLifecycleStage | null;
+  next_action_at?: string | null;
 };
 
 type CreatePersonPayload = {
@@ -115,73 +122,81 @@ type OpenFilePayload = {
   url?: string;
 };
 
-type EditablePersonContact = Omit<PersonContact, 'contact_type_id'> & {
-  clientId: string;
-  contact_type_id: number | null;
-};
+type EditablePersonContact = Omit<PersonContact, 'contact_type_id'> & {
+  clientId: string;
+  contact_type_id: number | null;
+};
 
 type EditablePersonAddress = PersonAddress & {
   clientId: string;
 };
 
-type EditablePersonDocument = Omit<PersonDocument, 'document_type_id'> & {
-  clientId: string;
-  document_type_id: number | null;
-};
-
-function createClientId(prefix: string) {
-  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-}
-
-function onlyDigits(value: string) {
-  return value.replace(/\D/g, '');
-}
-
-function applyPhoneMask(value: string) {
-  const digits = onlyDigits(value).slice(0, 11);
-
-  if (digits.length <= 2) {
-    return digits.length ? `(${digits}` : '';
-  }
-
-  if (digits.length <= 6) {
-    return `(${digits.slice(0, 2)}) ${digits.slice(2)}`;
-  }
-
-  if (digits.length <= 10) {
-    return `(${digits.slice(0, 2)}) ${digits.slice(2, 6)}-${digits.slice(6)}`;
-  }
-
-  return `(${digits.slice(0, 2)}) ${digits.slice(2, 7)}-${digits.slice(7)}`;
-}
-
-function applyCpfMask(value: string) {
-  const digits = onlyDigits(value).slice(0, 11);
-
-  if (digits.length <= 3) return digits;
-  if (digits.length <= 6)
-    return `${digits.slice(0, 3)}.${digits.slice(3)}`;
-  if (digits.length <= 9)
-    return `${digits.slice(0, 3)}.${digits.slice(3, 6)}.${digits.slice(6)}`;
-
-  return `${digits.slice(0, 3)}.${digits.slice(3, 6)}.${digits.slice(6, 9)}-${digits.slice(9)}`;
-}
-
-function applyCnpjMask(value: string) {
-  const digits = onlyDigits(value).slice(0, 14);
-
-  if (digits.length <= 2) return digits;
-  if (digits.length <= 5)
-    return `${digits.slice(0, 2)}.${digits.slice(2)}`;
-  if (digits.length <= 8)
-    return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5)}`;
-  if (digits.length <= 12)
-    return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5, 8)}/${digits.slice(8)}`;
-
-  return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5, 8)}/${digits.slice(8, 12)}-${digits.slice(12)}`;
-}
-
-async function fetchViaCep(cep: string) {
+type EditablePersonDocument = Omit<PersonDocument, 'document_type_id'> & {
+  clientId: string;
+  document_type_id: number | null;
+};
+
+function createClientId(prefix: string) {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+}
+
+function onlyDigits(value: string) {
+  return value.replace(/\D/g, '');
+}
+
+function applyPhoneMask(value: string) {
+  const digits = onlyDigits(value).slice(0, 11);
+
+  if (digits.length <= 2) {
+    return digits.length ? `(${digits}` : '';
+  }
+
+  if (digits.length <= 6) {
+    return `(${digits.slice(0, 2)}) ${digits.slice(2)}`;
+  }
+
+  if (digits.length <= 10) {
+    return `(${digits.slice(0, 2)}) ${digits.slice(2, 6)}-${digits.slice(6)}`;
+  }
+
+  return `(${digits.slice(0, 2)}) ${digits.slice(2, 7)}-${digits.slice(7)}`;
+}
+
+function applyCpfMask(value: string) {
+  const digits = onlyDigits(value).slice(0, 11);
+
+  if (digits.length <= 3) return digits;
+  if (digits.length <= 6) return `${digits.slice(0, 3)}.${digits.slice(3)}`;
+  if (digits.length <= 9)
+    return `${digits.slice(0, 3)}.${digits.slice(3, 6)}.${digits.slice(6)}`;
+
+  return `${digits.slice(0, 3)}.${digits.slice(3, 6)}.${digits.slice(6, 9)}-${digits.slice(9)}`;
+}
+
+function applyCnpjMask(value: string) {
+  const digits = onlyDigits(value).slice(0, 14);
+
+  if (digits.length <= 2) return digits;
+  if (digits.length <= 5) return `${digits.slice(0, 2)}.${digits.slice(2)}`;
+  if (digits.length <= 8)
+    return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5)}`;
+  if (digits.length <= 12)
+    return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5, 8)}/${digits.slice(8)}`;
+
+  return `${digits.slice(0, 2)}.${digits.slice(2, 5)}.${digits.slice(5, 8)}/${digits.slice(8, 12)}-${digits.slice(12)}`;
+}
+
+function toDatetimeLocalValue(value?: string | null) {
+  if (!value) return '';
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return '';
+
+  const offset = date.getTimezoneOffset();
+  const localDate = new Date(date.getTime() - offset * 60 * 1000);
+  return localDate.toISOString().slice(0, 16);
+}
+
+async function fetchViaCep(cep: string) {
   try {
     const response = await fetch(`https://viacep.com.br/ws/${cep}/json/`);
     if (!response.ok) return null;
@@ -253,7 +268,7 @@ function DatePickerWithYearMonth({
           type="button"
           variant="outline"
           className={cn(
-            'h-9 w-full min-w-0 justify-start text-left font-normal',
+            'h-9 w-full min-w-0 justify-start text-left text-xs font-normal',
             !date && 'text-muted-foreground'
           )}
         >
@@ -324,7 +339,7 @@ export function PersonFormSheet({
   onSuccess,
 }: PersonFormSheetProps) {
   const t = useTranslations('contact.ContactPage');
-  const { request, currentLocaleCode, getSettingValue } = useApp();
+  const { request, currentLocaleCode, getSettingValue, user } = useApp();
   const isEditing = Boolean(person);
   const allowCompanyRegistration =
     getSettingValue('contact-allow-company-registration') !== false;
@@ -343,6 +358,31 @@ export function PersonFormSheet({
         trade_name: z.string().nullable().optional(),
         foundation_date: z.date().nullable().optional(),
         legal_nature: z.string().nullable().optional(),
+        owner_user_id: z.number().int().nullable().optional(),
+        source: z
+          .enum([
+            'referral',
+            'website',
+            'social',
+            'inbound',
+            'outbound',
+            'other',
+          ])
+          .nullable()
+          .optional(),
+        lifecycle_stage: z
+          .enum([
+            'new',
+            'contacted',
+            'qualified',
+            'proposal',
+            'negotiation',
+            'customer',
+            'lost',
+          ])
+          .nullable()
+          .optional(),
+        next_action_at: z.string().nullable().optional(),
       }),
     [t]
   );
@@ -360,6 +400,10 @@ export function PersonFormSheet({
       trade_name: '',
       foundation_date: null,
       legal_nature: '',
+      owner_user_id: null,
+      source: null,
+      lifecycle_stage: 'new',
+      next_action_at: '',
     },
   });
   const {
@@ -383,32 +427,46 @@ export function PersonFormSheet({
   const [persistedAvatarId, setPersistedAvatarId] = useState<number | null>(
     null
   );
-  const [avatarPreviewUrl, setAvatarPreviewUrl] =
-    useState<string>('/placeholder.png');
-  const [isUploadingAvatar, setIsUploadingAvatar] = useState(false);
-  const [avatarUploadProgress, setAvatarUploadProgress] = useState(0);
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  const hasSavedChangesRef = useRef(false);
-  const contactValueRefs = useRef<Record<string, HTMLInputElement | null>>({});
-  const addressLine1Refs = useRef<Record<string, HTMLInputElement | null>>({});
-  const documentValueRefs = useRef<Record<string, HTMLInputElement | null>>({});
-
-  const focusWhenAvailable = (getElement: () => HTMLInputElement | null) => {
-    requestAnimationFrame(() => {
-      const element = getElement();
-      if (!element) {
-        setTimeout(() => {
-          getElement()?.focus();
-        }, 0);
-        return;
-      }
-
-      element.focus();
-    });
-  };
+  const [avatarPreviewUrl, setAvatarPreviewUrl] =
+    useState<string>('/placeholder.png');
+  const [isUploadingAvatar, setIsUploadingAvatar] = useState(false);
+  const [avatarUploadProgress, setAvatarUploadProgress] = useState(0);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const hasSavedChangesRef = useRef(false);
+  const contactValueRefs = useRef<Record<string, HTMLInputElement | null>>({});
+  const addressLine1Refs = useRef<Record<string, HTMLInputElement | null>>({});
+  const documentValueRefs = useRef<Record<string, HTMLInputElement | null>>({});
+
+  const focusWhenAvailable = (getElement: () => HTMLInputElement | null) => {
+    requestAnimationFrame(() => {
+      const element = getElement();
+      if (!element) {
+        setTimeout(() => {
+          getElement()?.focus();
+        }, 0);
+        return;
+      }
+
+      element.focus();
+    });
+  };
 
   const watchType = watch('type');
 
+  const { data: ownerOptions = [] } = useQuery<UserOption[]>({
+    queryKey: ['contact-person-owner-options', currentLocaleCode],
+    queryFn: async () => {
+      const response = await request<UserOption[] | { data?: UserOption[] }>({
+        url: '/person/owner-options',
+        method: 'GET',
+      });
+      return Array.isArray(response.data)
+        ? response.data
+        : response.data?.data || [];
+    },
+    placeholderData: (old: UserOption[] | undefined) => old ?? [],
+  });
+
   useEffect(() => {
     if (canUseCompanyType || watchType !== 'company') {
       return;
@@ -436,6 +494,12 @@ export function PersonFormSheet({
         ? new Date(person.foundation_date)
         : null,
       legal_nature: person?.legal_nature || '',
+      owner_user_id:
+        person?.owner_user_id ??
+        (person ? null : Number(user?.id || 0) || null),
+      source: person?.source || null,
+      lifecycle_stage: person?.lifecycle_stage || 'new',
+      next_action_at: toDatetimeLocalValue(person?.next_action_at || null),
     });
     const initialAvatarId = person?.avatar_id ?? null;
     setAvatarId(initialAvatarId);
@@ -444,17 +508,17 @@ export function PersonFormSheet({
     setIsUploadingAvatar(false);
     setAvatarUploadProgress(0);
 
-    setContacts(
-      (person?.contact || []).map((contact, index) => ({
-        ...contact,
-        value: ['PHONE', 'MOBILE', 'WHATSAPP'].includes(
-          String(contact.contact_type?.code || '').toUpperCase()
-        )
-          ? applyPhoneMask(contact.value || '')
-          : contact.value || '',
-        clientId: `contact-${contact.id ?? index}`,
-      }))
-    );
+    setContacts(
+      (person?.contact || []).map((contact, index) => ({
+        ...contact,
+        value: ['PHONE', 'MOBILE', 'WHATSAPP'].includes(
+          String(contact.contact_type?.code || '').toUpperCase()
+        )
+          ? applyPhoneMask(contact.value || '')
+          : contact.value || '',
+        clientId: `contact-${contact.id ?? index}`,
+      }))
+    );
 
     setAddresses(
       (person?.address || []).map((address, index) => ({
@@ -463,25 +527,25 @@ export function PersonFormSheet({
       }))
     );
 
-    setDocuments(
-      (person?.document || []).map((document, index) => ({
-        ...document,
-        value:
-          String(document.document_type?.code || '').toUpperCase() === 'CPF'
-            ? applyCpfMask(document.value || '')
-            : String(document.document_type?.code || '').toUpperCase() ===
-                'CNPJ'
-              ? applyCnpjMask(document.value || '')
-              : document.value || '',
-        clientId: `document-${document.id ?? index}`,
-      }))
-    );
+    setDocuments(
+      (person?.document || []).map((document, index) => ({
+        ...document,
+        value:
+          String(document.document_type?.code || '').toUpperCase() === 'CPF'
+            ? applyCpfMask(document.value || '')
+            : String(document.document_type?.code || '').toUpperCase() ===
+                'CNPJ'
+              ? applyCnpjMask(document.value || '')
+              : document.value || '',
+        clientId: `document-${document.id ?? index}`,
+      }))
+    );
 
     setContactsOpen(true);
     setAddressesOpen(true);
     setDocumentsOpen(true);
     setLoadingCEP({});
-  }, [allowCompanyRegistration, open, person, reset]);
+  }, [allowCompanyRegistration, open, person, reset, user?.id]);
 
   const getPersonInitials = (name: string) =>
     name
@@ -630,99 +694,128 @@ export function PersonFormSheet({
     onOpenChange(false);
   };
 
-  const getContactTypeCode = (contactTypeId?: number | null) =>
-    String(
-      contactTypes.find(
-        (contactType) => contactType.contact_type_id === contactTypeId
-      )?.code || ''
-    ).toUpperCase();
-
-  const getDocumentTypeCode = (documentTypeId?: number | null) =>
-    String(
-      documentTypes.find(
-        (documentType) => documentType.document_type_id === documentTypeId
-      )?.code || ''
-    ).toUpperCase();
-
-  const maskContactValueByType = (
-    value: string,
-    contactTypeId?: number | null,
-    fallbackCode?: string
-  ) => {
-    const code = (fallbackCode || getContactTypeCode(contactTypeId)).toUpperCase();
-    if (['PHONE', 'MOBILE', 'WHATSAPP'].includes(code)) {
-      return applyPhoneMask(value);
-    }
-
-    return value;
-  };
-
-  const maskDocumentValueByType = (
-    value: string,
-    documentTypeId?: number | null,
-    fallbackCode?: string
-  ) => {
-    const code = (fallbackCode || getDocumentTypeCode(documentTypeId)).toUpperCase();
-
-    if (code === 'CPF') {
-      return applyCpfMask(value);
-    }
-
-    if (code === 'CNPJ') {
-      return applyCnpjMask(value);
-    }
-
-    return value;
-  };
-
-  const resolveContactTypeIdByCodes = (codes: string[]) => {
-    const normalizedCodes = codes.map((code) => code.toUpperCase());
-    return (
-      contactTypes.find((contactType) =>
-        normalizedCodes.includes(String(contactType.code || '').toUpperCase())
-      )?.contact_type_id || null
-    );
-  };
-
-  const resolveDocumentTypeIdByCodes = (codes: string[]) => {
-    const normalizedCodes = codes.map((code) => code.toUpperCase());
-    return (
-      documentTypes.find((documentType) =>
-        normalizedCodes.includes(String(documentType.code || '').toUpperCase())
-      )?.document_type_id || null
-    );
-  };
-
-  const addContact = (preset: 'email' | 'phone' | 'blank' = 'blank') => {
-    const presetTypeId =
-      preset === 'email'
-        ? resolveContactTypeIdByCodes(['EMAIL'])
-        : preset === 'phone'
-          ? resolveContactTypeIdByCodes(['PHONE', 'MOBILE', 'WHATSAPP'])
-          : null;
-
-    const selectedTypeId = presetTypeId;
-    const hasPrimaryForType = contacts.some(
-      (contact) =>
-        selectedTypeId !== null &&
-        contact.contact_type_id === selectedTypeId &&
-        contact.is_primary
-    );
-
-    const clientId = createClientId('contact');
-
-    setContactsOpen(true);
-    setContacts((previous) => [
-      ...previous,
-      {
-        clientId,
-        value: '',
-        is_primary: selectedTypeId !== null ? !hasPrimaryForType : false,
-        contact_type_id: selectedTypeId,
-      },
-    ]);
-    focusWhenAvailable(() => contactValueRefs.current[clientId] || null);
-  };
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 's') {
+        event.preventDefault();
+        const formElement = document.getElementById(
+          'person-form'
+        ) as HTMLFormElement | null;
+        formElement?.requestSubmit();
+        return;
+      }
+
+      if (event.key === 'Escape' && !isSubmitting && !isUploadingAvatar) {
+        event.preventDefault();
+        handleSheetOpenChange(false);
+      }
+    };
+
+    window.addEventListener('keydown', onKeyDown);
+    return () => window.removeEventListener('keydown', onKeyDown);
+  }, [open, isSubmitting, isUploadingAvatar, handleSheetOpenChange]);
+
+  const getContactTypeCode = (contactTypeId?: number | null) =>
+    String(
+      contactTypes.find(
+        (contactType) => contactType.contact_type_id === contactTypeId
+      )?.code || ''
+    ).toUpperCase();
+
+  const getDocumentTypeCode = (documentTypeId?: number | null) =>
+    String(
+      documentTypes.find(
+        (documentType) => documentType.document_type_id === documentTypeId
+      )?.code || ''
+    ).toUpperCase();
+
+  const maskContactValueByType = (
+    value: string,
+    contactTypeId?: number | null,
+    fallbackCode?: string
+  ) => {
+    const code = (
+      fallbackCode || getContactTypeCode(contactTypeId)
+    ).toUpperCase();
+    if (['PHONE', 'MOBILE', 'WHATSAPP'].includes(code)) {
+      return applyPhoneMask(value);
+    }
+
+    return value;
+  };
+
+  const maskDocumentValueByType = (
+    value: string,
+    documentTypeId?: number | null,
+    fallbackCode?: string
+  ) => {
+    const code = (
+      fallbackCode || getDocumentTypeCode(documentTypeId)
+    ).toUpperCase();
+
+    if (code === 'CPF') {
+      return applyCpfMask(value);
+    }
+
+    if (code === 'CNPJ') {
+      return applyCnpjMask(value);
+    }
+
+    return value;
+  };
+
+  const resolveContactTypeIdByCodes = (codes: string[]) => {
+    const normalizedCodes = codes.map((code) => code.toUpperCase());
+    return (
+      contactTypes.find((contactType) =>
+        normalizedCodes.includes(String(contactType.code || '').toUpperCase())
+      )?.contact_type_id || null
+    );
+  };
+
+  const resolveDocumentTypeIdByCodes = (codes: string[]) => {
+    const normalizedCodes = codes.map((code) => code.toUpperCase());
+    return (
+      documentTypes.find((documentType) =>
+        normalizedCodes.includes(String(documentType.code || '').toUpperCase())
+      )?.document_type_id || null
+    );
+  };
+
+  const addContact = (preset: 'email' | 'phone' | 'blank' = 'blank') => {
+    const presetTypeId =
+      preset === 'email'
+        ? resolveContactTypeIdByCodes(['EMAIL'])
+        : preset === 'phone'
+          ? resolveContactTypeIdByCodes(['PHONE', 'MOBILE', 'WHATSAPP'])
+          : null;
+
+    const selectedTypeId = presetTypeId;
+    const hasPrimaryForType = contacts.some(
+      (contact) =>
+        selectedTypeId !== null &&
+        contact.contact_type_id === selectedTypeId &&
+        contact.is_primary
+    );
+
+    const clientId = createClientId('contact');
+
+    setContactsOpen(true);
+    setContacts((previous) => [
+      ...previous,
+      {
+        clientId,
+        value: '',
+        is_primary: selectedTypeId !== null ? !hasPrimaryForType : false,
+        contact_type_id: selectedTypeId,
+      },
+    ]);
+    focusWhenAvailable(() => contactValueRefs.current[clientId] || null);
+  };
 
   const updateContact = (
     clientId: string,
@@ -747,9 +840,9 @@ export function PersonFormSheet({
     });
   };
 
-  const removeContact = (clientId: string) => {
-    delete contactValueRefs.current[clientId];
-    setContacts((previous) => {
+  const removeContact = (clientId: string) => {
+    delete contactValueRefs.current[clientId];
+    setContacts((previous) => {
       const removed = previous.find((contact) => contact.clientId === clientId);
       const next = previous.filter((contact) => contact.clientId !== clientId);
 
@@ -793,31 +886,31 @@ export function PersonFormSheet({
     });
   };
 
-  const addAddress = () => {
+  const addAddress = () => {
     const defaultType = ADDRESS_TYPE_OPTIONS[0]?.value || 'residential';
     const hasPrimaryForType = addresses.some(
       (address) => address.address_type === defaultType && address.is_primary
     );
 
-    const clientId = createClientId('address');
-
-    setAddressesOpen(true);
-    setAddresses((previous) => [
-      ...previous,
-      {
-        clientId,
-        line1: '',
-        line2: '',
-        city: '',
+    const clientId = createClientId('address');
+
+    setAddressesOpen(true);
+    setAddresses((previous) => [
+      ...previous,
+      {
+        clientId,
+        line1: '',
+        line2: '',
+        city: '',
         state: '',
         is_primary: !hasPrimaryForType,
         address_type: defaultType,
         postal_code: '',
-        country_code: 'BRA',
-      },
-    ]);
-    focusWhenAvailable(() => addressLine1Refs.current[clientId] || null);
-  };
+        country_code: 'BRA',
+      },
+    ]);
+    focusWhenAvailable(() => addressLine1Refs.current[clientId] || null);
+  };
 
   const updateAddress = (
     clientId: string,
@@ -842,9 +935,9 @@ export function PersonFormSheet({
     });
   };
 
-  const removeAddress = (clientId: string) => {
-    delete addressLine1Refs.current[clientId];
-    setAddresses((previous) => {
+  const removeAddress = (clientId: string) => {
+    delete addressLine1Refs.current[clientId];
+    setAddresses((previous) => {
       const removed = previous.find((address) => address.clientId === clientId);
       const next = previous.filter((address) => address.clientId !== clientId);
 
@@ -888,29 +981,29 @@ export function PersonFormSheet({
     });
   };
 
-  const addDocument = (preset: 'cpf' | 'cnpj' | 'rg' | 'blank' = 'blank') => {
-    const presetTypeId =
-      preset === 'cpf'
-        ? resolveDocumentTypeIdByCodes(['CPF'])
-        : preset === 'cnpj'
-          ? resolveDocumentTypeIdByCodes(['CNPJ'])
-          : preset === 'rg'
-            ? resolveDocumentTypeIdByCodes(['RG'])
-            : null;
-
-    const clientId = createClientId('document');
-
-    setDocumentsOpen(true);
-    setDocuments((previous) => [
-      ...previous,
-      {
-        clientId,
-        value: '',
-        document_type_id: presetTypeId,
-      },
-    ]);
-    focusWhenAvailable(() => documentValueRefs.current[clientId] || null);
-  };
+  const addDocument = (preset: 'cpf' | 'cnpj' | 'rg' | 'blank' = 'blank') => {
+    const presetTypeId =
+      preset === 'cpf'
+        ? resolveDocumentTypeIdByCodes(['CPF'])
+        : preset === 'cnpj'
+          ? resolveDocumentTypeIdByCodes(['CNPJ'])
+          : preset === 'rg'
+            ? resolveDocumentTypeIdByCodes(['RG'])
+            : null;
+
+    const clientId = createClientId('document');
+
+    setDocumentsOpen(true);
+    setDocuments((previous) => [
+      ...previous,
+      {
+        clientId,
+        value: '',
+        document_type_id: presetTypeId,
+      },
+    ]);
+    focusWhenAvailable(() => documentValueRefs.current[clientId] || null);
+  };
 
   const updateDocument = (
     clientId: string,
@@ -923,12 +1016,12 @@ export function PersonFormSheet({
     );
   };
 
-  const removeDocument = (clientId: string) => {
-    delete documentValueRefs.current[clientId];
-    setDocuments((previous) =>
-      previous.filter((document) => document.clientId !== clientId)
-    );
-  };
+  const removeDocument = (clientId: string) => {
+    delete documentValueRefs.current[clientId];
+    setDocuments((previous) =>
+      previous.filter((document) => document.clientId !== clientId)
+    );
+  };
 
   const handleCEP = async (
     event: ChangeEvent<HTMLInputElement>,
@@ -985,17 +1078,17 @@ export function PersonFormSheet({
           ? values.foundation_date.toISOString()
           : null,
         legal_nature: values.legal_nature?.trim() || null,
-        contacts: contacts
-          .filter(
-            (contact) =>
-              contact.value.trim().length > 0 && !!contact.contact_type_id
-          )
-          .map((contact) => ({
-            id: contact.id,
-            value: contact.value.trim(),
-            is_primary: contact.is_primary,
-            contact_type_id: contact.contact_type_id as number,
-          })),
+        contacts: contacts
+          .filter(
+            (contact) =>
+              contact.value.trim().length > 0 && !!contact.contact_type_id
+          )
+          .map((contact) => ({
+            id: contact.id,
+            value: contact.value.trim(),
+            is_primary: contact.is_primary,
+            contact_type_id: contact.contact_type_id as number,
+          })),
         addresses: addresses
           .filter(
             (address) =>
@@ -1015,18 +1108,64 @@ export function PersonFormSheet({
             is_primary: address.is_primary,
             address_type: address.address_type,
           })),
-        documents: documents
-          .filter(
-            (document) =>
-              document.value.trim().length > 0 && !!document.document_type_id
-          )
-          .map((document) => ({
-            id: document.id,
-            value: document.value.trim(),
-            document_type_id: document.document_type_id as number,
-          })),
+        documents: documents
+          .filter(
+            (document) =>
+              document.value.trim().length > 0 && !!document.document_type_id
+          )
+          .map((document) => ({
+            id: document.id,
+            value: document.value.trim(),
+            document_type_id: document.document_type_id as number,
+          })),
       };
 
+      const primaryEmail = payload.contacts.find((contact) =>
+        ['EMAIL'].includes(getContactTypeCode(contact.contact_type_id))
+      );
+      const primaryPhone = payload.contacts.find((contact) =>
+        ['PHONE', 'MOBILE', 'WHATSAPP'].includes(
+          getContactTypeCode(contact.contact_type_id)
+        )
+      );
+      const firstDocument = payload.documents[0];
+
+      if (primaryEmail || primaryPhone || firstDocument) {
+        const duplicateParams = new URLSearchParams();
+        if (person?.id) duplicateParams.set('person_id', String(person.id));
+        if (primaryEmail?.value)
+          duplicateParams.set('email', primaryEmail.value);
+        if (primaryPhone?.value)
+          duplicateParams.set('phone', primaryPhone.value);
+        if (firstDocument?.value && firstDocument?.document_type_id) {
+          duplicateParams.set('document_value', firstDocument.value);
+          duplicateParams.set(
+            'document_type_id',
+            String(firstDocument.document_type_id)
+          );
+        }
+
+        if (duplicateParams.size > 0) {
+          const duplicateResponse = await request<{
+            hasDuplicates: boolean;
+            matches: Array<{ id: number; name: string; reasons: string[] }>;
+          }>({
+            url: `/person/duplicates?${duplicateParams.toString()}`,
+            method: 'GET',
+          });
+
+          if (duplicateResponse.data.hasDuplicates) {
+            toast.warning(
+              t('duplicateWarning', {
+                names: duplicateResponse.data.matches
+                  .map((item) => item.name)
+                  .join(', '),
+              })
+            );
+          }
+        }
+      }
+
       if (person) {
         await request({
           url: `/person/${person.id}`,
@@ -1084,7 +1223,7 @@ export function PersonFormSheet({
 
   return (
     <Sheet open={open} onOpenChange={handleSheetOpenChange}>
-      <SheetContent className="flex h-full w-full flex-col overflow-hidden p-0 sm:max-w-xl">
+      <SheetContent className="flex h-full w-full max-w-full flex-col overflow-hidden p-0 lg:max-w-4xl xl:max-w-5xl">
         <SheetHeader className="shrink-0 border-b p-4">
           <div className="flex items-center gap-3">
             <div
@@ -1120,7 +1259,7 @@ export function PersonFormSheet({
           <form
             id="person-form"
             onSubmit={handleSubmit(handleFormSubmit)}
-            className="space-y-4 px-4"
+            className="space-y-4 px-4 [&_button[role='combobox']]:text-xs [&_button[role='combobox']_span]:truncate [&_input]:text-xs"
           >
             <div className="space-y-3">
               <h3 className="text-sm font-semibold tracking-wider text-muted-foreground uppercase">
@@ -1220,7 +1359,7 @@ export function PersonFormSheet({
                 className={cn(
                   'grid gap-3',
                   watchType === 'individual'
-                    ? 'grid-cols-1 sm:grid-cols-2 xl:grid-cols-[minmax(0,1fr)_minmax(0,0.85fr)_minmax(0,1.25fr)_minmax(0,1.25fr)]'
+                    ? 'grid-cols-1 sm:grid-cols-2 xl:grid-cols-4'
                     : 'grid-cols-1 sm:grid-cols-2'
                 )}
               >
@@ -1314,6 +1453,122 @@ export function PersonFormSheet({
                 ) : null}
               </div>
 
+              <div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-4">
+                <div className="space-y-1.5">
+                  <Label className="text-xs font-medium">{t('owner')}</Label>
+                  <Select
+                    value={
+                      watch('owner_user_id')
+                        ? String(watch('owner_user_id'))
+                        : 'none'
+                    }
+                    onValueChange={(value) =>
+                      setValue(
+                        'owner_user_id',
+                        value === 'none' ? null : Number(value)
+                      )
+                    }
+                  >
+                    <SelectTrigger className="h-9 w-full min-w-0">
+                      <SelectValue placeholder={t('unassigned')} />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="none">{t('unassigned')}</SelectItem>
+                      {ownerOptions.map((owner) => (
+                        <SelectItem key={owner.id} value={String(owner.id)}>
+                          {owner.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                <div className="space-y-1.5">
+                  <Label className="text-xs font-medium">{t('source')}</Label>
+                  <Select
+                    value={watch('source') || 'none'}
+                    onValueChange={(value) =>
+                      setValue(
+                        'source',
+                        value === 'none' ? null : (value as PersonSource)
+                      )
+                    }
+                  >
+                    <SelectTrigger className="h-9 w-full min-w-0">
+                      <SelectValue placeholder={t('source')} />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="none">{t('all')}</SelectItem>
+                      <SelectItem value="referral">
+                        {t('sourceReferral')}
+                      </SelectItem>
+                      <SelectItem value="website">
+                        {t('sourceWebsite')}
+                      </SelectItem>
+                      <SelectItem value="social">
+                        {t('sourceSocial')}
+                      </SelectItem>
+                      <SelectItem value="inbound">
+                        {t('sourceInbound')}
+                      </SelectItem>
+                      <SelectItem value="outbound">
+                        {t('sourceOutbound')}
+                      </SelectItem>
+                      <SelectItem value="other">{t('sourceOther')}</SelectItem>
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                <div className="space-y-1.5">
+                  <Label className="text-xs font-medium">
+                    {t('lifecycleStage')}
+                  </Label>
+                  <Select
+                    value={watch('lifecycle_stage') || 'new'}
+                    onValueChange={(value) =>
+                      setValue('lifecycle_stage', value as PersonLifecycleStage)
+                    }
+                  >
+                    <SelectTrigger className="h-9 w-full min-w-0">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="new">{t('lifecycleNew')}</SelectItem>
+                      <SelectItem value="contacted">
+                        {t('lifecycleContacted')}
+                      </SelectItem>
+                      <SelectItem value="qualified">
+                        {t('lifecycleQualified')}
+                      </SelectItem>
+                      <SelectItem value="proposal">
+                        {t('lifecycleProposal')}
+                      </SelectItem>
+                      <SelectItem value="negotiation">
+                        {t('lifecycleNegotiation')}
+                      </SelectItem>
+                      <SelectItem value="customer">
+                        {t('lifecycleCustomer')}
+                      </SelectItem>
+                      <SelectItem value="lost">{t('lifecycleLost')}</SelectItem>
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                <div className="space-y-1.5">
+                  <Label className="text-xs font-medium">
+                    {t('nextActionAt')}
+                  </Label>
+                  <Input
+                    type="datetime-local"
+                    value={watch('next_action_at') || ''}
+                    onChange={(event) =>
+                      setValue('next_action_at', event.target.value)
+                    }
+                    className="h-9"
+                  />
+                </div>
+              </div>
+
               {watchType === 'individual' ? (
                 <>
                   <div className="grid grid-cols-2 gap-3">
@@ -1412,44 +1667,44 @@ export function PersonFormSheet({
                     ) : null}
                   </div>
 
-                  <div className="flex items-center gap-1">
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addContact('email');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      {t('addEmail')}
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addContact('phone');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      {t('addPhone')}
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addContact('blank');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
+                  <div className="flex items-center gap-1">
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addContact('email');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      {t('addEmail')}
+                    </Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addContact('phone');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      {t('addPhone')}
+                    </Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addContact('blank');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
                       {t('addContact')}
                     </Button>
                     {contactsOpen ? (
@@ -1476,26 +1731,26 @@ export function PersonFormSheet({
                       )}
                     >
                       <div className="flex items-center gap-2">
-                        <Select
-                          value={
-                            contact.contact_type_id
-                              ? String(contact.contact_type_id)
-                              : undefined
-                          }
-                          onValueChange={(value) => {
-                            const nextTypeId = Number(value);
-                            updateContact(contact.clientId, {
-                              contact_type_id: nextTypeId,
-                              value: maskContactValueByType(
-                                contact.value || '',
-                                nextTypeId
-                              ),
-                            });
-                          }}
-                        >
-                          <SelectTrigger className="h-8 w-36 text-xs">
-                            <SelectValue placeholder={t('selectContactType')} />
-                          </SelectTrigger>
+                        <Select
+                          value={
+                            contact.contact_type_id
+                              ? String(contact.contact_type_id)
+                              : undefined
+                          }
+                          onValueChange={(value) => {
+                            const nextTypeId = Number(value);
+                            updateContact(contact.clientId, {
+                              contact_type_id: nextTypeId,
+                              value: maskContactValueByType(
+                                contact.value || '',
+                                nextTypeId
+                              ),
+                            });
+                          }}
+                        >
+                          <SelectTrigger className="h-8 w-36 text-xs">
+                            <SelectValue placeholder={t('selectContactType')} />
+                          </SelectTrigger>
                           <SelectContent>
                             {contactTypes.map((contactType) => (
                               <SelectItem
@@ -1508,75 +1763,76 @@ export function PersonFormSheet({
                           </SelectContent>
                         </Select>
 
-                        <Input
-                          ref={(element) => {
-                            contactValueRefs.current[contact.clientId] = element;
-                          }}
-                          placeholder={(() => {
-                            const contactTypeCode = getContactTypeCode(
-                              contact.contact_type_id
-                            );
-                            if (contactTypeCode === 'EMAIL') {
-                              return 'email@exemplo.com';
-                            }
-                            if (contactTypeCode.length === 0) {
-                              return t('contactValue');
-                            }
-                            return '(00) 00000-0000';
-                          })()}
-                          value={contact.value}
-                          onChange={(event) =>
-                            updateContact(contact.clientId, {
-                              value: maskContactValueByType(
-                                event.target.value,
-                                contact.contact_type_id
-                              ),
-                            })
-                          }
-                          className="h-8 flex-1 text-xs"
+                        <Input
+                          ref={(element) => {
+                            contactValueRefs.current[contact.clientId] =
+                              element;
+                          }}
+                          placeholder={(() => {
+                            const contactTypeCode = getContactTypeCode(
+                              contact.contact_type_id
+                            );
+                            if (contactTypeCode === 'EMAIL') {
+                              return 'email@exemplo.com';
+                            }
+                            if (contactTypeCode.length === 0) {
+                              return t('contactValue');
+                            }
+                            return '(00) 00000-0000';
+                          })()}
+                          value={contact.value}
+                          onChange={(event) =>
+                            updateContact(contact.clientId, {
+                              value: maskContactValueByType(
+                                event.target.value,
+                                contact.contact_type_id
+                              ),
+                            })
+                          }
+                          className="h-8 flex-1 text-xs"
                         />
 
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              className={cn(
-                                'h-8 w-8',
-                                contact.is_primary && 'text-amber-500'
-                              )}
-                              onClick={() =>
-                                setPrimaryContact(contact.clientId)
-                              }
-                              aria-label={t('main')}
-                            >
-                              <Star
-                                className={cn(
-                                  'h-4 w-4',
-                                  contact.is_primary && 'fill-current'
-                                )}
-                              />
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent>{t('main')}</TooltipContent>
-                        </Tooltip>
-
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              className="h-8 w-8 text-red-500 hover:text-red-600"
-                              onClick={() => removeContact(contact.clientId)}
-                              aria-label={t('remove')}
-                            >
-                              <Trash2 className="h-4 w-4" />
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent>{t('remove')}</TooltipContent>
-                        </Tooltip>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              className={cn(
+                                'h-8 w-8',
+                                contact.is_primary && 'text-amber-500'
+                              )}
+                              onClick={() =>
+                                setPrimaryContact(contact.clientId)
+                              }
+                              aria-label={t('main')}
+                            >
+                              <Star
+                                className={cn(
+                                  'h-4 w-4',
+                                  contact.is_primary && 'fill-current'
+                                )}
+                              />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>{t('main')}</TooltipContent>
+                        </Tooltip>
+
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-red-500 hover:text-red-600"
+                              onClick={() => removeContact(contact.clientId)}
+                              aria-label={t('remove')}
+                            >
+                              <Trash2 className="h-4 w-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>{t('remove')}</TooltipContent>
+                        </Tooltip>
                       </div>
                     </div>
                   ))
@@ -1677,57 +1933,58 @@ export function PersonFormSheet({
                           className="h-8 w-28 text-xs"
                         />
 
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              className={cn(
-                                'h-8 w-8',
-                                address.is_primary && 'text-amber-500'
-                              )}
-                              onClick={() =>
-                                setPrimaryAddress(address.clientId)
-                              }
-                              aria-label={t('main')}
-                            >
-                              <Star
-                                className={cn(
-                                  'h-4 w-4',
-                                  address.is_primary && 'fill-current'
-                                )}
-                              />
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent>{t('main')}</TooltipContent>
-                        </Tooltip>
-
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              className="h-8 w-8 text-red-500 hover:text-red-600"
-                              onClick={() => removeAddress(address.clientId)}
-                              aria-label={t('remove')}
-                            >
-                              <Trash2 className="h-4 w-4" />
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent>{t('remove')}</TooltipContent>
-                        </Tooltip>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              className={cn(
+                                'h-8 w-8',
+                                address.is_primary && 'text-amber-500'
+                              )}
+                              onClick={() =>
+                                setPrimaryAddress(address.clientId)
+                              }
+                              aria-label={t('main')}
+                            >
+                              <Star
+                                className={cn(
+                                  'h-4 w-4',
+                                  address.is_primary && 'fill-current'
+                                )}
+                              />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>{t('main')}</TooltipContent>
+                        </Tooltip>
+
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-red-500 hover:text-red-600"
+                              onClick={() => removeAddress(address.clientId)}
+                              aria-label={t('remove')}
+                            >
+                              <Trash2 className="h-4 w-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>{t('remove')}</TooltipContent>
+                        </Tooltip>
                       </div>
 
                       <div className="relative">
-                        <Input
-                          ref={(element) => {
-                            addressLine1Refs.current[address.clientId] = element;
-                          }}
-                          placeholder={t('addressPlaceholder')}
-                          value={address.line1}
-                          disabled={Boolean(loadingCEP[address.clientId])}
+                        <Input
+                          ref={(element) => {
+                            addressLine1Refs.current[address.clientId] =
+                              element;
+                          }}
+                          placeholder={t('addressPlaceholder')}
+                          value={address.line1}
+                          disabled={Boolean(loadingCEP[address.clientId])}
                           onChange={(event) =>
                             updateAddress(address.clientId, {
                               line1: event.target.value,
@@ -1807,8 +2064,8 @@ export function PersonFormSheet({
 
             <Collapsible open={documentsOpen} onOpenChange={setDocumentsOpen}>
               <CollapsibleTrigger asChild>
-                <div className="group flex cursor-pointer items-center justify-between">
-                  <div className="flex items-center gap-2">
+                <div className="group flex cursor-pointer flex-wrap items-center gap-2">
+                  <div className="flex min-w-0 items-center gap-2">
                     <FileText className="h-4 w-4 text-amber-500" />
                     <h3 className="text-sm font-semibold">
                       {t('tabDocuments')}
@@ -1823,59 +2080,61 @@ export function PersonFormSheet({
                     ) : null}
                   </div>
 
-                  <div className="flex items-center gap-1">
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addDocument('cpf');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      CPF
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addDocument('cnpj');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      CNPJ
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addDocument('rg');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      RG
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 px-2 text-xs"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        addDocument('blank');
-                      }}
-                    >
-                      <Plus className="mr-1 h-3.5 w-3.5" />
-                      {t('addDocument')}
-                    </Button>
+                  <div className="ml-auto flex max-w-full flex-wrap items-center justify-end gap-1 sm:flex-nowrap">
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 shrink-0 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addDocument('cpf');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      CPF
+                    </Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 shrink-0 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addDocument('cnpj');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      CNPJ
+                    </Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 shrink-0 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addDocument('rg');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      RG
+                    </Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-7 shrink-0 px-2 text-xs"
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        addDocument('blank');
+                      }}
+                    >
+                      <Plus className="mr-1 h-3.5 w-3.5" />
+                      <span className="max-w-20 truncate sm:max-w-none">
+                        {t('addDocument')}
+                      </span>
+                    </Button>
                     {documentsOpen ? (
                       <ChevronUp className="h-4 w-4" />
                     ) : (
@@ -1897,23 +2156,23 @@ export function PersonFormSheet({
                       className="rounded-lg border p-2"
                     >
                       <div className="flex items-center gap-2">
-                        <Select
-                          value={
-                            document.document_type_id
-                              ? String(document.document_type_id)
-                              : undefined
-                          }
-                          onValueChange={(value) => {
-                            const nextTypeId = Number(value);
-                            updateDocument(document.clientId, {
-                              document_type_id: nextTypeId,
-                              value: maskDocumentValueByType(
-                                document.value || '',
-                                nextTypeId
-                              ),
-                            });
-                          }}
-                        >
+                        <Select
+                          value={
+                            document.document_type_id
+                              ? String(document.document_type_id)
+                              : undefined
+                          }
+                          onValueChange={(value) => {
+                            const nextTypeId = Number(value);
+                            updateDocument(document.clientId, {
+                              document_type_id: nextTypeId,
+                              value: maskDocumentValueByType(
+                                document.value || '',
+                                nextTypeId
+                              ),
+                            });
+                          }}
+                        >
                           <SelectTrigger className="h-8 w-36 text-xs">
                             <SelectValue
                               placeholder={t('selectDocumentType')}
@@ -1931,38 +2190,39 @@ export function PersonFormSheet({
                           </SelectContent>
                         </Select>
 
-                        <Input
-                          ref={(element) => {
-                            documentValueRefs.current[document.clientId] = element;
-                          }}
-                          placeholder={t('documentValuePlaceholder')}
-                          value={document.value}
-                          onChange={(event) =>
-                            updateDocument(document.clientId, {
-                              value: maskDocumentValueByType(
-                                event.target.value,
-                                document.document_type_id
-                              ),
-                            })
-                          }
-                          className="h-8 flex-1 text-xs"
+                        <Input
+                          ref={(element) => {
+                            documentValueRefs.current[document.clientId] =
+                              element;
+                          }}
+                          placeholder={t('documentValuePlaceholder')}
+                          value={document.value}
+                          onChange={(event) =>
+                            updateDocument(document.clientId, {
+                              value: maskDocumentValueByType(
+                                event.target.value,
+                                document.document_type_id
+                              ),
+                            })
+                          }
+                          className="h-8 flex-1 text-xs"
                         />
 
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              className="h-8 w-8 text-red-500 hover:text-red-600"
-                              onClick={() => removeDocument(document.clientId)}
-                              aria-label={t('remove')}
-                            >
-                              <Trash2 className="h-4 w-4" />
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent>{t('remove')}</TooltipContent>
-                        </Tooltip>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-red-500 hover:text-red-600"
+                              onClick={() => removeDocument(document.clientId)}
+                              aria-label={t('remove')}
+                            >
+                              <Trash2 className="h-4 w-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>{t('remove')}</TooltipContent>
+                        </Tooltip>
                       </div>
                     </div>
                   ))
@@ -1973,23 +2233,43 @@ export function PersonFormSheet({
         </div>
 
         <div className="shrink-0 space-y-2 border-t p-4">
-          <Button
-            type="submit"
-            form="person-form"
-            className="w-full"
-            disabled={isSubmitting || isUploadingAvatar}
-          >
-            {isSubmitting ? (
-              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-            ) : (
-              <Save className="mr-2 h-4 w-4" />
-            )}
-            {isSubmitting
-              ? t('saving')
-              : isEditing
-                ? t('saveChanges')
-                : t('createPerson')}
-          </Button>
+          <div className="grid gap-2 sm:grid-cols-2">
+            {!isEditing ? (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => {
+                  const formElement = document.getElementById(
+                    'person-form'
+                  ) as HTMLFormElement | null;
+                  formElement?.requestSubmit();
+                }}
+                disabled={isSubmitting || isUploadingAvatar}
+              >
+                {t('saveAndNew')}
+              </Button>
+            ) : null}
+            <Button
+              type="submit"
+              form="person-form"
+              className="w-full"
+              disabled={isSubmitting || isUploadingAvatar}
+            >
+              {isSubmitting ? (
+                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              ) : (
+                <Save className="mr-2 h-4 w-4" />
+              )}
+              {isSubmitting
+                ? t('saving')
+                : isEditing
+                  ? t('saveChanges')
+                  : t('createPerson')}
+            </Button>
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {t('formShortcutsHint')}
+          </p>
         </div>
       </SheetContent>
     </Sheet>