@open-mercato/core 0.5.1-develop.2987.9f8c1e0f68 → 0.5.1-develop.3032.01699048cb

package/src/modules/auth/migrations/Migration20260427081815.ts

@@ -0,0 +1,16 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260427081815 extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`create table "sidebar_variants" ("id" uuid not null default gen_random_uuid(), "user_id" uuid not null, "tenant_id" uuid null, "organization_id" uuid null, "locale" text not null, "name" text not null, "settings_json" jsonb null, "is_active" boolean not null default false, "created_at" timestamptz not null, "updated_at" timestamptz null, "deleted_at" timestamptz null, primary key ("id"));`);
+    this.addSql(`alter table "sidebar_variants" add constraint "sidebar_variants_user_id_tenant_id_locale_name_unique" unique ("user_id", "tenant_id", "locale", "name");`);
+
+    this.addSql(`alter table "sidebar_variants" add constraint "sidebar_variants_user_id_foreign" foreign key ("user_id") references "users" ("id");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop table if exists "sidebar_variants" cascade;`);
+  }
+
+}

package/src/modules/auth/migrations/Migration20260427124900.ts

@@ -0,0 +1,19 @@
+import { Migration } from '@mikro-orm/migrations';
+
+// Replace the full unique constraint on sidebar_variants with a partial unique index
+// scoped to live rows (deleted_at IS NULL). Without this, soft-deleting a variant and
+// then trying to recreate one with the same name throws a duplicate-key error because
+// the regular unique constraint considers tombstoned rows.
+export class Migration20260427124900 extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "sidebar_variants" drop constraint if exists "sidebar_variants_user_id_tenant_id_locale_name_unique";`);
+    this.addSql(`create unique index if not exists "sidebar_variants_active_name_unique_idx" on "sidebar_variants" ("user_id", "tenant_id", "locale", "name") where "deleted_at" is null;`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index if exists "sidebar_variants_active_name_unique_idx";`);
+    this.addSql(`alter table "sidebar_variants" add constraint "sidebar_variants_user_id_tenant_id_locale_name_unique" unique ("user_id", "tenant_id", "locale", "name");`);
+  }
+
+}

package/src/modules/auth/migrations/Migration20260427143311.ts

