@open-mercato/core 0.6.1-develop.3287.1.450f4ffb56 → 0.6.1-develop.3306.1.9ad9ff2526

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

@@ -51,7 +51,7 @@ import {
 import type { CrudIndexerConfig, CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import { E } from '#generated/entities.ids.generated'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import { CUSTOMER_ENTITY_ID } from '../lib/customFieldRouting'
+import { CUSTOMER_ENTITY_ID, resolveCompanyCustomFieldRouting } from '../lib/customFieldRouting'
 import { CustomFieldValue } from '@open-mercato/core/modules/entities/data/entities'
 
 const COMPANY_ENTITY_ID = 'customers:customer_company_profile'
@@ -413,22 +413,46 @@ async function loadCompanySnapshot(em: EntityManager, id: string): Promise<Compa
 
 async function setCompanyCustomFields(
   ctx: CommandRuntimeContext,
+  entityId: string,
   profileId: string,
   organizationId: string,
   tenantId: string,
   values: Record<string, unknown>
 ) {
   if (!values || !Object.keys(values).length) return
+  const em = (ctx.container.resolve('em') as EntityManager)
+  const routing = await resolveCompanyCustomFieldRouting(em, tenantId, organizationId)
+  const entityScoped: Record<string, unknown> = {}
+  const profileScoped: Record<string, unknown> = {}
+  for (const [key, value] of Object.entries(values)) {
+    const target = routing.get(key) ?? COMPANY_ENTITY_ID
+    if (target === CUSTOMER_ENTITY_ID) entityScoped[key] = value
+    else profileScoped[key] = value
+  }
+
   const de = (ctx.container.resolve('dataEngine') as DataEngine)
-  await setCustomFieldsIfAny({
-    dataEngine: de,
-    entityId: COMPANY_ENTITY_ID,
-    recordId: profileId,
-    organizationId,
-    tenantId,
-    values,
-    notify: false,
-  })
+  if (Object.keys(entityScoped).length) {
+    await setCustomFieldsIfAny({
+      dataEngine: de,
+      entityId: CUSTOMER_ENTITY_ID,
+      recordId: entityId,
+      organizationId,
+      tenantId,
+      values: entityScoped,
+      notify: false,
+    })
+  }
+  if (Object.keys(profileScoped).length) {
+    await setCustomFieldsIfAny({
+      dataEngine: de,
+      entityId: COMPANY_ENTITY_ID,
+      recordId: profileId,
+      organizationId,
+      tenantId,
+      values: profileScoped,
+      notify: false,
+    })
+  }
 }
 
 function normalizeOptionalString(value: string | null | undefined): string | null {
@@ -495,7 +519,7 @@ const createCompanyCommand: CommandHandler<CompanyCreateInput, { entityId: strin
 
     await syncEntityTags(em, entity, parsed.tags)
     await em.flush()
-    await setCompanyCustomFields(ctx, profile.id, entity.organizationId, entity.tenantId, custom)
+    await setCompanyCustomFields(ctx, entity.id, profile.id, entity.organizationId, entity.tenantId, custom)
 
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     await emitCrudSideEffects({
@@ -622,7 +646,7 @@ const updateCompanyCommand: CommandHandler<CompanyUpdateInput, { entityId: strin
     await syncEntityTags(em, record, parsed.tags)
     await em.flush()
 
-    await setCompanyCustomFields(ctx, profile.id, record.organizationId, record.tenantId, custom)
+    await setCompanyCustomFields(ctx, record.id, profile.id, record.organizationId, record.tenantId, custom)
 
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     await emitCrudSideEffects({
@@ -801,7 +825,7 @@ const updateCompanyCommand: CommandHandler<CompanyUpdateInput, { entityId: strin
 
     const resetValues = buildCustomFieldResetMap(before.custom, payload?.after?.custom)
     if (Object.keys(resetValues).length) {
-      await setCompanyCustomFields(ctx, profile.id, entity.organizationId, entity.tenantId, resetValues)
+      await setCompanyCustomFields(ctx, entity.id, profile.id, entity.organizationId, entity.tenantId, resetValues)
     }
   },
 }
@@ -1329,7 +1353,7 @@ const deleteCompanyCommand: CommandHandler<{ body?: Record<string, unknown>; que
 
       const resetValues = buildCustomFieldResetMap(before.custom, undefined)
       if (Object.keys(resetValues).length) {
-        await setCompanyCustomFields(ctx, profile.id, entity.organizationId, entity.tenantId, resetValues)
+        await setCompanyCustomFields(ctx, entity.id, profile.id, entity.organizationId, entity.tenantId, resetValues)
       }
       await emitQueryIndexUpsertEvents(ctx, [companyEntityIndexEntry(entity)])
       await emitQueryIndexUpsertEvents(ctx, childUpserts)

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

@@ -1,8 +1,8 @@
 'use client'
 
 import * as React from 'react'
-import { Sparkles } from 'lucide-react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { AiIcon } from '@open-mercato/ui/ai/AiIcon'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@open-mercato/ui/primitives/tooltip'
 import { AI_TIMELINE_ACTIONS_BY_TYPE, resolveAiActions } from './aiActionCatalog'
 
@@ -27,7 +27,7 @@ export function AiActionChips({ activityType }: AiActionChipsProps) {
                 type="button"
                 className="inline-flex items-center gap-1 rounded-[4px] border border-dashed border-border bg-card pl-1.5 pr-[7px] py-[3px] text-[9px] font-medium text-muted-foreground/70 transition-colors hover:border-muted-foreground hover:text-foreground"
               >
-                <Sparkles className="size-2.5 shrink-0" />
+                <AiIcon className="size-2.5 shrink-0" />
                 {t(action.i18nKey, action.fallback)}
               </button>
             </TooltipTrigger>

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

@@ -14,6 +14,7 @@ import { ErrorMessage, LoadingMessage, TabEmptyState } from '@open-mercato/ui/ba
 import { ChangelogFilters } from './ChangelogFilters'
 import { ChangelogKpiCards } from './ChangelogKpiCards'
 import { ChangelogEntryRow } from './ChangelogEntryRow'
+import { formatChangelogValue } from './changelogValues'
 
 type AuditAction = {
   id: string
@@ -95,14 +96,6 @@ const HEADER_COLUMNS: Array<{ field: SortField; key: string; fallback: string; a
   { field: 'source', key: 'customers.changelog.col.source', fallback: 'Source', align: 'right' },
 ]
 
-function formatValue(value: unknown): string {
-  if (value == null) return ''
-  if (value instanceof Date) return value.toISOString()
-  if (Array.isArray(value)) return value.map((entry) => formatValue(entry)).filter(Boolean).join(', ')
-  if (typeof value === 'object') return JSON.stringify(value)
-  return String(value)
-}
-
 function formatFieldLabel(fieldName: string): string {
   return fieldName
     .replace(/\./g, ' ')
@@ -126,8 +119,8 @@ function mergeFilterOptions(...groups: FilterOption[][]): FilterOption[] {
 function mapAuditActionToEntry(action: AuditAction): ChangelogEntry {
   const changes = extractChangeRows(action.changes, action.snapshotBefore).map((change) => ({
     fieldName: change.field,
-    oldValue: formatValue(change.from),
-    newValue: formatValue(change.to),
+    oldValue: formatChangelogValue(change.from),
+    newValue: formatChangelogValue(change.to),
   }))
 
   return {

package/src/modules/customers/components/detail/changelogValues.ts

@@ -0,0 +1,42 @@
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object' && !Array.isArray(value)
+}
+
+function readString(record: Record<string, unknown>, ...keys: string[]): string | null {
+  for (const key of keys) {
+    const value = record[key]
+    if (typeof value === 'string' && value.trim().length > 0) {
+      return value.trim()
+    }
+  }
+  return null
+}
+
+function formatObjectSummary(record: Record<string, unknown>): string | null {
+  const personName = [readString(record, 'firstName'), readString(record, 'lastName')]
+    .filter(Boolean)
+    .join(' ')
+    .trim()
+  const label = readString(record, 'displayName', 'label', 'name', 'title', 'fullName')
+    ?? (personName || null)
+    ?? readString(record, 'email')
+  if (!label) return null
+  return record.isPrimary === true ? `${label} (primary)` : label
+}
+
+export function formatChangelogValue(value: unknown): string {
+  if (value == null) return ''
+  if (value instanceof Date) return value.toISOString()
+  if (Array.isArray(value)) {
+    return value
+      .map((entry) => formatChangelogValue(entry))
+      .filter(Boolean)
+      .join(', ')
+  }
+  if (isRecord(value)) {
+    const summary = formatObjectSummary(value)
+    if (summary) return summary
+    return JSON.stringify(value)
+  }
+  return String(value)
+}

package/src/modules/customers/components/detail/customFieldUtils.ts

@@ -121,6 +121,6 @@ export function normalizeCustomFieldSubmitValue(value: unknown): unknown {
   if (Array.isArray(value)) {
     return value.filter((entry) => entry !== undefined)
   }
-  if (value === undefined) return null
+  if (value === undefined) return undefined
   return value
 }

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

@@ -6,6 +6,7 @@ import Link from 'next/link'
 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 { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { EmailInput } from '@open-mercato/ui/primitives/email-input'
@@ -1966,7 +1967,7 @@ export function mapCompanyOverviewToFormValues(overview: CompanyOverview): Parti
     industry: overview.profile?.industry ?? '',
     sizeBucket: overview.profile?.sizeBucket ?? '',
     annualRevenue: overview.profile?.annualRevenue ?? '',
-    ...overview.customFields,
+    ...extractCustomFieldEntries({ customFields: overview.customFields }),
   }
 }
 
@@ -1989,6 +1990,6 @@ export function mapPersonOverviewToFormValues(overview: PersonOverview): Partial
     department: overview.profile?.department ?? '',
     linkedInUrl: overview.profile?.linkedInUrl ?? '',
     twitterUrl: overview.profile?.twitterUrl ?? '',
-    ...overview.customFields,
+    ...extractCustomFieldEntries({ customFields: overview.customFields }),
   }
 }

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

@@ -536,6 +536,7 @@
   "customers.companies.list.bulkDelete.failedGroup": "{count} Unternehmen konnten nicht gelöscht werden: {message}",
   "customers.companies.list.bulkDelete.operationLabel": "{count} Unternehmen löschen",
   "customers.companies.list.bulkDelete.partial": "{deleted} von {total} Unternehmen gelöscht; {failed} fehlgeschlagen",
+  "customers.companies.list.bulkDelete.progressName": "Ausgewählte Unternehmen löschen",
   "customers.companies.list.bulkDelete.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "E-Mail",
@@ -660,6 +661,10 @@
   "customers.countries.it": "Italien",
   "customers.countries.pl": "Polen",
   "customers.countries.us": "Vereinigte Staaten",
+  "customers.deal_analyzer.dock.subtitle": "Deals",
+  "customers.deal_analyzer.sheet.dock": "Seitlich andocken",
+  "customers.deal_analyzer.sheet.title": "Deal-Analyse",
+  "customers.deal_analyzer.sheet.welcomeTitle": "Deal-Analyse",
   "customers.deals.create.error": "Deal konnte nicht erstellt werden.",
   "customers.deals.create.submit": "Deal erstellen",
   "customers.deals.create.title": "Deal erstellen",
@@ -872,6 +877,7 @@
   "customers.deals.list.bulkDelete.failedGroup": "{count} Deals konnten nicht gelöscht werden: {message}",
   "customers.deals.list.bulkDelete.operationLabel": "{count} Deals löschen",
   "customers.deals.list.bulkDelete.partial": "{deleted} von {total} Deals gelöscht; {failed} fehlgeschlagen",
+  "customers.deals.list.bulkDelete.progressName": "Ausgewählte Deals löschen",
   "customers.deals.list.bulkDelete.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Unternehmen",
@@ -1672,6 +1678,7 @@
   "customers.people.list.bulkDelete.failedGroup": "{count} Personen konnten nicht gelöscht werden: {message}",
   "customers.people.list.bulkDelete.operationLabel": "{count} Personen löschen",
   "customers.people.list.bulkDelete.partial": "{deleted} von {total} Personen gelöscht; {failed} fehlgeschlagen",
+  "customers.people.list.bulkDelete.progressName": "Ausgewählte Personen löschen",
   "customers.people.list.bulkDelete.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "E-Mail",

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

@@ -536,6 +536,7 @@
   "customers.companies.list.bulkDelete.failedGroup": "{count} companies could not be deleted: {message}",
   "customers.companies.list.bulkDelete.operationLabel": "Delete {count} companies",
   "customers.companies.list.bulkDelete.partial": "{deleted} of {total} companies deleted; {failed} failed",
+  "customers.companies.list.bulkDelete.progressName": "Delete selected companies",
   "customers.companies.list.bulkDelete.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "Email",
@@ -660,6 +661,10 @@
   "customers.countries.it": "Italy",
   "customers.countries.pl": "Poland",
   "customers.countries.us": "United States",
+  "customers.deal_analyzer.dock.subtitle": "Deals",
+  "customers.deal_analyzer.sheet.dock": "Dock to side",
+  "customers.deal_analyzer.sheet.title": "Deal Analyzer",
+  "customers.deal_analyzer.sheet.welcomeTitle": "Deal Analyzer",
   "customers.deals.create.error": "Failed to create deal.",
   "customers.deals.create.submit": "Create deal",
   "customers.deals.create.title": "Create deal",
@@ -872,6 +877,7 @@
   "customers.deals.list.bulkDelete.failedGroup": "{count} deals could not be deleted: {message}",
   "customers.deals.list.bulkDelete.operationLabel": "Delete {count} deals",
   "customers.deals.list.bulkDelete.partial": "{deleted} of {total} deals deleted; {failed} failed",
+  "customers.deals.list.bulkDelete.progressName": "Delete selected deals",
   "customers.deals.list.bulkDelete.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Companies",
@@ -1672,6 +1678,7 @@
   "customers.people.list.bulkDelete.failedGroup": "{count} people could not be deleted: {message}",
   "customers.people.list.bulkDelete.operationLabel": "Delete {count} people",
   "customers.people.list.bulkDelete.partial": "{deleted} of {total} people deleted; {failed} failed",
+  "customers.people.list.bulkDelete.progressName": "Delete selected people",
   "customers.people.list.bulkDelete.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "Email",

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

@@ -536,6 +536,7 @@
   "customers.companies.list.bulkDelete.failedGroup": "No se pudieron eliminar {count} empresas: {message}",
   "customers.companies.list.bulkDelete.operationLabel": "Eliminar {count} empresas",
   "customers.companies.list.bulkDelete.partial": "{deleted} de {total} empresas eliminadas; {failed} fallaron",
+  "customers.companies.list.bulkDelete.progressName": "Eliminar empresas seleccionadas",
   "customers.companies.list.bulkDelete.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "Correo electrónico",
@@ -660,6 +661,10 @@
   "customers.countries.it": "Italia",
   "customers.countries.pl": "Polonia",
   "customers.countries.us": "Estados Unidos",
+  "customers.deal_analyzer.dock.subtitle": "Negocios",
+  "customers.deal_analyzer.sheet.dock": "Anclar al lado",
+  "customers.deal_analyzer.sheet.title": "Analizador de negocios",
+  "customers.deal_analyzer.sheet.welcomeTitle": "Analizador de negocios",
   "customers.deals.create.error": "No se pudo crear la oportunidad.",
   "customers.deals.create.submit": "Crear oportunidad",
   "customers.deals.create.title": "Crear oportunidad",
@@ -872,6 +877,7 @@
   "customers.deals.list.bulkDelete.failedGroup": "No se pudieron eliminar {count} deals: {message}",
   "customers.deals.list.bulkDelete.operationLabel": "Eliminar {count} deals",
   "customers.deals.list.bulkDelete.partial": "{deleted} de {total} deals eliminados; {failed} fallaron",
+  "customers.deals.list.bulkDelete.progressName": "Eliminar negocios seleccionados",
   "customers.deals.list.bulkDelete.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Empresas",
@@ -1672,6 +1678,7 @@
   "customers.people.list.bulkDelete.failedGroup": "No se pudieron eliminar {count} personas: {message}",
   "customers.people.list.bulkDelete.operationLabel": "Eliminar {count} personas",
   "customers.people.list.bulkDelete.partial": "{deleted} de {total} personas eliminadas; {failed} fallaron",
+  "customers.people.list.bulkDelete.progressName": "Eliminar personas seleccionadas",
   "customers.people.list.bulkDelete.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "Correo electrónico",

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

@@ -536,6 +536,7 @@
   "customers.companies.list.bulkDelete.failedGroup": "Nie udało się usunąć {count} firm: {message}",
   "customers.companies.list.bulkDelete.operationLabel": "Usuń {count} firm",
   "customers.companies.list.bulkDelete.partial": "Usunięto {deleted} z {total} firm; {failed} nie powiodło się",
+  "customers.companies.list.bulkDelete.progressName": "Usuń zaznaczone firmy",
   "customers.companies.list.bulkDelete.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "E-mail",
@@ -660,6 +661,10 @@
   "customers.countries.it": "Włochy",
   "customers.countries.pl": "Polska",
   "customers.countries.us": "Stany Zjednoczone",
+  "customers.deal_analyzer.dock.subtitle": "Transakcje",
+  "customers.deal_analyzer.sheet.dock": "Zadokuj z boku",
+  "customers.deal_analyzer.sheet.title": "Analizator transakcji",
+  "customers.deal_analyzer.sheet.welcomeTitle": "Analizator transakcji",
   "customers.deals.create.error": "Nie udało się utworzyć szansy.",
   "customers.deals.create.submit": "Utwórz szansę",
   "customers.deals.create.title": "Utwórz szansę",
@@ -872,6 +877,7 @@
   "customers.deals.list.bulkDelete.failedGroup": "Nie udało się usunąć {count} transakcji: {message}",
   "customers.deals.list.bulkDelete.operationLabel": "Usuń {count} transakcji",
   "customers.deals.list.bulkDelete.partial": "Usunięto {deleted} z {total} transakcji; {failed} nie powiodło się",
+  "customers.deals.list.bulkDelete.progressName": "Usuń zaznaczone transakcje",
   "customers.deals.list.bulkDelete.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Firmy",
@@ -1672,6 +1678,7 @@
   "customers.people.list.bulkDelete.failedGroup": "Nie udało się usunąć {count} osób: {message}",
   "customers.people.list.bulkDelete.operationLabel": "Usuń {count} osób",
   "customers.people.list.bulkDelete.partial": "Usunięto {deleted} z {total} osób; {failed} nie powiodło się",
+  "customers.people.list.bulkDelete.progressName": "Usuń zaznaczone osoby",
   "customers.people.list.bulkDelete.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "E-mail",