@hed-hog/contact 0.0.347 → 0.0.350

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

@@ -103,6 +103,8 @@ import type {
 type AccountFormData = {
   name: string;
   trade_name: string | null;
+  foundation_date: string | null;
+  legal_nature: string | null;
   status: 'active' | 'inactive';
   industry: string | null;
   website: string | null;
@@ -145,6 +147,24 @@ function emptyToNull(value: string | null | undefined) {
   return normalized ? normalized : null;
 }
 
+function toDateInputValue(value: string | null | undefined) {
+  const normalized = String(value ?? '').trim();
+  if (!normalized) {
+    return null;
+  }
+
+  if (/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
+    return normalized;
+  }
+
+  const parsed = new Date(normalized);
+  if (Number.isNaN(parsed.getTime())) {
+    return null;
+  }
+
+  return parsed.toISOString().slice(0, 10);
+}
+
 function createClientId(prefix: string) {
   return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }
@@ -341,6 +361,8 @@ export function AccountFormSheet({
       z.object({
         name: z.string().trim().min(2, t('form.validation.nameMinLength')),
         trade_name: z.string().nullable(),
+        foundation_date: z.string().nullable(),
+        legal_nature: z.string().nullable(),
         status: z.enum(['active', 'inactive']),
         industry: z.string().nullable(),
         website: z.string().nullable(),
@@ -372,6 +394,8 @@ export function AccountFormSheet({
     defaultValues: {
       name: '',
       trade_name: null,
+      foundation_date: null,
+      legal_nature: null,
       status: 'active',
       industry: null,
       website: null,
@@ -422,7 +446,7 @@ export function AccountFormSheet({
   });
 
   const additionalDetailsDefaultOpen = Boolean(
-    account?.industry ||
+    account?.website ||
     account?.annual_revenue != null ||
     account?.employee_count != null
   );
@@ -530,6 +554,8 @@ export function AccountFormSheet({
       Boolean(
         (watchedFormValues?.name ?? '').trim() ||
         (watchedFormValues?.trade_name ?? '').trim() ||
+        (watchedFormValues?.legal_nature ?? '').trim() ||
+        (watchedFormValues?.foundation_date ?? '').trim() ||
         (watchedFormValues?.industry ?? '').trim() ||
         (watchedFormValues?.website ?? '').trim() ||
         watchedFormValues?.owner_user_id != null ||
@@ -560,6 +586,8 @@ export function AccountFormSheet({
       values: {
         name: watchedFormValues?.name ?? '',
         trade_name: watchedFormValues?.trade_name ?? null,
+        foundation_date: watchedFormValues?.foundation_date ?? null,
+        legal_nature: watchedFormValues?.legal_nature ?? null,
         status: watchedFormValues?.status ?? 'active',
         industry: watchedFormValues?.industry ?? null,
         website: watchedFormValues?.website ?? null,
@@ -895,6 +923,14 @@ export function AccountFormSheet({
       name: storedDraft?.payload.values?.name ?? account?.name ?? '',
       trade_name:
         storedDraft?.payload.values?.trade_name ?? account?.trade_name ?? null,
+      foundation_date:
+        storedDraft?.payload.values?.foundation_date ??
+        toDateInputValue(account?.foundation_date) ??
+        null,
+      legal_nature:
+        storedDraft?.payload.values?.legal_nature ??
+        account?.legal_nature ??
+        null,
       status:
         storedDraft?.payload.values?.status ?? account?.status ?? 'active',
       industry:
@@ -1258,6 +1294,8 @@ export function AccountFormSheet({
       {
         name: data.name.trim(),
         trade_name: emptyToNull(data.trade_name),
+        foundation_date: emptyToNull(data.foundation_date),
+        legal_nature: emptyToNull(data.legal_nature),
         status: data.status,
         industry: emptyToNull(data.industry),
         website: emptyToNull(data.website),
@@ -1356,7 +1394,7 @@ export function AccountFormSheet({
                       icon={<Building2 className="h-4 w-4" />}
                     />
 
-                    <div className="grid grid-cols-2 gap-3">
+                    <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
                       <FormField
                         control={form.control}
                         name="name"
@@ -1398,9 +1436,30 @@ export function AccountFormSheet({
                           </FormItem>
                         )}
                       />
+
+                      <FormField
+                        control={form.control}
+                        name="industry"
+                        render={({ field }) => (
+                          <FormItem className="space-y-1.5 md:col-span-2">
+                            <FormLabel>{t('form.industry')}</FormLabel>
+                            <FormControl>
+                              <Input
+                                placeholder={t('form.placeholders.industry')}
+                                value={field.value ?? ''}
+                                onChange={(event) =>
+                                  field.onChange(event.target.value || null)
+                                }
+                                disabled={isLoading}
+                              />
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
                     </div>
 
-                    <div className="flex items-start gap-3">
+                    <div className="flex flex-col items-start gap-3 sm:flex-row">
                       <Avatar className="h-16 w-16 rounded-md border">
                         <AvatarImage
                           src={avatarPreviewUrl || undefined}
@@ -1423,7 +1482,7 @@ export function AccountFormSheet({
                             void handleAvatarUpload(file);
                           }}
                         />
-                        <div className="flex flex-wrap gap-2">
+                        <div className="flex w-full flex-wrap gap-2">
                           <Button
                             type="button"
                             variant="outline"
@@ -1472,6 +1531,52 @@ export function AccountFormSheet({
                         ) : null}
                       </div>
                     </div>
+
+                    <div className="grid grid-cols-1 gap-3 lg:grid-cols-2">
+                      <FormField
+                        control={form.control}
+                        name="foundation_date"
+                        render={({ field }) => (
+                          <FormItem className="space-y-1.5">
+                            <FormLabel>{personT('foundationDate')}</FormLabel>
+                            <FormControl>
+                              <Input
+                                type="date"
+                                max={new Date().toISOString().slice(0, 10)}
+                                placeholder={personT('selectDate')}
+                                value={field.value ?? ''}
+                                onChange={(event) =>
+                                  field.onChange(event.target.value || null)
+                                }
+                                disabled={isLoading}
+                              />
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+
+                      <FormField
+                        control={form.control}
+                        name="legal_nature"
+                        render={({ field }) => (
+                          <FormItem className="space-y-1.5">
+                            <FormLabel>{personT('legalNature')}</FormLabel>
+                            <FormControl>
+                              <Input
+                                placeholder={personT('legalNaturePlaceholder')}
+                                value={field.value ?? ''}
+                                onChange={(event) =>
+                                  field.onChange(event.target.value || null)
+                                }
+                                disabled={isLoading}
+                              />
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+                    </div>
                   </section>
 
                   <section className="space-y-3">
@@ -1481,7 +1586,7 @@ export function AccountFormSheet({
                       icon={<Users className="h-4 w-4" />}
                     />
 
-                    <div className="grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-3">
+                    <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
                       <FormField
                         control={form.control}
                         name="status"
@@ -2207,29 +2312,6 @@ export function AccountFormSheet({
                             )}
                           />
 
-                          <FormField
-                            control={form.control}
-                            name="industry"
-                            render={({ field }) => (
-                              <FormItem className="space-y-1.5 md:col-span-2 xl:col-span-2">
-                                <FormLabel>{t('form.industry')}</FormLabel>
-                                <FormControl>
-                                  <Input
-                                    placeholder={t(
-                                      'form.placeholders.industry'
-                                    )}
-                                    value={field.value ?? ''}
-                                    onChange={(event) =>
-                                      field.onChange(event.target.value || null)
-                                    }
-                                    disabled={isLoading}
-                                  />
-                                </FormControl>
-                                <FormMessage />
-                              </FormItem>
-                            )}
-                          />
-
                           <FormField
                             control={form.control}
                             name="annual_revenue"

package/hedhog/frontend/app/accounts/_components/account-types.ts.ejs

@@ -66,6 +66,8 @@ export type Account = {
   id: number;
   name: string;
   trade_name?: string | null;
+  foundation_date?: string | null;
+  legal_nature?: string | null;
   status: 'active' | 'inactive';
   industry?: string | null;
   website?: string | null;
@@ -99,6 +101,8 @@ export type PaginatedResult<T> = {
 export type AccountFormValues = {
   name: string;
   trade_name?: string | null;
+  foundation_date?: string | null;
+  legal_nature?: string | null;
   status: 'active' | 'inactive';
   industry?: string | null;
   website?: string | null;

package/hedhog/frontend/app/accounts/page.tsx.ejs

@@ -466,6 +466,8 @@ export default function AccountsPage() {
           id: savedId,
           name: data.name,
           trade_name: data.trade_name ?? null,
+          foundation_date: data.foundation_date ?? null,
+          legal_nature: data.legal_nature ?? null,
           status: data.status,
           industry: data.industry ?? null,
           website: data.website ?? null,

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

@@ -710,6 +710,28 @@ export function PersonFormSheet({
   const t = useTranslations('contact.ContactPage');
   const { request, currentLocaleCode, getSettingValue, user } = useApp();
   const isEditing = Boolean(person);
+  const normalizedContactTypes = useMemo<ContactTypeOption[]>(
+    () =>
+      contactTypes
+        .map((contactType) => ({
+          ...contactType,
+          contact_type_id: contactType.contact_type_id ?? contactType.id,
+        }))
+        .filter((contactType) => Number.isFinite(contactType.contact_type_id)),
+    [contactTypes]
+  );
+  const normalizedDocumentTypes = useMemo<DocumentTypeOption[]>(
+    () =>
+      documentTypes
+        .map((documentType) => ({
+          ...documentType,
+          document_type_id: documentType.document_type_id ?? documentType.id,
+        }))
+        .filter((documentType) =>
+          Number.isFinite(documentType.document_type_id)
+        ),
+    [documentTypes]
+  );
   const canEditLinkedUser = useMemo(
     () =>
       (user?.role_user ?? []).some((roleUser) => {
@@ -1332,14 +1354,14 @@ export function PersonFormSheet({
 
   const getContactTypeCode = (contactTypeId?: number | null) =>
     String(
-      contactTypes.find(
+      normalizedContactTypes.find(
         (contactType) => contactType.contact_type_id === contactTypeId
       )?.code || ''
     ).toUpperCase();
 
   const getDocumentTypeCode = (documentTypeId?: number | null) =>
     String(
-      documentTypes.find(
+      normalizedDocumentTypes.find(
         (documentType) => documentType.document_type_id === documentTypeId
       )?.code || ''
     ).toUpperCase();
@@ -1382,7 +1404,7 @@ export function PersonFormSheet({
   const resolveContactTypeIdByCodes = (codes: string[]) => {
     const normalizedCodes = codes.map((code) => code.toUpperCase());
     return (
-      contactTypes.find((contactType) =>
+      normalizedContactTypes.find((contactType) =>
         normalizedCodes.includes(String(contactType.code || '').toUpperCase())
       )?.contact_type_id || null
     );
@@ -1391,7 +1413,7 @@ export function PersonFormSheet({
   const resolveDocumentTypeIdByCodes = (codes: string[]) => {
     const normalizedCodes = codes.map((code) => code.toUpperCase());
     return (
-      documentTypes.find((documentType) =>
+      normalizedDocumentTypes.find((documentType) =>
         normalizedCodes.includes(String(documentType.code || '').toUpperCase())
       )?.document_type_id || null
     );
@@ -1883,7 +1905,7 @@ export function PersonFormSheet({
     contact: payload.contacts.map((contact) => ({
       ...contact,
       contact_type:
-        contactTypes.find(
+        normalizedContactTypes.find(
           (item) => item.contact_type_id === contact.contact_type_id
         ) ?? undefined,
     })),
@@ -1891,7 +1913,7 @@ export function PersonFormSheet({
     document: payload.documents.map((document) => ({
       ...document,
       document_type:
-        documentTypes.find(
+        normalizedDocumentTypes.find(
           (item) => item.document_type_id === document.document_type_id
         ) ?? undefined,
     })),
@@ -2206,75 +2228,73 @@ export function PersonFormSheet({
                       </Select>
                     </div>
                   ) : null}
-                  <div className="flex items-center gap-3">
-                    <div className="space-y-1.5">
-                      <Label className="text-xs font-medium">
-                        {t('status')}
-                      </Label>
-                      <Select
-                        value={watch('status')}
-                        onValueChange={(value: 'active' | 'inactive') =>
-                          setValue('status', value)
-                        }
-                      >
-                        <SelectTrigger className="h-9 w-full min-w-0">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="active">{t('active')}</SelectItem>
-                          <SelectItem value="inactive">
-                            {t('inactive')}
-                          </SelectItem>
-                        </SelectContent>
-                      </Select>
-                    </div>
+                  <div className="space-y-1.5">
+                    <Label className="text-xs font-medium">
+                      {t('status')}
+                    </Label>
+                    <Select
+                      value={watch('status')}
+                      onValueChange={(value: 'active' | 'inactive') =>
+                        setValue('status', value)
+                      }
+                    >
+                      <SelectTrigger className="h-9 w-full min-w-0">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="active">{t('active')}</SelectItem>
+                        <SelectItem value="inactive">
+                          {t('inactive')}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </div>
 
-                    {watchType === 'individual' ? (
-                      <>
-                        <div className="space-y-1.5 mb-1.5">
-                          <Label className="text-xs font-medium">
-                            {t('birthDate')}
-                          </Label>
-                          <DatePickerWithYearMonth
-                            date={watch('birth_date') || undefined}
-                            onSelect={(date) =>
-                              setValue('birth_date', date || null)
-                            }
-                            maxDate={new Date()}
-                            placeholder={t('selectDate')}
-                            localeCode={currentLocaleCode}
-                          />
-                        </div>
+                  {watchType === 'individual' ? (
+                    <>
+                      <div className="space-y-1.5">
+                        <Label className="text-xs font-medium">
+                          {t('birthDate')}
+                        </Label>
+                        <DatePickerWithYearMonth
+                          date={watch('birth_date') || undefined}
+                          onSelect={(date) =>
+                            setValue('birth_date', date || null)
+                          }
+                          maxDate={new Date()}
+                          placeholder={t('selectDate')}
+                          localeCode={currentLocaleCode}
+                        />
+                      </div>
 
-                        <div className="space-y-1.5">
-                          <Label className="text-xs font-medium">
-                            {t('gender')}
-                          </Label>
-                          <Select
-                            value={watch('gender') || ''}
-                            onValueChange={(value: PersonGender) =>
-                              setValue('gender', value)
-                            }
-                          >
-                            <SelectTrigger className="h-9 w-full min-w-0">
-                              <SelectValue placeholder={t('selectGender')} />
-                            </SelectTrigger>
-                            <SelectContent>
-                              <SelectItem value="male">
-                                {t('genderMale')}
-                              </SelectItem>
-                              <SelectItem value="female">
-                                {t('genderFemale')}
-                              </SelectItem>
-                              <SelectItem value="other">
-                                {t('genderOther')}
-                              </SelectItem>
-                            </SelectContent>
-                          </Select>
-                        </div>
-                      </>
-                    ) : null}
-                  </div>
+                      <div className="space-y-1.5">
+                        <Label className="text-xs font-medium">
+                          {t('gender')}
+                        </Label>
+                        <Select
+                          value={watch('gender') || ''}
+                          onValueChange={(value: PersonGender) =>
+                            setValue('gender', value)
+                          }
+                        >
+                          <SelectTrigger className="h-9 w-full min-w-0">
+                            <SelectValue placeholder={t('selectGender')} />
+                          </SelectTrigger>
+                          <SelectContent>
+                            <SelectItem value="male">
+                              {t('genderMale')}
+                            </SelectItem>
+                            <SelectItem value="female">
+                              {t('genderFemale')}
+                            </SelectItem>
+                            <SelectItem value="other">
+                              {t('genderOther')}
+                            </SelectItem>
+                          </SelectContent>
+                        </Select>
+                      </div>
+                    </>
+                  ) : null}
                 </div>
 
                 <div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
@@ -2823,7 +2843,7 @@ export function PersonFormSheet({
                               />
                             </SelectTrigger>
                             <SelectContent>
-                              {contactTypes.map((contactType) => (
+                              {normalizedContactTypes.map((contactType) => (
                                 <SelectItem
                                   key={contactType.contact_type_id}
                                   value={String(contactType.contact_type_id)}
@@ -3253,7 +3273,7 @@ export function PersonFormSheet({
                               />
                             </SelectTrigger>
                             <SelectContent>
-                              {documentTypes.map((documentType) => (
+                              {normalizedDocumentTypes.map((documentType) => (
                                 <SelectItem
                                   key={documentType.document_type_id}
                                   value={String(documentType.document_type_id)}