@@ -0,0 +1,83 @@
+import { Migration } from '@mikro-orm/migrations';
+
+// Cross-locale sidebar customization. Strip `locale` from uniqueness scope so the same
+// variant/preference applies regardless of the user's active language. Soft-delete any
+// historical duplicates first (keep the most-recently-updated row per scope) so the new
+// constraints can be created without violations.
+export class Migration20260427143311 extends Migration {
+
+  override up(): void | Promise<void> {
+    // --- sidebar_variants: collapse (user_id, tenant_id, name) across locales ---------
+    this.addSql(`
+      with ranked as (
+        select id,
+               row_number() over (
+                 partition by user_id, tenant_id, name
+                 order by coalesce(updated_at, created_at) desc, created_at desc, id desc
+               ) as rn
+        from sidebar_variants
+        where deleted_at is null
+      )
+      update sidebar_variants
+      set deleted_at = now()
+      from ranked
+      where sidebar_variants.id = ranked.id and ranked.rn > 1;
+    `);
+    this.addSql(`drop index if exists "sidebar_variants_active_name_unique_idx";`);
+    this.addSql(`alter table "sidebar_variants" drop constraint if exists "sidebar_variants_user_id_tenant_id_locale_name_unique";`);
+    this.addSql(`create unique index if not exists "sidebar_variants_active_name_unique_idx" on "sidebar_variants" ("user_id", "tenant_id", "name") where "deleted_at" is null;`);
+
+    // --- user_sidebar_preferences: collapse (user_id, tenant_id, organization_id) -----
+    this.addSql(`
+      with ranked as (
+        select id,
+               row_number() over (
+                 partition by user_id, tenant_id, organization_id
+                 order by coalesce(updated_at, created_at) desc, created_at desc, id desc
+               ) as rn
+        from user_sidebar_preferences
+        where deleted_at is null
+      )
+      update user_sidebar_preferences
+      set deleted_at = now()
+      from ranked
+      where user_sidebar_preferences.id = ranked.id and ranked.rn > 1;
+    `);
+    this.addSql(`alter table "user_sidebar_preferences" drop constraint if exists "user_sidebar_preferences_user_id_tenant_id_organi_35248_unique";`);
+    this.addSql(`alter table "user_sidebar_preferences" drop constraint if exists "user_sidebar_preferences_user_id_tenant_id_organi_f3f2f_unique";`);
+    this.addSql(`drop index if exists "user_sidebar_preferences_active_unique_idx";`);
+    this.addSql(`create unique index if not exists "user_sidebar_preferences_active_unique_idx" on "user_sidebar_preferences" ("user_id", "tenant_id", "organization_id") where "deleted_at" is null;`);
+
+    // --- role_sidebar_preferences: collapse (role_id, tenant_id) ----------------------
+    this.addSql(`
+      with ranked as (
+        select id,
+               row_number() over (
+                 partition by role_id, tenant_id
+                 order by coalesce(updated_at, created_at) desc, created_at desc, id desc
+               ) as rn
+        from role_sidebar_preferences
+        where deleted_at is null
+      )
+      update role_sidebar_preferences
+      set deleted_at = now()
+      from ranked
+      where role_sidebar_preferences.id = ranked.id and ranked.rn > 1;
+    `);
+    this.addSql(`alter table "role_sidebar_preferences" drop constraint if exists "role_sidebar_preferences_role_id_tenant_id_locale_unique";`);
+    this.addSql(`drop index if exists "role_sidebar_preferences_active_unique_idx";`);
+    this.addSql(`create unique index if not exists "role_sidebar_preferences_active_unique_idx" on "role_sidebar_preferences" ("role_id", "tenant_id") where "deleted_at" is null;`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index if exists "sidebar_variants_active_name_unique_idx";`);
+    this.addSql(`alter table "sidebar_variants" add constraint "sidebar_variants_user_id_tenant_id_locale_name_unique" unique ("user_id", "tenant_id", "locale", "name");`);
+
+    this.addSql(`drop index if exists "user_sidebar_preferences_active_unique_idx";`);
+    this.addSql(`alter table "user_sidebar_preferences" add constraint "user_sidebar_preferences_user_id_tenant_id_organi_35248_unique" unique ("user_id", "tenant_id", "organization_id", "locale");`);
+
+    this.addSql(`drop index if exists "role_sidebar_preferences_active_unique_idx";`);
+    this.addSql(`alter table "role_sidebar_preferences" add constraint "role_sidebar_preferences_role_id_tenant_id_locale_unique" unique ("role_id", "tenant_id", "locale");`);
+  }
+
+}

package/src/modules/auth/services/sidebarPreferencesService.ts

@@ -1,5 +1,6 @@
-import { EntityManager } from '@mikro-orm/postgresql'
-import { Role, RoleSidebarPreference, User, UserSidebarPreference } from '../data/entities'
+import { EntityManager, type FilterQuery } from '@mikro-orm/postgresql'
+import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { Role, RoleSidebarPreference, SidebarVariant, User, UserSidebarPreference } from '../data/entities'
 import {
   SIDEBAR_PREFERENCES_VERSION,
   SidebarPreferencesSettings,
@@ -39,8 +40,16 @@ export async function loadSidebarPreference(
   em: EntityManager,
   scope: SidebarPreferenceScope,
 ): Promise<SidebarPreferencesSettings> {
-  const { userId, tenantId, organizationId, locale } = normalizeScope(scope)
-  const existing = await em.findOne(UserSidebarPreference, { user: userId, tenantId, organizationId, locale })
+  // Cross-locale: variants & preferences are scoped per (user, tenant, org) only.
+  // The `locale` field on the row is kept for audit / when the row was created.
+  const { userId, tenantId, organizationId } = normalizeScope(scope)
+  const existing = await findOneWithDecryption(
+    em,
+    UserSidebarPreference,
+    { user: userId, tenantId, organizationId },
+    undefined,
+    { tenantId, organizationId },
+  )
   return normalizeSidebarSettings(existing?.settingsJson as SidebarPreferencesSettings | undefined)
 }
 
@@ -54,7 +63,13 @@ export async function saveSidebarPreference(
     version: input?.version ?? SIDEBAR_PREFERENCES_VERSION,
   })
   const { userId, tenantId, organizationId, locale } = normalizeScope(scope)
-  let pref = await em.findOne(UserSidebarPreference, { user: userId, tenantId, organizationId, locale })
+  let pref = await findOneWithDecryption(
+    em,
+    UserSidebarPreference,
+    { user: userId, tenantId, organizationId },
+    undefined,
+    { tenantId, organizationId },
+  )
   if (!pref) {
     pref = em.create(UserSidebarPreference, {
       user: em.getReference(User, userId),
@@ -73,16 +88,18 @@ export async function saveSidebarPreference(
 
 export async function loadRoleSidebarPreferences(
   em: EntityManager,
-  options: { roleIds: string[]; tenantId?: string | null; locale: string },
+  options: { roleIds: string[]; tenantId?: string | null; locale?: string },
 ): Promise<Map<string, SidebarPreferencesSettings>> {
   if (!options.roleIds.length) return new Map()
   const tenantId = options.tenantId ?? null
   const tenantFilter = tenantId === null ? null : { $in: [tenantId, null] }
-  const prefs = await em.find(RoleSidebarPreference, {
-    role: { $in: options.roleIds },
-    tenantId: tenantFilter,
-    locale: options.locale,
-  })
+  const prefs = await findWithDecryption(
+    em,
+    RoleSidebarPreference,
+    { role: { $in: options.roleIds }, tenantId: tenantFilter } as FilterQuery<RoleSidebarPreference>,
+    undefined,
+    { tenantId, organizationId: null },
+  )
   const map = new Map<string, SidebarPreferencesSettings>()
   for (const pref of prefs) {
     const key = pref.role.id
@@ -101,16 +118,18 @@ export async function loadRoleSidebarPreferences(
 
 export async function loadFirstRoleSidebarPreference(
   em: EntityManager,
-  options: { roleIds: string[]; tenantId?: string | null; locale: string },
+  options: { roleIds: string[]; tenantId?: string | null; locale?: string },
 ): Promise<SidebarPreferencesSettings | null> {
   if (!options.roleIds.length) return null
   const tenantId = options.tenantId ?? null
   const tenantFilter = tenantId === null ? null : { $in: [tenantId, null] }
-  const prefs = await em.find(RoleSidebarPreference, {
-    role: { $in: options.roleIds },
-    tenantId: tenantFilter,
-    locale: options.locale,
-  })
+  const prefs = await findWithDecryption(
+    em,
+    RoleSidebarPreference,
+    { role: { $in: options.roleIds }, tenantId: tenantFilter } as FilterQuery<RoleSidebarPreference>,
+    undefined,
+    { tenantId, organizationId: null },
+  )
   if (!prefs.length) return null
   const ordered = options.roleIds
     .map((id) => {
@@ -135,7 +154,13 @@ export async function saveRoleSidebarPreference(
     version: input?.version ?? SIDEBAR_PREFERENCES_VERSION,
   })
   const { roleId, tenantId, locale } = normalizeRoleScope(scope)
-  let pref = await em.findOne(RoleSidebarPreference, { role: roleId, tenantId, locale })
+  let pref = await findOneWithDecryption(
+    em,
+    RoleSidebarPreference,
+    { role: roleId, tenantId },
+    undefined,
+    { tenantId, organizationId: null },
+  )
   if (!pref) {
     pref = em.create(RoleSidebarPreference, {
       role: em.getReference(Role, roleId),
@@ -217,3 +242,203 @@ function normalizeRoleScope(scope: RoleSidebarPreferenceScope) {
     locale: scope.locale,
   }
 }
+
+// --- Named variants (per-user library of saved sidebar layouts) ----------------
+
+export type VariantScope = {
+  userId: string
+  tenantId?: string | null
+  organizationId?: string | null
+  locale: string
+}
+
+export type SidebarVariantRecord = {
+  id: string
+  name: string
+  isActive: boolean
+  settings: SidebarPreferencesSettings
+  createdAt: Date
+  updatedAt?: Date | null
+}
+
+function toVariantRecord(variant: SidebarVariant): SidebarVariantRecord {
+  return {
+    id: variant.id,
+    name: variant.name,
+    isActive: variant.isActive === true,
+    settings: normalizeSidebarSettings(variant.settingsJson as SidebarPreferencesSettings | undefined),
+    createdAt: variant.createdAt,
+    updatedAt: variant.updatedAt ?? null,
+  }
+}
+
+export async function listSidebarVariants(
+  em: EntityManager,
+  scope: VariantScope,
+): Promise<SidebarVariantRecord[]> {
+  // Cross-locale: variants are scoped per (user, tenant) only.
+  const { userId, tenantId, organizationId } = normalizeVariantScope(scope)
+  const variants = await findWithDecryption(
+    em,
+    SidebarVariant,
+    { user: userId, tenantId, deletedAt: null },
+    { orderBy: { createdAt: 'asc' } },
+    { tenantId, organizationId },
+  )
+  return variants.map(toVariantRecord)
+}
+
+export async function loadSidebarVariant(
+  em: EntityManager,
+  scope: VariantScope,
+  variantId: string,
+): Promise<SidebarVariantRecord | null> {
+  const { userId, tenantId, organizationId } = normalizeVariantScope(scope)
+  const variant = await findOneWithDecryption(
+    em,
+    SidebarVariant,
+    { id: variantId, user: userId, tenantId, deletedAt: null },
+    undefined,
+    { tenantId, organizationId },
+  )
+  return variant ? toVariantRecord(variant) : null
+}
+
+export async function nextVariantAutoName(
+  em: EntityManager,
+  scope: VariantScope,
+  prefix = 'My preferences',
+): Promise<string> {
+  const variants = await listSidebarVariants(em, scope)
+  // Match names like "My preferences", "My preferences 2", "My preferences 17"
+  const usedNumbers = new Set<number>()
+  for (const variant of variants) {
+    if (variant.name === prefix) {
+      usedNumbers.add(1)
+      continue
+    }
+    const escaped = prefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    const match = variant.name.match(new RegExp(`^${escaped}\\s+(\\d+)$`))
+    if (match) {
+      const n = Number.parseInt(match[1], 10)
+      if (!Number.isNaN(n)) usedNumbers.add(n)
+    }
+  }
+  if (!usedNumbers.has(1)) return prefix
+  let next = 2
+  while (usedNumbers.has(next)) next += 1
+  return `${prefix} ${next}`
+}
+
+export async function createSidebarVariant(
+  em: EntityManager,
+  scope: VariantScope,
+  input: {
+    name?: string | null
+    settings?: Partial<SidebarPreferencesSettings> | null
+    isActive?: boolean
+  },
+): Promise<SidebarVariantRecord> {
+  const { userId, tenantId, organizationId, locale } = normalizeVariantScope(scope)
+  const finalName = (input.name ?? '').trim() || (await nextVariantAutoName(em, scope))
+  const settings = normalizeSidebarSettings({
+    ...(input.settings ?? {}),
+    version: input.settings?.version ?? SIDEBAR_PREFERENCES_VERSION,
+  })
+
+  if (input.isActive === true) {
+    await deactivateAllVariants(em, scope)
+  }
+
+  const variant = em.create(SidebarVariant, {
+    user: em.getReference(User, userId),
+    tenantId,
+    organizationId,
+    locale,
+    name: finalName,
+    settingsJson: settings,
+    isActive: input.isActive === true,
+    createdAt: new Date(),
+  })
+  await em.flush()
+  return toVariantRecord(variant)
+}
+
+export async function updateSidebarVariant(
+  em: EntityManager,
+  scope: VariantScope,
+  variantId: string,
+  input: {
+    name?: string
+    settings?: Partial<SidebarPreferencesSettings> | null
+    isActive?: boolean
+  },
+): Promise<SidebarVariantRecord | null> {
+  const { userId, tenantId, organizationId } = normalizeVariantScope(scope)
+  const variant = await findOneWithDecryption(
+    em,
+    SidebarVariant,
+    { id: variantId, user: userId, tenantId, deletedAt: null },
+    undefined,
+    { tenantId, organizationId },
+  )
+  if (!variant) return null
+  if (typeof input.name === 'string' && input.name.trim().length > 0) {
+    variant.name = input.name.trim()
+  }
+  if (input.settings) {
+    variant.settingsJson = normalizeSidebarSettings({
+      ...input.settings,
+      version: input.settings.version ?? SIDEBAR_PREFERENCES_VERSION,
+    })
+  }
+  if (typeof input.isActive === 'boolean') {
+    if (input.isActive) {
+      await deactivateAllVariants(em, scope, variantId)
+    }
+    variant.isActive = input.isActive
+  }
+  await em.flush()
+  return toVariantRecord(variant)
+}
+
+export async function deleteSidebarVariant(
+  em: EntityManager,
+  scope: VariantScope,
+  variantId: string,
+): Promise<boolean> {
+  const { userId, tenantId, organizationId } = normalizeVariantScope(scope)
+  const variant = await findOneWithDecryption(
+    em,
+    SidebarVariant,
+    { id: variantId, user: userId, tenantId, deletedAt: null },
+    undefined,
+    { tenantId, organizationId },
+  )
+  if (!variant) return false
+  variant.deletedAt = new Date()
+  variant.isActive = false
+  await em.flush()
+  return true
+}
+
+async function deactivateAllVariants(
+  em: EntityManager,
+  scope: VariantScope,
+  exceptId?: string,
+): Promise<void> {
+  const { userId, tenantId } = normalizeVariantScope(scope)
+  const where: FilterQuery<SidebarVariant> = exceptId
+    ? { user: userId, tenantId, isActive: true, deletedAt: null, id: { $ne: exceptId } }
+    : { user: userId, tenantId, isActive: true, deletedAt: null }
+  await em.nativeUpdate(SidebarVariant, where, { isActive: false })
+}
+
+function normalizeVariantScope(scope: VariantScope) {
+  return {
+    userId: scope.userId,
+    tenantId: scope.tenantId ?? null,
+    organizationId: scope.organizationId ?? null,
+    locale: scope.locale,
+  }
+}

package/src/modules/customers/api/companies/[id]/route.ts

@@ -42,7 +42,10 @@ import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { parseBooleanFromUnknown } from '@open-mercato/shared/lib/boolean'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../../lib/personCompanyLinkTable'
 import { normalizeCustomerDetailCustomFields } from '../../detailCustomFields'
 
 export const metadata = {
@@ -703,15 +706,17 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       },
       'customers.companies.GET',
     )
-    const companyLinks = await findWithDecryption(
-      em,
-      CustomerPersonCompanyLink,
-      companyLinkWhere,
-      {
-        populate: ['person', 'person.personProfile'],
-        orderBy: { isPrimary: 'desc', createdAt: 'asc' },
-      },
-      peopleDecryptionScope,
+    const companyLinks = filterActivePersonCompanyLinks(
+      await findWithDecryption(
+        em,
+        CustomerPersonCompanyLink,
+        companyLinkWhere,
+        {
+          populate: ['person', 'person.personProfile'],
+          orderBy: { isPrimary: 'desc', createdAt: 'asc' },
+        },
+        peopleDecryptionScope,
+      ),
     )
     companyLinks.forEach((link) => {
       const entity = typeof link.person === 'string' ? null : link.person
@@ -829,18 +834,23 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       })
   const peopleCount = includePeople
     ? relatedPeople.length
-    : await em.count(
-        CustomerPersonCompanyLink,
-        await withActiveCustomerPersonCompanyLinkFilter(
+    : filterActivePersonCompanyLinks(
+        await findWithDecryption(
           em,
-          {
-            company: company.id,
-            organizationId: company.organizationId,
-            tenantId: company.tenantId,
-          },
-          'customers.companies.GET',
+          CustomerPersonCompanyLink,
+          await withActiveCustomerPersonCompanyLinkFilter(
+            em,
+            {
+              company: company.id,
+              organizationId: company.organizationId,
+              tenantId: company.tenantId,
+            },
+            'customers.companies.GET',
+          ),
+          {},
+          { tenantId: company.tenantId, organizationId: company.organizationId },
         ),
-      )
+      ).length
   const kpiInteractionRows = canonicalActiveInteractions.length
     ? canonicalActiveInteractions
     : await findWithDecryption(

package/src/modules/customers/api/companies/route.ts

@@ -33,7 +33,10 @@ import {
   createPagedListResponseSchema,
   defaultOkResponseSchema,
 } from '../openapi'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../lib/personCompanyLinkTable'
 import { normalizeCompanyProfilePayload } from './payload'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -217,12 +220,14 @@ const crud = makeCrudRoute({
             { person: query.excludeLinkedPersonId },
             'customers.companies.GET',
           )
-          const links = await findWithDecryption(
-            em,
-            CustomerPersonCompanyLink,
-            linkWhere,
-            { populate: ['company'] },
-            decryptionScope,
+          const links = filterActivePersonCompanyLinks(
+            await findWithDecryption(
+              em,
+              CustomerPersonCompanyLink,
+              linkWhere,
+              { populate: ['company'] },
+              decryptionScope,
+            ),
           )
           links.forEach((link) => {
             const companyId = link.company?.id

package/src/modules/customers/api/people/[id]/companies/enriched/route.ts

@@ -20,7 +20,10 @@ import {
   CustomerDeal,
   CustomerInteraction,
 } from '../../../../../data/entities'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../../../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../../../../lib/personCompanyLinkTable'
 
 const paramsSchema = z.object({
   id: z.string().uuid(),
@@ -187,12 +190,14 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
       },
       'customers.people.companiesEnriched.GET',
     )
-    const links = await findWithDecryption(
-      em,
-      CustomerPersonCompanyLink,
-      linkWhere,
-      { populate: ['company'] },
-      entityScope,
+    const links = filterActivePersonCompanyLinks(
+      await findWithDecryption(
+        em,
+        CustomerPersonCompanyLink,
+        linkWhere,
+        { populate: ['company'] },
+        entityScope,
+      ),
     )
 
     const companyIds = links.map((link) => (link.company as CustomerEntity).id)

package/src/modules/customers/api/people/route.ts

@@ -29,7 +29,10 @@ import {
   createPagedListResponseSchema,
   defaultOkResponseSchema,
 } from '../openapi'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../lib/personCompanyLinkTable'
 import { normalizeProfilePayload } from './payload'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -221,12 +224,14 @@ const crud = makeCrudRoute({
             { company: query.excludeLinkedCompanyId },
             'customers.people.GET',
           )
-          const links = await findWithDecryption(
-            em,
-            CustomerPersonCompanyLink,
-            linkWhere,
-            { populate: ['person'] },
-            decryptionScope,
+          const links = filterActivePersonCompanyLinks(
+            await findWithDecryption(
+              em,
+              CustomerPersonCompanyLink,
+              linkWhere,
+              { populate: ['person'] },
+              decryptionScope,
+            ),
           )
           links.forEach((link) => {
             const personId = link.person?.id

package/src/modules/customers/backend/customers/companies/[id]/page.tsx

@@ -35,6 +35,7 @@ import { CompanyHighlights } from '../../../../components/detail/CompanyHighligh
 import { normalizeCustomFieldSubmitValue } from '../../../../components/detail/customFieldUtils'
 import { InlineDictionaryEditor, renderMultilineMarkdownDisplay } from '../../../../components/detail/InlineEditors'
 import { formatTemplate } from '../../../../components/detail/utils'
+import { coerceDisplayName } from '../../../../lib/displayName'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import {
   CompanyPeopleSection,
@@ -117,10 +118,10 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
   const [sectionAction, setSectionAction] = React.useState<SectionAction | null>(null)
   const [isDeleting, setIsDeleting] = React.useState(false)
   const currentCompanyId = data?.company?.id ?? null
-  const companyName =
-    data?.company?.displayName && data.company.displayName.trim().length
-      ? data.company.displayName
-      : t('customers.companies.list.deleteFallbackName', 'this company')
+  const companyDisplayName = coerceDisplayName(data?.company?.displayName)
+  const companyName = companyDisplayName.trim().length
+    ? companyDisplayName
+    : t('customers.companies.list.deleteFallbackName', 'this company')
   const translateCompanyDetail = React.useCallback(
     (key: string, fallback?: string, params?: Record<string, string | number>) => {
       const mappedKey = key.startsWith('customers.people.detail.')