@open-mercato/core 0.5.1-develop.2912.8d7b1fef24 → 0.5.1-develop.2924.d13908516e

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()

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

@@ -6,7 +6,10 @@ import {
   CustomerPersonCompanyLink,
   CustomerPersonProfile,
 } from '../data/entities'
-import { withActiveCustomerPersonCompanyLinkFilter } from './personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from './personCompanyLinkTable'
 
 export type PersonCompanySummary = {
   linkId: string | null
@@ -62,12 +65,14 @@ export async function loadPersonCompanyLinks(
     { person, organizationId: person.organizationId, tenantId: person.tenantId },
     'customers.personCompanies.loadPersonCompanyLinks',
   )
-  return findWithDecryption(
-    em,
-    CustomerPersonCompanyLink,
-    where,
-    { populate: ['company'], orderBy: { isPrimary: 'desc', createdAt: 'asc' } },
-    { tenantId: person.tenantId, organizationId: person.organizationId },
+  return filterActivePersonCompanyLinks(
+    await findWithDecryption(
+      em,
+      CustomerPersonCompanyLink,
+      where,
+      { populate: ['company'], orderBy: { isPrimary: 'desc', createdAt: 'asc' } },
+      { tenantId: person.tenantId, organizationId: person.organizationId },
+    ),
   )
 }
 

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

@@ -51,3 +51,17 @@ export async function withActiveCustomerPersonCompanyLinkFilter<T extends Record
   }
   return { ...where, deletedAt: null }
 }
+
+/**
+ * Drop soft-deleted link rows from a result set as a defense-in-depth fallback.
+ * MikroORM has historically dropped `deletedAt: null` from the WHERE clause for
+ * nullable date columns under certain configurations, so callers SHOULD apply this
+ * after `findWithDecryption(...)` until the upstream query filter is verified to
+ * fully cover all callers.
+ */
+export function filterActivePersonCompanyLinks<T extends { deletedAt?: Date | string | null | undefined }>(
+  links: T[] | null | undefined,
+): T[] {
+  if (!Array.isArray(links)) return []
+  return links.filter((entry) => entry?.deletedAt == null)
+}

package/src/modules/workflows/lib/activity-executor.ts

@@ -16,7 +16,7 @@ import { WorkflowInstance } from '../data/entities'
 import { createModuleQueue, Queue } from '@open-mercato/queue'
 import { getRedisUrl } from '@open-mercato/shared/lib/redis/connection'
 import {
-  assertSafeOutboundUrl,
+  safeOutboundFetch,
   UnsafeOutboundUrlError,
   type HostLookup,
 } from '@open-mercato/shared/lib/url-safety'
@@ -646,12 +646,27 @@ export async function executeCallWebhook(
 
   const allowPrivate = deps.allowPrivate ?? isAllowPrivateWorkflowWebhookUrlsEnabled()
 
+  let response: Response
   try {
-    await assertSafeOutboundUrl(url, {
-      subject: 'Workflow webhook URL',
-      allowPrivate,
-      lookupHost: deps.lookupHost,
-    })
+    response = await safeOutboundFetch(
+      url,
+      {
+        method,
+        headers: {
+          'Content-Type': 'application/json',
+          ...headers,
+        },
+        body: body !== undefined && body !== null ? JSON.stringify(body) : undefined,
+        redirect: 'manual',
+        signal: deps.signal,
+      },
+      {
+        subject: 'Workflow webhook URL',
+        allowPrivate,
+        lookupHost: deps.lookupHost,
+        fetchImpl: deps.fetchImpl,
+      },
+    )
   } catch (error) {
     if (error instanceof UnsafeOutboundUrlError) {
       throw new Error(
@@ -661,18 +676,6 @@ export async function executeCallWebhook(
     throw error
   }
 
-  const fetchImpl = deps.fetchImpl ?? fetch
-  const response = await fetchImpl(url, {
-    method,
-    headers: {
-      'Content-Type': 'application/json',
-      ...headers,
-    },
-    body: body !== undefined && body !== null ? JSON.stringify(body) : undefined,
-    redirect: 'manual',
-    signal: deps.signal,
-  })
-
   if (response.status >= 300 && response.status < 400) {
     const location = response.headers.get('location')
     throw new Error(