@open-mercato/core 0.6.1-develop.3219.1.ae5c8a5935 → 0.6.1-develop.3246.1.dbef9d7392

package/src/modules/customers/backend/customers/people/page.tsx

@@ -10,6 +10,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildCrudExportUrl } from '@open-mercato/ui/backend/utils/crud'
+import { groupBulkDeleteFailures, runBulkDelete } from '@open-mercato/ui/backend/utils/bulkDelete'
+import { coalesceLastOperations } from '@open-mercato/ui/backend/operations/store'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { E } from '#generated/entities.ids.generated'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -167,6 +170,27 @@ export default function CustomersPeoplePage() {
     setPageSize(newSize)
     setPage(1)
   }, [])
+
+  const bulkMutationContextId = 'customers-people-list:bulk-delete'
+  const { runMutation: runBulkMutation, retryLastMutation: retryBulkMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: bulkMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const singleMutationContextId = 'customers-people-list:single-delete'
+  const { runMutation: runSingleMutation, retryLastMutation: retrySingleMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    resourceId: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: singleMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+
   const fetchDictionaryEntries = React.useCallback(async (kind: DictionaryKindKey) => {
     try {
       const data = await ensureCustomerDictionary(queryClient, kind, scopeVersion)
@@ -467,14 +491,24 @@ export default function CustomersPeoplePage() {
     })
     if (!confirmed) return
     try {
-      await apiCallOrThrow(
-        `/api/customers/people?id=${encodeURIComponent(person.id)}`,
-        {
-          method: 'DELETE',
-          headers: { 'content-type': 'application/json' },
+      await runSingleMutation({
+        operation: async () => {
+          await apiCallOrThrow(
+            `/api/customers/people?id=${encodeURIComponent(person.id)}`,
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            },
+            { errorMessage: t('customers.people.list.deleteError') },
+          )
         },
-        { errorMessage: t('customers.people.list.deleteError') },
-      )
+        context: {
+          formId: singleMutationContextId,
+          resourceKind: 'customers.person',
+          resourceId: person.id,
+          retryLastMutation: retrySingleMutation,
+        },
+      })
       setRows((prev) => prev.filter((row) => row.id !== person.id))
       setTotal((prev) => Math.max(prev - 1, 0))
       handleRefresh()
@@ -483,7 +517,7 @@ export default function CustomersPeoplePage() {
       const message = err instanceof Error ? err.message : t('customers.people.list.deleteError')
       flash(message, 'error')
     }
-  }, [confirm, handleRefresh, t])
+  }, [confirm, handleRefresh, retrySingleMutation, runSingleMutation, singleMutationContextId, t])
 
   const handleBulkDelete = React.useCallback(async (selectedRows: PersonRow[]) => {
     const confirmed = await confirm({
@@ -492,44 +526,71 @@ export default function CustomersPeoplePage() {
       variant: 'destructive',
     })
     if (!confirmed) return false
-    let deletedCount = 0
-    const failedIds: string[] = []
-    for (const row of selectedRows) {
-      try {
-        await apiCallOrThrow(`/api/customers/people?id=${encodeURIComponent(row.id)}`, {
-          method: 'DELETE',
-          headers: { 'content-type': 'application/json' },
+
+    const { succeeded, failures } = await runBulkMutation({
+      operation: async () =>
+        runBulkDelete(
+          selectedRows,
+          async (row) => {
+            await apiCallOrThrow(`/api/customers/people?id=${encodeURIComponent(row.id)}`, {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            })
+          },
+          {
+            fallbackErrorMessage: t('customers.people.list.deleteError', 'Failed to delete person.'),
+            logTag: 'customers.people.list',
+          },
+        ),
+      context: {
+        formId: bulkMutationContextId,
+        resourceKind: 'customers.person',
+        retryLastMutation: retryBulkMutation,
+      },
+    })
+
+    if (succeeded.length > 0) {
+      const succeededIds = new Set(succeeded.map((r) => r.id))
+      setRows((prev) => prev.filter((r) => !succeededIds.has(r.id)))
+      setTotal((prev) => Math.max(0, prev - succeeded.length))
+      setReloadToken((prev) => prev + 1)
+      if (succeeded.length > 1) {
+        coalesceLastOperations(succeeded.length, {
+          commandId: 'customers.people.delete',
+          actionLabel: t('customers.people.list.bulkDelete.operationLabel', 'Delete {count} people', { count: succeeded.length }),
+          resourceKind: 'customers.person',
         })
-        deletedCount++
-      } catch (err) {
-        failedIds.push(row.id)
-        console.warn('[customers.people.list] bulk delete failed', row.id, err)
       }
-    }
-    if (deletedCount > 0) {
-      setRows((prev) => {
-        const succeeded = new Set(selectedRows.map((r) => r.id).filter((id) => !failedIds.includes(id)))
-        return prev.filter((r) => !succeeded.has(r.id))
-      })
-      setTotal((prev) => Math.max(0, prev - deletedCount))
-      if (failedIds.length === 0) {
-        flash(t('customers.people.list.bulkDelete.success', '{count} people deleted', { count: deletedCount }), 'success')
+      if (failures.length === 0) {
+        flash(
+          t('customers.people.list.bulkDelete.success', '{count} people deleted', { count: succeeded.length }),
+          'success',
+        )
       } else {
         flash(
           t('customers.people.list.bulkDelete.partial', '{deleted} of {total} people deleted; {failed} failed', {
-            deleted: deletedCount,
+            deleted: succeeded.length,
             total: selectedRows.length,
-            failed: failedIds.length,
+            failed: failures.length,
           }),
           'warning',
         )
       }
-      setReloadToken((prev) => prev + 1)
-    } else if (failedIds.length > 0) {
-      flash(t('customers.people.list.bulkDelete.failed', 'Failed to delete {count} people', { count: failedIds.length }), 'error')
     }
-    return deletedCount > 0
-  }, [confirm, t])
+
+    for (const group of groupBulkDeleteFailures(failures)) {
+      const message = group.count === 1
+        ? group.sampleMessage
+        : t(
+            'customers.people.list.bulkDelete.failedGroup',
+            '{count} people could not be deleted: {message}',
+            { count: group.count, message: group.sampleMessage },
+          )
+      flash(message, 'error')
+    }
+
+    return succeeded.length > 0
+  }, [bulkMutationContextId, confirm, retryBulkMutation, runBulkMutation, t])
 
   const handleFiltersApply = React.useCallback((values: FilterValues) => {
     const next: FilterValues = {}

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

@@ -234,6 +234,29 @@ function normalizeEmail(value: string | null | undefined): string | null {
   return normalized ? normalized.toLowerCase() : null
 }
 
+type PersonDeleteBlockerCounts = {
+  dealLinks: number
+}
+
+function buildPersonHasDependentsError(
+  translate: (key: string, fallback?: string, params?: Record<string, string | number>) => string,
+  counts: PersonDeleteBlockerCounts,
+): CrudHttpError {
+  const blockers: string[] = []
+  if (counts.dealLinks > 0) {
+    blockers.push(
+      translate('customers.people.delete.blockers.deals', 'linked deals ({{count}})', { count: counts.dealLinks }),
+    )
+  }
+  const summary = blockers.join(', ')
+  const message = translate(
+    'customers.people.delete.blocked',
+    'Cannot delete person: {{blockers}}. Please unlink or reassign first.',
+    { blockers: summary },
+  )
+  return new CrudHttpError(422, { error: message, code: 'PERSON_HAS_DEPENDENTS' })
+}
+
 function serializePersonSnapshot(
   entity: CustomerEntity,
   profile: CustomerPersonProfile,
@@ -1010,6 +1033,13 @@ const deletePersonCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       const record = assertFound(entity, 'Person not found')
       ensureTenantScope(ctx, record.tenantId)
       ensureOrganizationScope(ctx, record.organizationId)
+
+      const dealLinks = await em.count(CustomerDealPersonLink, { person: record })
+      if (dealLinks > 0) {
+        const { translate } = await resolveTranslations()
+        throw buildPersonHasDependentsError(translate, { dealLinks })
+      }
+
       const profile = await em.findOne(CustomerPersonProfile, { entity: record })
       if (profile) em.remove(profile)
       await em.nativeDelete(CustomerAddress, { entity: record, organizationId: record.organizationId, tenantId: record.tenantId })

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

@@ -518,6 +518,8 @@
   "customers.companies.list.bulkDelete.action": "Delete selected",
   "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
   "customers.companies.list.bulkDelete.failed": "{count} Unternehmen konnten nicht gelöscht werden",
+  "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.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
@@ -847,6 +849,8 @@
   "customers.deals.list.bulkDelete.action": "Delete selected",
   "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
   "customers.deals.list.bulkDelete.failed": "{count} Deals konnten nicht gelöscht werden",
+  "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.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
@@ -1096,6 +1100,8 @@
   "customers.people.decisionMakers.label": "Decision Makers",
   "customers.people.decisionMakers.more": "more",
   "customers.people.decisionMakers.sendInvitation": "Send invitation",
+  "customers.people.delete.blocked": "Person kann nicht gelöscht werden: {{blockers}}. Bitte zuerst entkoppeln oder neu zuweisen.",
+  "customers.people.delete.blockers.deals": "verknüpfte Deals ({{count}})",
   "customers.people.detail.actions.addDeal": "Deal hinzufügen",
   "customers.people.detail.actions.backToList": "Zurück zur Personenliste",
   "customers.people.detail.actions.cancel": "Abbrechen",
@@ -1637,6 +1643,8 @@
   "customers.people.list.bulkDelete.action": "Delete selected",
   "customers.people.list.bulkDelete.description": "This action cannot be undone.",
   "customers.people.list.bulkDelete.failed": "{count} Personen konnten nicht gelöscht werden",
+  "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.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",

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

@@ -518,6 +518,8 @@
   "customers.companies.list.bulkDelete.action": "Delete selected",
   "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
   "customers.companies.list.bulkDelete.failed": "Failed to delete {count} companies",
+  "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.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
@@ -847,6 +849,8 @@
   "customers.deals.list.bulkDelete.action": "Delete selected",
   "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
   "customers.deals.list.bulkDelete.failed": "Failed to delete {count} deals",
+  "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.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
@@ -1096,6 +1100,8 @@
   "customers.people.decisionMakers.label": "Decision Makers",
   "customers.people.decisionMakers.more": "more",
   "customers.people.decisionMakers.sendInvitation": "Send invitation",
+  "customers.people.delete.blocked": "Cannot delete person: {{blockers}}. Please unlink or reassign first.",
+  "customers.people.delete.blockers.deals": "linked deals ({{count}})",
   "customers.people.detail.actions.addDeal": "Add deal",
   "customers.people.detail.actions.backToList": "Back to people",
   "customers.people.detail.actions.cancel": "Cancel",
@@ -1637,6 +1643,8 @@
   "customers.people.list.bulkDelete.action": "Delete selected",
   "customers.people.list.bulkDelete.description": "This action cannot be undone.",
   "customers.people.list.bulkDelete.failed": "Failed to delete {count} people",
+  "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.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",

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

@@ -518,6 +518,8 @@
   "customers.companies.list.bulkDelete.action": "Delete selected",
   "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
   "customers.companies.list.bulkDelete.failed": "No se pudieron eliminar {count} empresas",
+  "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.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
@@ -847,6 +849,8 @@
   "customers.deals.list.bulkDelete.action": "Delete selected",
   "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
   "customers.deals.list.bulkDelete.failed": "No se pudieron eliminar {count} deals",
+  "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.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
@@ -1096,6 +1100,8 @@
   "customers.people.decisionMakers.label": "Decision Makers",
   "customers.people.decisionMakers.more": "more",
   "customers.people.decisionMakers.sendInvitation": "Send invitation",
+  "customers.people.delete.blocked": "No se puede eliminar la persona: {{blockers}}. Primero desvincula o reasigna.",
+  "customers.people.delete.blockers.deals": "oportunidades vinculadas ({{count}})",
   "customers.people.detail.actions.addDeal": "Agregar oportunidad",
   "customers.people.detail.actions.backToList": "Volver a personas",
   "customers.people.detail.actions.cancel": "Cancelar",
@@ -1637,6 +1643,8 @@
   "customers.people.list.bulkDelete.action": "Delete selected",
   "customers.people.list.bulkDelete.description": "This action cannot be undone.",
   "customers.people.list.bulkDelete.failed": "No se pudieron eliminar {count} personas",
+  "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.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",

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

@@ -518,6 +518,8 @@
   "customers.companies.list.bulkDelete.action": "Delete selected",
   "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
   "customers.companies.list.bulkDelete.failed": "Nie udało się usunąć {count} firm",
+  "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.success": "{count} companies deleted",
   "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
@@ -847,6 +849,8 @@
   "customers.deals.list.bulkDelete.action": "Delete selected",
   "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
   "customers.deals.list.bulkDelete.failed": "Nie udało się usunąć {count} transakcji",
+  "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.success": "{count} deals deleted",
   "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
@@ -1096,6 +1100,8 @@
   "customers.people.decisionMakers.label": "Decydenci",
   "customers.people.decisionMakers.more": "more",
   "customers.people.decisionMakers.sendInvitation": "Wyślij zaproszenie",
+  "customers.people.delete.blocked": "Nie można usunąć osoby: {{blockers}}. Najpierw rozłącz lub przypisz ponownie.",
+  "customers.people.delete.blockers.deals": "powiązane transakcje ({{count}})",
   "customers.people.detail.actions.addDeal": "Dodaj szansę",
   "customers.people.detail.actions.backToList": "Powrót do listy osób",
   "customers.people.detail.actions.cancel": "Anuluj",
@@ -1637,6 +1643,8 @@
   "customers.people.list.bulkDelete.action": "Delete selected",
   "customers.people.list.bulkDelete.description": "This action cannot be undone.",
   "customers.people.list.bulkDelete.failed": "Nie udało się usunąć {count} osób",
+  "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.success": "{count} people deleted",
   "customers.people.list.bulkDelete.title": "Delete {count} people?",