@open-mercato/core 0.5.1-develop.2917.31ee9898e3 → 0.5.1-develop.2935.357c9db339

package/src/modules/customers/commands/personCompanyLinks.ts

@@ -535,14 +535,15 @@ const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInpu
     const profile = await requirePersonProfile(em, person)
     const linkWasPrimary = link.isPrimary
 
+    const existingLinks = await loadPersonCompanyLinks(em, person)
+    const remainingLinks = existingLinks.filter((entry) => entry.id !== link.id)
+
     await withAtomicFlush(em, [
       () => {
         link.isPrimary = false
         link.deletedAt = new Date()
       },
       async () => {
-        const existingLinks = await loadPersonCompanyLinks(em, person)
-        const remainingLinks = existingLinks.filter((entry) => entry.id !== link.id)
         if (linkWasPrimary) {
           await promoteFallbackPrimaryLink(em, person, profile, remainingLinks, companyId)
         } else if (profile.company && typeof profile.company !== 'string' && profile.company.id === companyId) {

package/src/modules/customers/components/detail/CompanyCard.tsx

@@ -10,6 +10,7 @@ import {
   ExternalLink,
   FileText,
   Hash,
+  Link2Off,
   MapPin,
   TrendingUp,
   Zap,
@@ -17,6 +18,7 @@ import {
   Users,
 } from 'lucide-react'
 import { Badge } from '@open-mercato/ui/primitives/badge'
+import { StatusBadge } from '@open-mercato/ui/primitives/status-badge'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
@@ -67,6 +69,9 @@ type CompanyCardProps = {
   temperatureMap?: CustomerDictionaryMap | undefined
   renewalQuarterMap?: CustomerDictionaryMap | undefined
   roleMap?: CustomerDictionaryMap | undefined
+  onUnlink?: () => void | Promise<void>
+  unlinkLabel?: string
+  unlinkDisabled?: boolean
 }
 
 function copyToClipboard(text: string, t: ReturnType<typeof useT>) {
@@ -208,8 +213,12 @@ export function CompanyCard({
   temperatureMap,
   renewalQuarterMap,
   roleMap,
+  onUnlink,
+  unlinkLabel,
+  unlinkDisabled,
 }: CompanyCardProps) {
   const t = useT()
+  const resolvedUnlinkLabel = unlinkLabel ?? t('customers.people.detail.companies.unlinkAction', 'Unlink')
 
   const hasBillingSection =
     data.profile?.legalName ||
@@ -236,9 +245,12 @@ export function CompanyCard({
             <div className="flex flex-wrap items-center gap-2">
               <span className="break-words text-base font-bold">{data.displayName}</span>
               {data.isPrimary && (
-                <Badge variant="default" className="rounded-sm px-1.5 py-0 text-overline font-bold uppercase tracking-wider">
-                  PRIMARY
-                </Badge>
+                <StatusBadge
+                  variant="info"
+                  className="rounded-sm px-1.5 py-0 text-overline font-bold uppercase tracking-wider"
+                >
+                  {t('customers.people.detail.companies.primaryBadge', 'Primary')}
+                </StatusBadge>
               )}
             </div>
             {data.subtitle && (
@@ -246,7 +258,19 @@ export function CompanyCard({
             )}
           </div>
         </div>
-        <div className="self-start sm:self-auto">
+        <div className="flex items-center gap-1 self-start sm:self-auto">
+          {onUnlink ? (
+            <IconButton
+              variant="ghost"
+              size="sm"
+              type="button"
+              aria-label={resolvedUnlinkLabel}
+              disabled={unlinkDisabled}
+              onClick={() => { void onUnlink() }}
+            >
+              <Link2Off className="size-4" />
+            </IconButton>
+          ) : null}
           <Link href={`/backend/customers/companies-v2/${data.companyId}`}>
             <IconButton variant="ghost" size="sm" type="button">
               <ExternalLink className="size-4" />

package/src/modules/customers/components/detail/CompanyDetailTabs.tsx

@@ -11,7 +11,9 @@ import {
   Clock,
   History,
   Paperclip,
+  Plus,
 } from 'lucide-react'
+import type { SectionAction } from '@open-mercato/ui/backend/detail'
 
 export type CompanyTabId =
   | 'people'
@@ -36,6 +38,7 @@ type CompanyDetailTabsProps = {
   dealsCount?: number
   activitiesCount?: number
   filesCount?: number
+  sectionAction?: SectionAction | null
   children: React.ReactNode
 }
 
@@ -80,6 +83,7 @@ export function CompanyDetailTabs({
   dealsCount = 0,
   activitiesCount = 0,
   filesCount = 0,
+  sectionAction = null,
   children,
 }: CompanyDetailTabsProps) {
   const t = useT()
@@ -134,8 +138,8 @@ export function CompanyDetailTabs({
   return (
     <div>
       {/* Tab navigation */}
-      <div className="border-b" role="tablist" aria-label={t('customers.companies.detail.tabs.label', 'Company detail sections')}>
-        <nav className="-mb-px flex gap-1 overflow-x-auto px-1">
+      <div className="flex items-end justify-between gap-2 border-b" role="tablist" aria-label={t('customers.companies.detail.tabs.label', 'Company detail sections')}>
+        <nav className="-mb-px flex flex-1 gap-1 overflow-x-auto px-1">
           {allTabs.map((tab) => {
             const isActive = activeTab === tab.id
             return (
@@ -161,6 +165,18 @@ export function CompanyDetailTabs({
             )
           })}
         </nav>
+        {sectionAction ? (
+          <Button
+            type="button"
+            size="sm"
+            onClick={sectionAction.onClick}
+            disabled={sectionAction.disabled}
+            className="mb-1.5 mr-1 shrink-0"
+          >
+            <Plus className="mr-1.5 h-4 w-4" />
+            {sectionAction.label}
+          </Button>
+        ) : null}
       </div>
 
       {/* Tab content */}

package/src/modules/customers/components/detail/CompanyPeopleSection.tsx

@@ -13,6 +13,7 @@ import {
 } from '@open-mercato/shared/lib/browser/safeLocalStorage'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
+import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
 import type { SectionAction, TabEmptyStateConfig, Translator } from './types'
 import { CreatePersonDialog } from './CreatePersonDialog'
 import { PersonCard } from './PersonCard'
@@ -319,6 +320,13 @@ export function CompanyPeopleSection({
     void loadVisiblePeople()
   }, [loadVisiblePeople])
 
+  useAppEvent('customers.person_company_link.deleted', (event) => {
+    const payload = event.payload as { companyEntityId?: string | null } | null | undefined
+    if (payload && payload.companyEntityId === companyId) {
+      void loadVisiblePeople()
+    }
+  }, [companyId, loadVisiblePeople])
+
   React.useEffect(() => {
     setListPage(1)
   }, [searchQuery, sortMode])
@@ -520,9 +528,6 @@ export function CompanyPeopleSection({
             companyId,
           },
         )
-        applyPeopleChange((current) => current.filter((entry) => entry.id !== personId))
-        setVisiblePeople((current) => current.filter((entry) => entry.id !== personId))
-        setListTotalCount((current) => Math.max(0, current - 1))
         await loadVisiblePeople()
         flash(
           translate(
@@ -546,7 +551,6 @@ export function CompanyPeopleSection({
       }
     },
     [
-      applyPeopleChange,
       companyId,
       loadVisiblePeople,
       onLoadingChange,

package/src/modules/customers/components/detail/PersonCompaniesSection.tsx

@@ -7,6 +7,8 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
+import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
 import { CompanyCard, type EnrichedCompanyData } from './CompanyCard'
 import { useCustomerDictionary } from './hooks/useCustomerDictionary'
 import { LinkEntityDialog, type LinkEntityOption } from '../linking/LinkEntityDialog'
@@ -88,8 +90,10 @@ export function PersonCompaniesSection({
   runGuardedMutation,
 }: PersonCompaniesSectionProps) {
   const t = useT()
+  const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [items, setItems] = React.useState<EnrichedCompanyData[]>([])
   const [loading, setLoading] = React.useState(true)
+  const [unlinkingId, setUnlinkingId] = React.useState<string | null>(null)
   const [search, setSearch] = React.useState('')
   const [sort, setSort] = React.useState<'name-asc' | 'name-desc' | 'recent'>('name-asc')
   const [page, setPage] = React.useState(1)
@@ -309,6 +313,64 @@ export function PersonCompaniesSection({
     [linkedCompanies, linkedPrimaryId, loadData, onChanged, personId, runWriteMutation, t],
   )
 
+  const handleUnlink = React.useCallback(
+    async (companyId: string, displayName: string) => {
+      if (!companyId || unlinkingId) return
+      const confirmed = await confirm({
+        title: t('customers.people.detail.companies.unlinkConfirmTitle', 'Unlink company'),
+        description: t(
+          'customers.people.detail.companies.unlinkConfirm',
+          'Unlink {{company}} from {{person}}?',
+          { company: displayName, person: _personName },
+        ),
+        confirmText: t('customers.people.detail.companies.unlinkAction', 'Unlink'),
+        cancelText: t('customers.linking.actions.cancel', 'Cancel'),
+      })
+      if (!confirmed) return
+      setUnlinkingId(companyId)
+      try {
+        await runWriteMutation(
+          () =>
+            apiCallOrThrow(
+              `/api/customers/people/${encodeURIComponent(personId)}/companies/${encodeURIComponent(companyId)}`,
+              { method: 'DELETE' },
+              {
+                errorMessage: t(
+                  'customers.people.detail.companies.unlinkError',
+                  'Failed to unlink company.',
+                ),
+              },
+            ),
+          { companyId, personId, operation: 'unlinkPersonCompanyLink' },
+        )
+        await loadData({ showLoading: false })
+        await onChanged?.()
+        flash(
+          t('customers.people.detail.companies.unlinkSuccess', 'Company unlinked.'),
+          'success',
+        )
+      } catch (error) {
+        const message = error instanceof Error
+          ? error.message
+          : t(
+              'customers.people.detail.companies.unlinkError',
+              'Failed to unlink company.',
+            )
+        flash(message, 'error')
+      } finally {
+        setUnlinkingId(null)
+      }
+    },
+    [_personName, confirm, loadData, onChanged, personId, runWriteMutation, t, unlinkingId],
+  )
+
+  useAppEvent('customers.person_company_link.deleted', (event) => {
+    const payload = event.payload as { personEntityId?: string | null } | null | undefined
+    if (payload && payload.personEntityId === personId) {
+      void loadData({ showLoading: false })
+    }
+  }, [personId, loadData])
+
   return (
     <>
       <div className="space-y-4">
@@ -399,6 +461,9 @@ export function PersonCompaniesSection({
                   temperatureMap={temperatureDict?.map}
                   renewalQuarterMap={renewalQuarterDict?.map}
                   roleMap={roleDict?.map}
+                  onUnlink={() => handleUnlink(item.companyId, item.displayName)}
+                  unlinkLabel={t('customers.people.detail.companies.unlinkAction', 'Unlink')}
+                  unlinkDisabled={unlinkingId === item.companyId}
                 />
               ))}
             </div>
@@ -417,6 +482,7 @@ export function PersonCompaniesSection({
         onConfirm={handleLinkConfirm}
         runGuardedMutation={runWriteMutation}
       />
+      {ConfirmDialogElement}
     </>
   )
 }

package/src/modules/customers/components/detail/PersonDetailTabs.tsx

@@ -11,7 +11,9 @@ import {
   Check,
   History,
   Paperclip,
+  Plus,
 } from 'lucide-react'
+import type { SectionAction } from '@open-mercato/ui/backend/detail'
 
 export type PersonTabId =
   | 'activities'
@@ -38,6 +40,7 @@ type PersonDetailTabsProps = {
   companiesCount?: number
   tasksCount?: number
   filesCount?: number
+  sectionAction?: SectionAction | null
   children: React.ReactNode
 }
 
@@ -74,6 +77,7 @@ export function PersonDetailTabs({
   companiesCount = 0,
   tasksCount = 0,
   filesCount = 0,
+  sectionAction = null,
   children,
 }: PersonDetailTabsProps) {
   const t = useT()
@@ -134,8 +138,8 @@ export function PersonDetailTabs({
   return (
     <div>
       {/* Tab navigation — full width above both zones */}
-      <div className="border-b" role="tablist" aria-label={t('customers.people.detail.tabs.label', 'Person detail sections')}>
-        <nav className="-mb-px flex gap-1 overflow-x-auto px-1">
+      <div className="flex items-end justify-between gap-2 border-b" role="tablist" aria-label={t('customers.people.detail.tabs.label', 'Person detail sections')}>
+        <nav className="-mb-px flex flex-1 gap-1 overflow-x-auto px-1">
           {allTabs.map((tab) => {
             const isActive = activeTab === tab.id
             return (
@@ -161,6 +165,18 @@ export function PersonDetailTabs({
             )
           })}
         </nav>
+        {sectionAction ? (
+          <Button
+            type="button"
+            size="sm"
+            onClick={sectionAction.onClick}
+            disabled={sectionAction.disabled}
+            className="mb-1.5 mr-1 shrink-0"
+          >
+            <Plus className="mr-1.5 h-4 w-4" />
+            {sectionAction.label}
+          </Button>
+        ) : null}
       </div>
 
       {/* Two-column content below tabs */}

package/src/modules/customers/components/detail/TasksSection.tsx

@@ -431,14 +431,7 @@ export function TasksSection({
         ) : null}
 
         {!isInitialLoading && !hasTasks ? (
-          <TabEmptyState
-            title={emptyState.title}
-            action={{
-              label: emptyState.actionLabel,
-              onClick: openCreateDialog,
-              disabled: isMutating || !entityId,
-            }}
-          />
+          <TabEmptyState title={emptyState.title} />
         ) : null}
 
         {!isInitialLoading && hasTasks ? (

package/src/modules/customers/components/formConfig.tsx

@@ -7,6 +7,7 @@ import { Check, Pencil, Plus, Settings } from 'lucide-react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { deriveDisplayName, isDerivedDisplayName } from '../lib/displayName'
 import {
   Dialog,
   DialogContent,
@@ -703,16 +704,18 @@ export const createDisplayNameSection = (t: Translator) =>
   function DisplayNameSection({ values, setValue, errors }: CrudFormGroupComponentProps) {
     const [editing, setEditing] = React.useState(false)
     const [manualOverride, setManualOverride] = React.useState(() => {
-      const current = typeof values.displayName === 'string' ? values.displayName.trim() : ''
-      return current.length > 0
+      const current = typeof values.displayName === 'string' ? values.displayName : ''
+      const firstInit = typeof values.firstName === 'string' ? values.firstName : ''
+      const lastInit = typeof values.lastName === 'string' ? values.lastName : ''
+      // Sticky-manual: treat as user-customized only when the persisted display name
+      // doesn't match the first+last derivation (matches the server-side rule in
+      // updatePersonCommand). Empty values are considered derived.
+      return !isDerivedDisplayName(current, firstInit, lastInit)
     })
 
     const first = typeof values.firstName === 'string' ? values.firstName.trim() : ''
     const last = typeof values.lastName === 'string' ? values.lastName.trim() : ''
-    const derived = React.useMemo(() => {
-      const parts = [first, last].filter((part) => !!part)
-      return parts.join(' ').trim()
-    }, [first, last])
+    const derived = React.useMemo(() => deriveDisplayName(first, last), [first, last])
 
     React.useEffect(() => {
       if (!manualOverride) {
@@ -1684,40 +1687,56 @@ export const createPersonEditGroups = (t: Translator): CrudFormGroup[] => [
  * Groups for the Person v2 "Dane osobowe" Figma layout (SPEC-048 mockup).
  * All groups in column 1 (Zone 1). Notes handled separately in Zone 2 tabs.
  */
-export const createPersonPersonalDataGroups = (t: Translator): CrudFormGroup[] => [
-  {
-    id: 'personalData',
-    title: t('customers.people.form.groups.personalData', 'Personal data'),
-    column: 1,
-    fields: ['firstName', 'lastName', 'jobTitle', 'primaryEmail', 'primaryPhone'],
-  },
-  {
-    id: 'companyRole',
-    title: t('customers.people.form.groups.companyRole', 'Company & role'),
-    column: 1,
-    fields: ['companyEntityId', 'status', 'lifecycleStage', 'source'],
-  },
-  {
-    id: 'customFields',
-    title: t('customers.people.form.groups.customAttributes', 'Custom attributes'),
-    column: 1,
-    kind: 'customFields',
-  },
-  {
-    id: 'roles',
-    title: t('customers.people.form.groups.roles', 'My roles'),
-    column: 1,
-    component: ({ values }: CrudFormGroupComponentProps) => (
-      values.id ? (
-        <RolesSection
-          entityType="person"
-          entityId={values.id as string}
-          entityName={typeof values.displayName === 'string' ? values.displayName : null}
-        />
-      ) : null
-    ),
-  },
-]
+export const createPersonPersonalDataGroups = (
+  t: Translator,
+  options?: { entityName?: string | null },
+): CrudFormGroup[] => {
+  const entityName = options?.entityName?.trim() || null
+  const rolesTitle = entityName
+    ? t('customers.roles.groupTitle.person', 'My roles with {{name}}', { name: entityName })
+    : t('customers.people.form.groups.roles', 'My roles')
+  return [
+    {
+      id: 'personalDataDisplay',
+      title: t('customers.people.form.groups.displayName', 'Display name'),
+      column: 1,
+      bare: true,
+      component: createDisplayNameSection(t),
+    },
+    {
+      id: 'personalData',
+      title: t('customers.people.form.groups.personalData', 'Personal data'),
+      column: 1,
+      fields: ['firstName', 'lastName', 'jobTitle', 'primaryEmail', 'primaryPhone'],
+    },
+    {
+      id: 'companyRole',
+      title: t('customers.people.form.groups.companyRole', 'Company & role'),
+      column: 1,
+      fields: ['companyEntityId', 'status', 'lifecycleStage', 'source'],
+    },
+    {
+      id: 'customFields',
+      title: t('customers.people.form.groups.customAttributes', 'Custom attributes'),
+      column: 1,
+      kind: 'customFields',
+    },
+    {
+      id: 'roles',
+      title: rolesTitle,
+      column: 1,
+      component: ({ values }: CrudFormGroupComponentProps) => (
+        values.id ? (
+          <RolesSection
+            entityType="person"
+            entityId={values.id as string}
+            entityName={typeof values.displayName === 'string' ? values.displayName : null}
+          />
+        ) : null
+      ),
+    },
+  ]
+}
 
 // ---------------------------------------------------------------------------
 // Edit-mode payload builders

package/src/modules/customers/events.ts

@@ -75,9 +75,9 @@ const events = [
   { id: 'customers.label_assignment.deleted', label: 'Label Unassigned', entity: 'label_assignment', category: 'crud' },
 
   // Person-Company Links
-  { id: 'customers.person_company_link.created', label: 'Person Linked To Company', entity: 'person_company_link', category: 'crud' },
-  { id: 'customers.person_company_link.updated', label: 'Person-Company Link Updated', entity: 'person_company_link', category: 'crud' },
-  { id: 'customers.person_company_link.deleted', label: 'Person Unlinked From Company', entity: 'person_company_link', category: 'crud' },
+  { id: 'customers.person_company_link.created', label: 'Person Linked To Company', entity: 'person_company_link', category: 'crud', clientBroadcast: true },
+  { id: 'customers.person_company_link.updated', label: 'Person-Company Link Updated', entity: 'person_company_link', category: 'crud', clientBroadcast: true },
+  { id: 'customers.person_company_link.deleted', label: 'Person Unlinked From Company', entity: 'person_company_link', category: 'crud', clientBroadcast: true },
 ] as const
 
 export const eventsConfig = createModuleEvents({

package/src/modules/customers/i18n/de.json

@@ -195,6 +195,10 @@
   "customers.companies.dashboard.seeAllActivity": "Alle {{count}} Aktivitäten anzeigen",
   "customers.companies.dashboard.showAll": "Show all",
   "customers.companies.dashboard.upcomingMeetings": "Anstehende Meetings",
+  "customers.companies.delete.blocked": "Unternehmen kann nicht gelöscht werden: {{blockers}}. Bitte zuerst Verknüpfungen lösen oder neu zuweisen.",
+  "customers.companies.delete.blockers.deals": "verknüpfte Deals ({{count}})",
+  "customers.companies.delete.blockers.directPeople": "Personen, deren primäres Unternehmen dies ist ({{count}})",
+  "customers.companies.delete.blockers.persons": "verknüpfte Personen ({{count}})",
   "customers.companies.detail.actions.addDeal": "Deal hinzufügen",
   "customers.companies.detail.actions.backToList": "Zurück zu Unternehmen",
   "customers.companies.detail.actions.cancel": "Abbrechen",
@@ -1189,6 +1193,11 @@
   "customers.people.detail.companies.sortRecent": "Sort: Recently active",
   "customers.people.detail.companies.subtitle": "Link one or more companies and choose the primary relationship for this person.",
   "customers.people.detail.companies.summary": "{{count}} verknüpfte Firmen",
+  "customers.people.detail.companies.unlinkAction": "Verknüpfung lösen",
+  "customers.people.detail.companies.unlinkConfirm": "Verknüpfung von {{company}} mit {{person}} lösen?",
+  "customers.people.detail.companies.unlinkConfirmTitle": "Firma entkoppeln",
+  "customers.people.detail.companies.unlinkError": "Verknüpfung der Firma konnte nicht gelöst werden.",
+  "customers.people.detail.companies.unlinkSuccess": "Firma entkoppelt.",
   "customers.people.detail.company.current": "{{company}}",
   "customers.people.detail.company.empty": "Kein Unternehmen zugewiesen",
   "customers.people.detail.company.label": "Unternehmen",
@@ -1530,6 +1539,7 @@
   "customers.people.form.groups.custom": "Individuelle Felder",
   "customers.people.form.groups.customAttributes": "Custom attributes",
   "customers.people.form.groups.details": "Details",
+  "customers.people.form.groups.displayName": "Anzeigename",
   "customers.people.form.groups.notes": "Notizen",
   "customers.people.form.groups.personalData": "Personal data",
   "customers.people.form.groups.roles": "My roles",

package/src/modules/customers/i18n/en.json

@@ -195,6 +195,10 @@
   "customers.companies.dashboard.seeAllActivity": "See all {{count}} activities",
   "customers.companies.dashboard.showAll": "Show all",
   "customers.companies.dashboard.upcomingMeetings": "Upcoming meetings",
+  "customers.companies.delete.blocked": "Cannot delete company: {{blockers}}. Please unlink or reassign first.",
+  "customers.companies.delete.blockers.deals": "linked deals ({{count}})",
+  "customers.companies.delete.blockers.directPeople": "persons whose primary company is this one ({{count}})",
+  "customers.companies.delete.blockers.persons": "linked persons ({{count}})",
   "customers.companies.detail.actions.addDeal": "Add deal",
   "customers.companies.detail.actions.backToList": "Back to companies",
   "customers.companies.detail.actions.cancel": "Cancel",
@@ -1189,6 +1193,11 @@
   "customers.people.detail.companies.sortRecent": "Sort: Recently active",
   "customers.people.detail.companies.subtitle": "Link one or more companies and choose the primary relationship for this person.",
   "customers.people.detail.companies.summary": "{{count}} linked companies",
+  "customers.people.detail.companies.unlinkAction": "Unlink",
+  "customers.people.detail.companies.unlinkConfirm": "Unlink {{company}} from {{person}}?",
+  "customers.people.detail.companies.unlinkConfirmTitle": "Unlink company",
+  "customers.people.detail.companies.unlinkError": "Failed to unlink company.",
+  "customers.people.detail.companies.unlinkSuccess": "Company unlinked.",
   "customers.people.detail.company.current": "{{company}}",
   "customers.people.detail.company.empty": "No company assigned",
   "customers.people.detail.company.label": "Company",
@@ -1530,6 +1539,7 @@
   "customers.people.form.groups.custom": "Custom fields",
   "customers.people.form.groups.customAttributes": "Custom attributes",
   "customers.people.form.groups.details": "Details",
+  "customers.people.form.groups.displayName": "Display name",
   "customers.people.form.groups.notes": "Notes",
   "customers.people.form.groups.personalData": "Personal data",
   "customers.people.form.groups.roles": "My roles",

package/src/modules/customers/i18n/es.json

@@ -195,6 +195,10 @@
   "customers.companies.dashboard.seeAllActivity": "Ver todas las {{count}} actividades",
   "customers.companies.dashboard.showAll": "Show all",
   "customers.companies.dashboard.upcomingMeetings": "Próximas reuniones",
+  "customers.companies.delete.blocked": "No se puede eliminar la empresa: {{blockers}}. Por favor, desvincula o reasigna primero.",
+  "customers.companies.delete.blockers.deals": "oportunidades vinculadas ({{count}})",
+  "customers.companies.delete.blockers.directPeople": "personas cuya empresa principal es esta ({{count}})",
+  "customers.companies.delete.blockers.persons": "personas vinculadas ({{count}})",
   "customers.companies.detail.actions.addDeal": "Agregar oportunidad",
   "customers.companies.detail.actions.backToList": "Volver a empresas",
   "customers.companies.detail.actions.cancel": "Cancelar",
@@ -1189,6 +1193,11 @@
   "customers.people.detail.companies.sortRecent": "Sort: Recently active",
   "customers.people.detail.companies.subtitle": "Link one or more companies and choose the primary relationship for this person.",
   "customers.people.detail.companies.summary": "{{count}} empresas vinculadas",
+  "customers.people.detail.companies.unlinkAction": "Desvincular",
+  "customers.people.detail.companies.unlinkConfirm": "¿Desvincular {{company}} de {{person}}?",
+  "customers.people.detail.companies.unlinkConfirmTitle": "Desvincular empresa",
+  "customers.people.detail.companies.unlinkError": "No se pudo desvincular la empresa.",
+  "customers.people.detail.companies.unlinkSuccess": "Empresa desvinculada.",
   "customers.people.detail.company.current": "{{company}}",
   "customers.people.detail.company.empty": "Ninguna empresa asignada",
   "customers.people.detail.company.label": "Empresa",
@@ -1530,6 +1539,7 @@
   "customers.people.form.groups.custom": "Campos personalizados",
   "customers.people.form.groups.customAttributes": "Custom attributes",
   "customers.people.form.groups.details": "Detalles",
+  "customers.people.form.groups.displayName": "Nombre para mostrar",
   "customers.people.form.groups.notes": "Notas",
   "customers.people.form.groups.personalData": "Personal data",
   "customers.people.form.groups.roles": "My roles",

package/src/modules/customers/i18n/pl.json

@@ -195,6 +195,10 @@
   "customers.companies.dashboard.seeAllActivity": "Zobacz wszystkie {{count}} aktywności",
   "customers.companies.dashboard.showAll": "Show all",
   "customers.companies.dashboard.upcomingMeetings": "Nadchodzące spotkania",
+  "customers.companies.delete.blocked": "Nie można usunąć firmy: {{blockers}}. Najpierw odłącz lub przepisz powiązania.",
+  "customers.companies.delete.blockers.deals": "powiązane szanse ({{count}})",
+  "customers.companies.delete.blockers.directPeople": "osoby, dla których ta firma jest podstawowa ({{count}})",
+  "customers.companies.delete.blockers.persons": "powiązane osoby ({{count}})",
   "customers.companies.detail.actions.addDeal": "Dodaj szansę",
   "customers.companies.detail.actions.backToList": "Powrót do listy firm",
   "customers.companies.detail.actions.cancel": "Anuluj",
@@ -1189,6 +1193,11 @@
   "customers.people.detail.companies.sortRecent": "Sort: Recently active",
   "customers.people.detail.companies.subtitle": "Link one or more companies and choose the primary relationship for this person.",
   "customers.people.detail.companies.summary": "{{count}} powiązanych firm",
+  "customers.people.detail.companies.unlinkAction": "Odłącz",
+  "customers.people.detail.companies.unlinkConfirm": "Odłączyć firmę {{company}} od {{person}}?",
+  "customers.people.detail.companies.unlinkConfirmTitle": "Odłącz firmę",
+  "customers.people.detail.companies.unlinkError": "Nie udało się odłączyć firmy.",
+  "customers.people.detail.companies.unlinkSuccess": "Firma odłączona.",
   "customers.people.detail.company.current": "{{company}}",
   "customers.people.detail.company.empty": "Brak przypisanej firmy",
   "customers.people.detail.company.label": "Firma",
@@ -1530,6 +1539,7 @@
   "customers.people.form.groups.custom": "Pola niestandardowe",
   "customers.people.form.groups.customAttributes": "Atrybuty niestandardowe",
   "customers.people.form.groups.details": "Szczegóły",
+  "customers.people.form.groups.displayName": "Nazwa wyświetlana",
   "customers.people.form.groups.notes": "Notatki",
   "customers.people.form.groups.personalData": "Dane osobowe",
   "customers.people.form.groups.roles": "Moje role",

package/src/modules/customers/lib/displayName.ts

@@ -1,3 +1,22 @@
+export function deriveDisplayName(
+  firstName: string | null | undefined,
+  lastName: string | null | undefined,
+): string {
+  const first = (firstName ?? '').trim()
+  const last = (lastName ?? '').trim()
+  return [first, last].filter((part) => part.length > 0).join(' ').trim()
+}
+
+export function isDerivedDisplayName(
+  current: string | null | undefined,
+  firstName: string | null | undefined,
+  lastName: string | null | undefined,
+): boolean {
+  const trimmed = (current ?? '').trim()
+  if (trimmed.length === 0) return true
+  return trimmed === deriveDisplayName(firstName, lastName)
+}
+
 export function deriveDisplayNameFromEmail(email: string | null | undefined): string | null {
   if (typeof email !== 'string') return null
   const trimmed = email.trim()