@hed-hog/contact 0.0.312 → 0.0.314

package/hedhog/data/route.yaml

@@ -61,6 +61,14 @@
           slug: admin
       - where:
           slug: admin-contact
+- url: /person/linked-user-options
+  method: GET
+  relations:
+    role:
+      - where:
+          slug: admin
+      - where:
+          slug: admin-contact
 - url: /person/followups
   method: GET
   relations: *a3

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

@@ -18,6 +18,7 @@ import {
   CollapsibleContent,
   CollapsibleTrigger,
 } from '@/components/ui/collapsible';
+import { EntityPicker } from '@/components/ui/entity-picker';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import {
@@ -59,16 +60,20 @@ import {
   Calendar as CalendarIcon,
   ChevronDown,
   ChevronUp,
+  Eye,
+  EyeOff,
   FileText,
   Loader2,
   Mail,
   MapPin,
   Plus,
+  RefreshCw,
   Save,
   Star,
   Trash2,
   Upload,
   User,
+  UserRound,
 } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import {
@@ -176,6 +181,7 @@ type PersonSubmitPayload = {
   job_title: string | null;
   employer_company_id: number | null;
   owner_user_id: number | null;
+  user_id: number | null;
   source: PersonSource | null;
   lifecycle_stage: PersonLifecycleStage | null;
   next_action_at: string | null;
@@ -230,6 +236,8 @@ type PersonDraftPayload = {
   documents: EditablePersonDocument[];
   avatarId: number | null;
   avatarPreviewUrl: string;
+  linkedUserId: number | null;
+  linkedUserLabel: string;
 };
 
 const PERSON_FORM_DRAFT_STORAGE_KEY = 'contact-person-form-draft';
@@ -800,6 +808,18 @@ export function PersonFormSheet({
   const [contacts, setContacts] = useState<EditablePersonContact[]>([]);
   const [addresses, setAddresses] = useState<EditablePersonAddress[]>([]);
   const [documents, setDocuments] = useState<EditablePersonDocument[]>([]);
+  const [linkedUserId, setLinkedUserId] = useState<number | null>(null);
+  const [linkedUserLabel, setLinkedUserLabel] = useState<string>('');
+  const [userCreateShowPassword, setUserCreateShowPassword] = useState(false);
+  const [usersOpen, setUsersOpen] = useState(true);
+
+  const generatePassword = () => {
+    const chars =
+      'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*';
+    const array = new Uint8Array(16);
+    crypto.getRandomValues(array);
+    return Array.from(array, (byte) => chars[byte % chars.length]).join('');
+  };
   const [contactsOpen, setContactsOpen] = useState(true);
   const [addressesOpen, setAddressesOpen] = useState(true);
   const [documentsOpen, setDocumentsOpen] = useState(true);
@@ -862,11 +882,12 @@ export function PersonFormSheet({
         watchedFormValues.source ||
         (watchedFormValues.lifecycle_stage ?? 'new') !== 'new' ||
         avatarId != null ||
+        linkedUserId != null ||
         contacts.length > 0 ||
         addresses.length > 0 ||
         documents.length > 0
       ),
-    [watchedFormValues, avatarId, contacts, addresses, documents]
+    [watchedFormValues, avatarId, linkedUserId, contacts, addresses, documents]
   );
 
   const draftValue = useMemo<PersonDraftPayload>(
@@ -898,6 +919,8 @@ export function PersonFormSheet({
       documents,
       avatarId,
       avatarPreviewUrl,
+      linkedUserId,
+      linkedUserLabel,
     }),
     [
       watchedFormValues,
@@ -906,6 +929,8 @@ export function PersonFormSheet({
       documents,
       avatarId,
       avatarPreviewUrl,
+      linkedUserId,
+      linkedUserLabel,
       person?.id,
     ]
   );
@@ -1074,6 +1099,15 @@ export function PersonFormSheet({
     setContactsOpen(true);
     setAddressesOpen(true);
     setDocumentsOpen(true);
+    setUsersOpen(true);
+    setLinkedUserId(
+      restoredDraft?.linkedUserId ?? person?.person_user?.[0]?.user_id ?? null
+    );
+    setLinkedUserLabel(
+      restoredDraft?.linkedUserLabel ??
+        person?.person_user?.[0]?.user?.name ??
+        ''
+    );
     setLoadingCEP({});
     setDuplicateDialogOpen(false);
     setPendingDuplicateSubmission(null);
@@ -1638,6 +1672,7 @@ export function PersonFormSheet({
         ? (values.employer_company_id ?? null)
         : null,
     owner_user_id: values.owner_user_id ?? null,
+    user_id: linkedUserId,
     source: values.source || null,
     lifecycle_stage: values.lifecycle_stage || 'new',
     next_action_at: values.next_action_at
@@ -1847,6 +1882,7 @@ export function PersonFormSheet({
           (item) => item.document_type_id === document.document_type_id
         ) ?? undefined,
     })),
+    person_user: payload.user_id != null ? [{ user_id: payload.user_id }] : [],
   });
 
   const finalizeSuccess = async (personId: number, fallbackPerson?: Person) => {
@@ -2432,6 +2468,235 @@ export function PersonFormSheet({
 
               <Separator />
 
+              <Collapsible open={usersOpen} onOpenChange={setUsersOpen}>
+                <CollapsibleTrigger asChild>
+                  <div className="group flex cursor-pointer items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <UserRound className="h-4 w-4 text-violet-500" />
+                      <h3 className="text-sm font-semibold">
+                        {t('linkedUser')}
+                      </h3>
+                      {linkedUserId != null ? (
+                        <Badge
+                          variant="secondary"
+                          className="bg-violet-500/10 text-violet-600"
+                        >
+                          1
+                        </Badge>
+                      ) : null}
+                    </div>
+                    <div className="flex items-center gap-1">
+                      {usersOpen ? (
+                        <ChevronUp className="h-4 w-4" />
+                      ) : (
+                        <ChevronDown className="h-4 w-4" />
+                      )}
+                    </div>
+                  </div>
+                </CollapsibleTrigger>
+
+                <CollapsibleContent className="mt-2">
+                  <EntityPicker
+                    value={linkedUserId}
+                    onChange={(val, opt) => {
+                      setLinkedUserId(val as number | null);
+                      setLinkedUserLabel(
+                        opt
+                          ? ((opt as { name?: string; label?: string }).name ??
+                              (opt as { name?: string; label?: string })
+                                .label ??
+                              '')
+                          : ''
+                      );
+                    }}
+                    placeholder={t('selectLinkedUser')}
+                    entityLabel={t('user')}
+                    clearable
+                    valueType="number"
+                    initialSelectedLabel={linkedUserLabel}
+                    loadOptions={async ({ search }) => {
+                      const params = new URLSearchParams();
+                      if (search) params.set('search', search);
+                      const response = await request<
+                        Array<{ id: number; name: string; email?: string }>
+                      >({
+                        url: `/person/linked-user-options?${params.toString()}`,
+                        method: 'GET',
+                      });
+                      const items = Array.isArray(response.data)
+                        ? response.data
+                        : [];
+                      return { items, hasMore: false };
+                    }}
+                    getOptionValue={(opt) => (opt as { id: number }).id}
+                    getOptionLabel={(opt) =>
+                      (opt as { name: string; email?: string }).name
+                    }
+                    getOptionDescription={(opt) =>
+                      (opt as { email?: string }).email
+                    }
+                    showCreateButton
+                    createTitle={t('createUserTitle')}
+                    mapSearchToCreateValues={(search) => ({
+                      name: search,
+                      password: generatePassword(),
+                    })}
+                    createFields={[
+                      {
+                        name: 'name',
+                        label: t('userName'),
+                        placeholder: t('userNamePlaceholder'),
+                        required: true,
+                      },
+                      {
+                        name: 'email',
+                        label: t('userEmail'),
+                        placeholder: t('userEmailPlaceholder'),
+                        type: 'email',
+                        required: true,
+                      },
+                      {
+                        name: 'password',
+                        label: t('userPassword'),
+                        placeholder: t('userPasswordPlaceholder'),
+                        type: 'password',
+                        required: true,
+                      },
+                    ]}
+                    renderCreateContent={(ctx) => (
+                      <div className="mt-6 space-y-4">
+                        <div className="space-y-2">
+                          <Label>
+                            {t('userName')}{' '}
+                            <span className="text-destructive">*</span>
+                          </Label>
+                          <Input
+                            value={ctx.values.name ?? ''}
+                            onChange={(e) =>
+                              ctx.setValue('name', e.target.value)
+                            }
+                            placeholder={t('userNamePlaceholder')}
+                          />
+                        </div>
+                        <div className="space-y-2">
+                          <Label>
+                            {t('userEmail')}{' '}
+                            <span className="text-destructive">*</span>
+                          </Label>
+                          <Input
+                            type="email"
+                            value={ctx.values.email ?? ''}
+                            onChange={(e) =>
+                              ctx.setValue('email', e.target.value)
+                            }
+                            placeholder={t('userEmailPlaceholder')}
+                          />
+                        </div>
+                        <div className="space-y-2">
+                          <Label>
+                            {t('userPassword')}{' '}
+                            <span className="text-destructive">*</span>
+                          </Label>
+                          <div className="flex gap-2">
+                            <div className="relative flex-1">
+                              <Input
+                                type={
+                                  userCreateShowPassword ? 'text' : 'password'
+                                }
+                                value={ctx.values.password ?? ''}
+                                onChange={(e) =>
+                                  ctx.setValue('password', e.target.value)
+                                }
+                                placeholder={t('userPasswordPlaceholder')}
+                                className="pr-10"
+                              />
+                              <Button
+                                type="button"
+                                variant="ghost"
+                                size="icon"
+                                className="absolute right-0 top-0 h-full px-3 hover:bg-transparent"
+                                onClick={() =>
+                                  setUserCreateShowPassword((v) => !v)
+                                }
+                                tabIndex={-1}
+                              >
+                                {userCreateShowPassword ? (
+                                  <EyeOff className="h-4 w-4" />
+                                ) : (
+                                  <Eye className="h-4 w-4" />
+                                )}
+                              </Button>
+                            </div>
+                            <Button
+                              type="button"
+                              variant="outline"
+                              size="icon"
+                              className="h-10 w-10 shrink-0"
+                              title={t('generatePassword')}
+                              onClick={() =>
+                                ctx.setValue('password', generatePassword())
+                              }
+                            >
+                              <RefreshCw className="h-4 w-4" />
+                            </Button>
+                          </div>
+                        </div>
+                        <div className="flex justify-end gap-2">
+                          <Button
+                            type="button"
+                            variant="outline"
+                            onClick={ctx.closeCreate}
+                          >
+                            {t('cancel')}
+                          </Button>
+                          <Button
+                            type="button"
+                            disabled={
+                              ctx.isCreating ||
+                              !ctx.values.name?.trim() ||
+                              !ctx.values.email?.trim() ||
+                              !ctx.values.password?.trim()
+                            }
+                            onClick={() => void ctx.submitCreate()}
+                          >
+                            {ctx.isCreating ? (
+                              <Loader2 className="h-4 w-4 animate-spin" />
+                            ) : null}
+                            {t('save')}
+                          </Button>
+                        </div>
+                      </div>
+                    )}
+                    searchPlaceholder={t('searchUserPlaceholder')}
+                    emptyStateDescription={t('noUsersFound')}
+                    createActionLabel={t('createUser')}
+                    onCreate={async (values) => {
+                      const v = values as Record<string, string>;
+                      const response = await request<{
+                        user: { id: number; name: string };
+                      }>({
+                        url: '/user',
+                        method: 'POST',
+                        data: {
+                          name: v.name,
+                          email: v.email,
+                          password: v.password,
+                        },
+                      });
+                      const user = response.data?.user;
+                      if (!user?.id) return null;
+                      return {
+                        id: user.id,
+                        name: user.name,
+                        email: v.email,
+                      };
+                    }}
+                  />
+                </CollapsibleContent>
+              </Collapsible>
+
+              <Separator />
+
               <Collapsible open={contactsOpen} onOpenChange={setContactsOpen}>
                 <CollapsibleTrigger asChild>
                   <div className="group flex cursor-pointer items-center justify-between">

package/hedhog/frontend/app/person/_components/person-types.ts.ejs

@@ -91,6 +91,7 @@ export type PersonInteractionType =
 export type UserOption = {
   id: number;
   name: string;
+  email?: string;
   photo_id?: number | null;
 };
 
@@ -140,6 +141,10 @@ export type Person = {
   contact?: PersonContact[];
   address?: PersonAddress[];
   document?: PersonDocument[];
+  person_user?: Array<{
+    user_id: number;
+    user?: { id: number; name: string; email?: string };
+  }>;
 };
 
 export type PersonInteraction = {

package/hedhog/frontend/messages/en.json

@@ -47,6 +47,20 @@
     "nameRequired": "Name must be at least 2 characters",
     "tabGeneral": "General",
     "tabContacts": "Contacts",
+    "linkedUser": "Linked User",
+    "selectLinkedUser": "Select a user",
+    "user": "User",
+    "createUserTitle": "Create User",
+    "createUser": "Create User",
+    "userName": "Name",
+    "userNamePlaceholder": "Full name",
+    "userEmail": "Email",
+    "userEmailPlaceholder": "email@example.com",
+    "userPassword": "Password",
+    "userPasswordPlaceholder": "Strong password",
+    "generatePassword": "Generate password",
+    "searchUserPlaceholder": "Search user...",
+    "noUsersFound": "No users found",
     "tabAddresses": "Addresses",
     "tabDocuments": "Documents",
     "contactType": "Contact Type",

package/hedhog/frontend/messages/pt.json

@@ -46,6 +46,20 @@
     "nameRequired": "O nome deve ter pelo menos 2 caracteres",
     "tabGeneral": "Geral",
     "tabContacts": "Contatos",
+    "linkedUser": "Usuário Vinculado",
+    "selectLinkedUser": "Selecionar um usuário",
+    "user": "Usuário",
+    "createUserTitle": "Criar Usuário",
+    "createUser": "Criar Usuário",
+    "userName": "Nome",
+    "userNamePlaceholder": "Nome completo",
+    "userEmail": "Email",
+    "userEmailPlaceholder": "email@exemplo.com",
+    "userPassword": "Senha",
+    "userPasswordPlaceholder": "Senha forte",
+    "generatePassword": "Gerar senha",
+    "searchUserPlaceholder": "Buscar usuário...",
+    "noUsersFound": "Nenhum usuário encontrado",
     "tabAddresses": "Endereços",
     "tabDocuments": "Documentos",
     "contactType": "Tipo de Contato",

package/hedhog/table/person_user.yaml

@@ -0,0 +1,18 @@
+columns:
+  - type: pk
+  - name: person_id
+    type: fk
+    references:
+      table: person
+      column: id
+      onDelete: CASCADE
+      onUpdate: CASCADE
+  - name: user_id
+    type: fk
+    references:
+      table: user
+      column: id
+      onDelete: CASCADE
+      onUpdate: CASCADE
+  - type: created_at
+  - type: updated_at

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/contact",
-  "version": "0.0.312",
+  "version": "0.0.314",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -9,13 +9,13 @@
     "@nestjs/core": "^11",
     "@nestjs/jwt": "^11",
     "@nestjs/mapped-types": "*",
+    "@hed-hog/core": "0.0.314",
+    "@hed-hog/address": "0.0.314",
     "@hed-hog/api-mail": "0.0.9",
     "@hed-hog/api": "0.0.6",
-    "@hed-hog/core": "0.0.312",
-    "@hed-hog/api-locale": "0.0.14",
-    "@hed-hog/api-pagination": "0.0.7",
     "@hed-hog/api-prisma": "0.0.6",
-    "@hed-hog/address": "0.0.312"
+    "@hed-hog/api-locale": "0.0.14",
+    "@hed-hog/api-pagination": "0.0.7"
   },
   "exports": {
     ".": {

package/src/person/dto/create.dto.ts

@@ -1,12 +1,12 @@
 import { getLocaleText } from '@hed-hog/api-locale';
 import {
-  IsArray,
-  IsDateString,
-  IsEnum,
-  IsInt,
-  IsOptional,
-  IsNumber,
-  IsString,
+    IsArray,
+    IsDateString,
+    IsEnum,
+    IsInt,
+    IsNumber,
+    IsOptional,
+    IsString,
 } from 'class-validator';
 
 export enum PersonType {
@@ -94,6 +94,10 @@ export class CreateDTO {
   @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
   owner_user_id?: number | null;
 
+  @IsOptional()
+  @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
+  user_id?: number | null;
+
   @IsOptional()
   @IsEnum(PersonSource, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
   source?: PersonSource | null;

package/src/person/dto/update.dto.ts

@@ -1,18 +1,18 @@
-import { AddressTypeEnum } from '../../address-type.enum';
-import { PersonGender, PersonLifecycleStage, PersonSource } from './create.dto';
 import { getLocaleText } from '@hed-hog/api-locale';
 import { Type } from 'class-transformer';
 import {
-  IsArray,
-  IsBoolean,
-  IsDateString,
-  IsEnum,
-  IsInt,
-  IsNumber,
-  IsOptional,
-  IsString,
-  ValidateNested,
+    IsArray,
+    IsBoolean,
+    IsDateString,
+    IsEnum,
+    IsInt,
+    IsNumber,
+    IsOptional,
+    IsString,
+    ValidateNested,
 } from 'class-validator';
+import { AddressTypeEnum } from '../../address-type.enum';
+import { PersonGender, PersonLifecycleStage, PersonSource } from './create.dto';
 
 export class UpdateAllContactDTO {
   @IsOptional()
@@ -126,6 +126,10 @@ export class UpdateAllPersonDTO {
   @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
   owner_user_id?: number | null;
 
+  @IsOptional()
+  @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
+  user_id?: number | null;
+
   @IsOptional()
   @IsEnum(PersonSource, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
   source?: PersonSource | null;

package/src/person/person.controller.ts

@@ -2,28 +2,28 @@ import { DeleteDTO, Public, Role, User } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
 import { Pagination } from '@hed-hog/api-pagination';
 import {
-  BadRequestException,
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Inject,
-  Param,
-  ParseIntPipe,
-  Patch,
-  Post,
-  Query,
-  Res,
-  UploadedFile,
-  UseInterceptors,
-  forwardRef
+    BadRequestException,
+    Body,
+    Controller,
+    Delete,
+    Get,
+    Inject,
+    Param,
+    ParseIntPipe,
+    Patch,
+    Post,
+    Query,
+    Res,
+    UploadedFile,
+    UseInterceptors,
+    forwardRef
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Response } from 'express';
 import {
-  AccountListQueryDTO,
-  CreateAccountDTO,
-  UpdateAccountDTO,
+    AccountListQueryDTO,
+    CreateAccountDTO,
+    UpdateAccountDTO,
 } from './dto/account.dto';
 import { ActivityListQueryDTO } from './dto/activity.dto';
 import { CreateFollowupDTO } from './dto/create-followup.dto';
@@ -32,8 +32,8 @@ import { CreateDTO } from './dto/create.dto';
 import { DashboardQueryDTO } from './dto/dashboard-query.dto';
 import { CheckPersonDuplicatesQueryDTO } from './dto/duplicates-query.dto';
 import {
-  FollowupListQueryDTO,
-  FollowupStatsQueryDTO,
+    FollowupListQueryDTO,
+    FollowupStatsQueryDTO,
 } from './dto/followup-query.dto';
 import { MergePersonDTO } from './dto/merge.dto';
 import { ReportsQueryDTO } from './dto/reports-query.dto';
@@ -89,8 +89,13 @@ export class PersonController {
   }
 
   @Get('owner-options')
-  async getOwnerOptions(@User() user) {
-    return this.personService.getOwnerOptions(Number(user?.id || 0));
+  async getOwnerOptions(@User() user, @Query('search') search?: string) {
+    return this.personService.getOwnerOptions(Number(user?.id || 0), search);
+  }
+
+  @Get('linked-user-options')
+  async getLinkedUserOptions(@Query('search') search?: string) {
+    return this.personService.getLinkedUserOptions(search);
   }
 
   @Get('duplicates')