@open-mercato/core 0.10.1-develop.8004.1.a8a79ee43f → 0.10.1-develop.8022.1.b6753de892

package/src/modules/audit_logs/components/AuditLogsActions.tsx

@@ -4,7 +4,10 @@ import * as React from 'react'
 import { extensionPoints } from '@open-mercato/core/modules/audit_logs/extension-points'
 import type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'
 import { DataTable, type PaginationProps } from '@open-mercato/ui/backend/DataTable'
+import type { RowActionItem } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { IconButton } from '@open-mercato/ui/primitives/icon-button'
+import { auditRecordName, auditChangeSummary, auditExecutionState } from '../lib/rowPresentation'
 import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { ActionLogDetailsDialog } from './ActionLogDetailsDialog'
@@ -16,6 +19,10 @@ import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('audit_logs').child({ component: 'AuditLogsActions' })
 
+function AuditLogRowActions({ children }: { items: RowActionItem[]; children: React.ReactNode }) {
+  return <div className="flex justify-end gap-1" data-actions-cell>{children}</div>
+}
+
 /**
  * `raiseCrudError` prefers the server's `error` body over the fallback message and stamps
  * `status` on anything it builds from an HTTP response, so a numeric `status` is what
@@ -150,16 +157,35 @@ export function AuditLogsActions({
     }
   }, [onRefresh, onRedoError, t])
 
-  const columns = React.useMemo<ColumnDef<ActionLogItem, any>[]>(() => [
+  const columns = React.useMemo<ColumnDef<ActionLogItem, unknown>[]>(() => [
     {
       accessorKey: 'actionLabel',
       header: t('audit_logs.actions.columns.action'),
-      cell: (info) => info.row.original.actionLabel || info.row.original.commandId,
+      cell: (info) => {
+        const item = info.row.original
+        const summary = auditChangeSummary(item, t)
+        return (
+          <div className="max-w-72">
+            <div>{item.actionLabel || item.commandId}</div>
+            <div className="truncate text-xs text-muted-foreground" title={summary}>{summary}</div>
+          </div>
+        )
+      },
     },
     {
       accessorKey: 'resourceKind',
       header: t('audit_logs.actions.columns.resource'),
-      cell: (info) => formatResource(info.row.original, noneLabel),
+      cell: (info) => {
+        const item = info.row.original
+        const name = auditRecordName(item)
+        const resource = formatResource(item, noneLabel)
+        return (
+          <div className="max-w-72">
+            {name ? <div className="truncate font-medium" title={name}>{name}</div> : null}
+            <div className={name ? 'truncate text-xs text-muted-foreground' : 'truncate'} title={resource}>{resource}</div>
+          </div>
+        )
+      },
     },
     {
       accessorKey: 'actorUserId',
@@ -170,13 +196,13 @@ export function AuditLogsActions({
     {
       accessorKey: 'tenantId',
       header: t('audit_logs.actions.columns.tenant'),
-      cell: (info) => info.row.original.tenantName || info.getValue() || noneLabel,
+      cell: (info) => info.row.original.tenantName || info.row.original.tenantId || noneLabel,
       meta: { priority: 4 },
     },
     {
       accessorKey: 'organizationId',
       header: t('audit_logs.actions.columns.organization'),
-      cell: (info) => info.row.original.organizationName || info.getValue() || noneLabel,
+      cell: (info) => info.row.original.organizationName || info.row.original.organizationId || noneLabel,
       meta: { priority: 4 },
     },
     {
@@ -187,52 +213,61 @@ export function AuditLogsActions({
     {
       accessorKey: 'executionState',
       header: t('audit_logs.actions.columns.status'),
+      cell: (info) => auditExecutionState(info.row.original.executionState, t),
     },
-    {
-      id: 'controls',
-      header: t('audit_logs.actions.columns.controls'),
-      enableSorting: false,
-      cell: (info) => {
-        const item = info.row.original
-        const itemCanUndo = canUndoEntry(permissions, item.actorUserId)
-        const itemCanRedo = canRedoEntry(permissions, item.actorUserId)
-        const canUndo = itemCanUndo && Boolean(item.undoToken) && item.executionState === 'done' && isLatestUndoableForItem(item)
-        const showRedo = itemCanRedo && item.executionState === 'undone'
-        const canRedo = showRedo && isRedoCandidate(item)
-        if (!canUndo && !showRedo) return null
-        return (
-          <div className="flex justify-end gap-1" data-actions-cell>
-            {canUndo ? (
-              <Button
-                variant="ghost"
-                size="icon"
-                aria-label={t('audit_logs.actions.undo')}
-                onClick={() => { void handleUndo(item.undoToken) }}
-                disabled={undoingToken === item.undoToken || Boolean(redoingId)}
-              >
-                <Undo2 className="size-4" aria-hidden="true" />
-              </Button>
-            ) : null}
-            {showRedo ? (
-              <Button
-                variant="ghost"
-                size="icon"
-                aria-label={t('audit_logs.actions.redo')}
-                onClick={() => { void handleRedo(item.id) }}
-                disabled={!canRedo || redoingId === item.id || Boolean(undoingToken)}
-              >
-                <RotateCcw className="size-4" aria-hidden="true" />
-              </Button>
-            ) : null}
-          </div>
-        )
-      },
-      meta: { align: 'right' },
-    },
-  ], [t, noneLabel, handleUndo, handleRedo, isLatestUndoableForItem, isRedoCandidate, undoingToken, redoingId, permissions])
+  ], [t, noneLabel])
+
+  const rowActions = React.useCallback((item: ActionLogItem) => {
+    const itemCanUndo = canUndoEntry(permissions, item.actorUserId)
+    const itemCanRedo = canRedoEntry(permissions, item.actorUserId)
+    const canUndo = itemCanUndo && Boolean(item.undoToken) && item.executionState === 'done' && isLatestUndoableForItem(item)
+    const showRedo = itemCanRedo && item.executionState === 'undone'
+    const canRedo = showRedo && isRedoCandidate(item)
+    if (!canUndo && !showRedo) return null
+    const undoDisabled = undoingToken === item.undoToken || Boolean(redoingId)
+    const redoDisabled = !canRedo || redoingId === item.id || Boolean(undoingToken)
+    const undoLabel = t('audit_logs.actions.undo_this')
+    const redoLabel = t('audit_logs.actions.redo_this')
+    const onUndo = () => { void handleUndo(item.undoToken) }
+    const onRedo = () => { void handleRedo(item.id) }
+    const items: RowActionItem[] = []
+    if (canUndo && !undoDisabled) items.push({ id: 'undo', label: undoLabel, onSelect: onUndo })
+    if (canRedo && !redoDisabled) items.push({ id: 'redo', label: redoLabel, onSelect: onRedo })
+    return (
+      <AuditLogRowActions items={items}>
+        {canUndo ? (
+          <IconButton
+            variant="ghost"
+            size="lg"
+            type="button"
+            aria-label={undoLabel}
+            title={undoLabel}
+            onClick={onUndo}
+            disabled={undoDisabled}
+          >
+            <Undo2 className="size-4" aria-hidden="true" />
+          </IconButton>
+        ) : null}
+        {showRedo ? (
+          <IconButton
+            variant="ghost"
+            size="lg"
+            type="button"
+            aria-label={redoLabel}
+            title={redoLabel}
+            onClick={onRedo}
+            disabled={redoDisabled}
+          >
+            <RotateCcw className="size-4" aria-hidden="true" />
+          </IconButton>
+        ) : null}
+      </AuditLogRowActions>
+    )
+  }, [t, handleUndo, handleRedo, isLatestUndoableForItem, isRedoCandidate, undoingToken, redoingId, permissions])
 
   const undoButton = latestUndoable?.undoToken && canUndoEntry(permissions, latestUndoable.actorUserId) ? (
     <Button
+      type="button"
       variant="secondary"
       size="sm"
       onClick={() => { void handleUndo(latestUndoable.undoToken) }}
@@ -262,6 +297,8 @@ export function AuditLogsActions({
         titleHeadingLevel={2}
         data={actionItems}
         columns={columns}
+        rowActions={rowActions}
+        stickyActionsColumn
         actions={combinedActions}
         perspective={{ tableId: extensionPoints.hosts.actionsTable.tableId }}
         isLoading={Boolean(isLoading) || Boolean(undoingToken) || Boolean(redoingId)}
@@ -295,6 +332,6 @@ function formatDate(value: string) {
   if (Number.isNaN(date.getTime())) return value
   return new Intl.DateTimeFormat(undefined, {
     dateStyle: 'medium',
-    timeStyle: 'short',
+    timeStyle: 'medium',
   }).format(date)
 }

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

@@ -26,8 +26,10 @@
   "audit_logs.actions.details.snapshot_before": "Snapshot vorher",
   "audit_logs.actions.details.title": "Aktionsdetails",
   "audit_logs.actions.redo": "Letzte Aktion wiederholen",
+  "audit_logs.actions.redo_this": "Diese Aktion wiederholen",
   "audit_logs.actions.title": "Aktionsprotokoll",
   "audit_logs.actions.undo": "Letzte Aktion rückgängig",
+  "audit_logs.actions.undo_this": "Diese Aktion rückgängig machen",
   "audit_logs.actions.undoing": "Wird rückgängig gemacht…",
   "audit_logs.actor.api_key": "API-Schlüssel: {name}",
   "audit_logs.actor.api_key_revoked": "API-Schlüssel: {name} (widerrufen)",
@@ -48,6 +50,20 @@
   "audit_logs.filters.undoable_only": "Nur rückgängig machbar",
   "audit_logs.hint.view_self_only": "Es werden nur Ihre eigenen Änderungen angezeigt. Wenden Sie sich an einen Administrator für erweiterten Zugriff.",
   "audit_logs.nav.title": "Audit-Logs",
+  "audit_logs.summary.active": "Aktiv",
+  "audit_logs.summary.change": "{field}: {from} → {to}",
+  "audit_logs.summary.count": "Geänderte Felder: {count}",
+  "audit_logs.summary.label": "Bezeichnung",
+  "audit_logs.summary.more": "{summary} (+{count})",
+  "audit_logs.summary.name": "Name",
+  "audit_logs.summary.no": "Nein",
+  "audit_logs.summary.parent": "Übergeordnetes Element",
+  "audit_logs.summary.parent_organization": "Übergeordnete Organisation",
+  "audit_logs.summary.root": "(Stammebene)",
+  "audit_logs.summary.slug": "Slug",
+  "audit_logs.summary.status": "Status",
+  "audit_logs.summary.title": "Titel",
+  "audit_logs.summary.yes": "Ja",
   "audit_logs.tabs.label": "Ansichten des Audit-Protokolls",
   "audit_logs.version_history.action.redo": "{action} erneut ausführen",
   "audit_logs.version_history.action.undo": "{action} rückgängig machen",

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

@@ -26,8 +26,10 @@
   "audit_logs.actions.details.snapshot_before": "Snapshot before",
   "audit_logs.actions.details.title": "Action details",
   "audit_logs.actions.redo": "Redo last action",
+  "audit_logs.actions.redo_this": "Redo this action",
   "audit_logs.actions.title": "Action Log",
   "audit_logs.actions.undo": "Undo last action",
+  "audit_logs.actions.undo_this": "Undo this action",
   "audit_logs.actions.undoing": "Undoing…",
   "audit_logs.actor.api_key": "API key: {name}",
   "audit_logs.actor.api_key_revoked": "API key: {name} (revoked)",
@@ -48,6 +50,20 @@
   "audit_logs.filters.undoable_only": "Undoable only",
   "audit_logs.hint.view_self_only": "Showing only your own changes. Contact an administrator for broader access.",
   "audit_logs.nav.title": "Audit Logs",
+  "audit_logs.summary.active": "Active",
+  "audit_logs.summary.change": "{field}: {from} → {to}",
+  "audit_logs.summary.count": "Changed fields: {count}",
+  "audit_logs.summary.label": "Label",
+  "audit_logs.summary.more": "{summary} (+{count})",
+  "audit_logs.summary.name": "Name",
+  "audit_logs.summary.no": "No",
+  "audit_logs.summary.parent": "Parent",
+  "audit_logs.summary.parent_organization": "Parent organization",
+  "audit_logs.summary.root": "(root level)",
+  "audit_logs.summary.slug": "Slug",
+  "audit_logs.summary.status": "Status",
+  "audit_logs.summary.title": "Title",
+  "audit_logs.summary.yes": "Yes",
   "audit_logs.tabs.label": "Audit log views",
   "audit_logs.version_history.action.redo": "Redo {action}",
   "audit_logs.version_history.action.undo": "Undo {action}",

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

@@ -26,8 +26,10 @@
   "audit_logs.actions.details.snapshot_before": "Captura anterior",
   "audit_logs.actions.details.title": "Detalles de la acción",
   "audit_logs.actions.redo": "Rehacer última acción",
+  "audit_logs.actions.redo_this": "Rehacer esta acción",
   "audit_logs.actions.title": "Registro de acciones",
   "audit_logs.actions.undo": "Deshacer última acción",
+  "audit_logs.actions.undo_this": "Deshacer esta acción",
   "audit_logs.actions.undoing": "Deshaciendo…",
   "audit_logs.actor.api_key": "Clave API: {name}",
   "audit_logs.actor.api_key_revoked": "Clave API: {name} (revocada)",
@@ -48,6 +50,20 @@
   "audit_logs.filters.undoable_only": "Solo deshacibles",
   "audit_logs.hint.view_self_only": "Solo se muestran sus propios cambios. Contacte a un administrador para un acceso más amplio.",
   "audit_logs.nav.title": "Registros de auditoría",
+  "audit_logs.summary.active": "Activo",
+  "audit_logs.summary.change": "{field}: {from} → {to}",
+  "audit_logs.summary.count": "Campos modificados: {count}",
+  "audit_logs.summary.label": "Etiqueta",
+  "audit_logs.summary.more": "{summary} (+{count})",
+  "audit_logs.summary.name": "Nombre",
+  "audit_logs.summary.no": "No",
+  "audit_logs.summary.parent": "Elemento superior",
+  "audit_logs.summary.parent_organization": "Organización superior",
+  "audit_logs.summary.root": "(nivel raíz)",
+  "audit_logs.summary.slug": "Slug",
+  "audit_logs.summary.status": "Estado",
+  "audit_logs.summary.title": "Título",
+  "audit_logs.summary.yes": "Sí",
   "audit_logs.tabs.label": "Vistas del registro de auditoría",
   "audit_logs.version_history.action.redo": "Rehacer {action}",
   "audit_logs.version_history.action.undo": "Deshacer {action}",

package/src/modules/audit_logs/i18n/ko.json

@@ -26,8 +26,10 @@
   "audit_logs.actions.details.snapshot_before": "변경 전 스냅샷",
   "audit_logs.actions.details.title": "작업 상세 정보",
   "audit_logs.actions.redo": "마지막 작업 다시 실행",
+  "audit_logs.actions.redo_this": "이 작업 다시 실행",
   "audit_logs.actions.title": "작업 로그",
   "audit_logs.actions.undo": "마지막 작업 실행 취소",
+  "audit_logs.actions.undo_this": "이 작업 실행 취소",
   "audit_logs.actions.undoing": "실행 취소 중…",
   "audit_logs.actor.api_key": "API 키: {name}",
   "audit_logs.actor.api_key_revoked": "API 키: {name} (해지됨)",
@@ -48,6 +50,20 @@
   "audit_logs.filters.undoable_only": "실행 취소 가능한 항목만",
   "audit_logs.hint.view_self_only": "본인의 변경 사항만 표시됩니다. 더 넓은 범위의 접근이 필요하면 관리자에게 문의하세요.",
   "audit_logs.nav.title": "감사 로그",
+  "audit_logs.summary.active": "활성",
+  "audit_logs.summary.change": "{field}: {from} → {to}",
+  "audit_logs.summary.count": "변경된 필드: {count}",
+  "audit_logs.summary.label": "레이블",
+  "audit_logs.summary.more": "{summary} (+{count})",
+  "audit_logs.summary.name": "이름",
+  "audit_logs.summary.no": "아니요",
+  "audit_logs.summary.parent": "상위 항목",
+  "audit_logs.summary.parent_organization": "상위 조직",
+  "audit_logs.summary.root": "(최상위)",
+  "audit_logs.summary.slug": "슬러그",
+  "audit_logs.summary.status": "상태",
+  "audit_logs.summary.title": "제목",
+  "audit_logs.summary.yes": "예",
   "audit_logs.tabs.label": "감사 로그 보기",
   "audit_logs.version_history.action.redo": "{action} 다시 실행",
   "audit_logs.version_history.action.undo": "{action} 실행 취소",

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

@@ -26,8 +26,10 @@
   "audit_logs.actions.details.snapshot_before": "Migawka przed",
   "audit_logs.actions.details.title": "Szczegóły działania",
   "audit_logs.actions.redo": "Przywróć ostatnie działanie",
+  "audit_logs.actions.redo_this": "Ponów to działanie",
   "audit_logs.actions.title": "Dziennik działań",
   "audit_logs.actions.undo": "Cofnij ostatnie działanie",
+  "audit_logs.actions.undo_this": "Cofnij to działanie",
   "audit_logs.actions.undoing": "Cofanie…",
   "audit_logs.actor.api_key": "Klucz API: {name}",
   "audit_logs.actor.api_key_revoked": "Klucz API: {name} (unieważniony)",
@@ -48,6 +50,20 @@
   "audit_logs.filters.undoable_only": "Tylko do cofnięcia",
   "audit_logs.hint.view_self_only": "Wyświetlane są tylko Twoje zmiany. Skontaktuj się z administratorem, aby uzyskać szerszy dostęp.",
   "audit_logs.nav.title": "Logi audytu",
+  "audit_logs.summary.active": "Aktywne",
+  "audit_logs.summary.change": "{field}: {from} → {to}",
+  "audit_logs.summary.count": "Zmienione pola: {count}",
+  "audit_logs.summary.label": "Etykieta",
+  "audit_logs.summary.more": "{summary} (+{count})",
+  "audit_logs.summary.name": "Nazwa",
+  "audit_logs.summary.no": "Nie",
+  "audit_logs.summary.parent": "Element nadrzędny",
+  "audit_logs.summary.parent_organization": "Organizacja nadrzędna",
+  "audit_logs.summary.root": "(poziom główny)",
+  "audit_logs.summary.slug": "Slug",
+  "audit_logs.summary.status": "Status",
+  "audit_logs.summary.title": "Tytuł",
+  "audit_logs.summary.yes": "Tak",
   "audit_logs.tabs.label": "Widoki dziennika audytu",
   "audit_logs.version_history.action.redo": "Ponów {action}",
   "audit_logs.version_history.action.undo": "Cofnij {action}",

package/src/modules/audit_logs/lib/rowPresentation.ts

@@ -0,0 +1,92 @@
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+import { isRecord } from './changeRows'
+
+type AuditRow = {
+  resourceKind?: string | null
+  snapshotBefore?: unknown
+  snapshotAfter?: unknown
+  changes?: Record<string, unknown> | null
+}
+
+const previewFields = [
+  ['displayName', 'audit_logs.summary.name'],
+  ['display_name', 'audit_logs.summary.name'],
+  ['name', 'audit_logs.summary.name'],
+  ['title', 'audit_logs.summary.title'],
+  ['label', 'audit_logs.summary.label'],
+  ['parentId', 'audit_logs.summary.parent'],
+  ['parent_id', 'audit_logs.summary.parent'],
+  ['status', 'audit_logs.summary.status'],
+  ['isActive', 'audit_logs.summary.active'],
+  ['is_active', 'audit_logs.summary.active'],
+  ['slug', 'audit_logs.summary.slug'],
+] as const
+
+function previewText(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const text = value.replace(/\s+/g, ' ').trim()
+  if (!text || text.endsWith(':v1')) return undefined
+  return text.length > 120 ? `${text.slice(0, 119)}…` : text
+}
+
+function snapshotRecord(snapshot: unknown): Record<string, unknown> | undefined {
+  if (!isRecord(snapshot)) return undefined
+  return isRecord(snapshot.view) ? snapshot.view : snapshot
+}
+
+export function auditRecordName(item: AuditRow): string | undefined {
+  for (const snapshot of [item.snapshotAfter, item.snapshotBefore]) {
+    const record = snapshotRecord(snapshot)
+    if (!record) continue
+    for (const field of ['displayName', 'display_name', 'name', 'title', 'label']) {
+      const name = previewText(record[field])
+      if (name) return name
+    }
+  }
+  return undefined
+}
+
+function summaryValue(value: unknown, field: string, t: TranslateFn): string | undefined {
+  if (value === null) {
+    return t(field === 'parentId' || field === 'parent_id' ? 'audit_logs.summary.root' : 'audit_logs.common.none')
+  }
+  if (typeof value === 'boolean') return t(value ? 'audit_logs.summary.yes' : 'audit_logs.summary.no')
+  if (typeof value === 'number' && Number.isFinite(value)) return String(value)
+  return previewText(value)
+}
+
+export function auditChangeSummary(item: AuditRow, t: TranslateFn): string {
+  if (!isRecord(item.changes)) return t('audit_logs.actions.details.no_changes')
+  const count = Object.keys(item.changes).length
+  if (!count) return t('audit_logs.actions.details.no_changes')
+  for (const [field, labelKey] of previewFields) {
+    if (!Object.hasOwn(item.changes, field)) continue
+    const change = item.changes[field]
+    const before = snapshotRecord(item.snapshotBefore)?.[field]
+    const from = isRecord(change)
+      ? Object.hasOwn(change, 'from') ? change.from : Object.hasOwn(change, 'old') ? change.old : before
+      : before
+    const to = isRecord(change)
+      ? Object.hasOwn(change, 'to') ? change.to : change.new
+      : change
+    const fromText = summaryValue(from, field, t)
+    const toText = summaryValue(to, field, t)
+    if (fromText === undefined || toText === undefined) continue
+    const fieldLabel = labelKey === 'audit_logs.summary.parent' && item.resourceKind === 'directory.organization'
+      ? t('audit_logs.summary.parent_organization')
+      : t(labelKey)
+    const summary = t('audit_logs.summary.change', { field: fieldLabel, from: fromText, to: toText })
+    return count > 1 ? t('audit_logs.summary.more', { summary, count: count - 1 }) : summary
+  }
+  return t('audit_logs.summary.count', { count })
+}
+
+export function auditExecutionState(state: string, t: TranslateFn): string {
+  switch (state) {
+    case 'done': return t('audit_logs.version_history.status.done')
+    case 'undone': return t('audit_logs.version_history.status.undone')
+    case 'failed': return t('audit_logs.version_history.status.failed')
+    case 'redone': return t('audit_logs.version_history.status.redone')
+    default: return state
+  }
+}

package/src/modules/catalog/commands/variants.ts

@@ -1,9 +1,17 @@
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
-import { buildChanges, requireId, parseWithCustomFields, setCustomFieldsIfAny, emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'
+import {
+  buildChanges,
+  requireId,
+  parseWithCustomFields,
+  setCustomFieldsIfAny,
+  emitCrudSideEffects,
+  emitCrudUndoSideEffects,
+} from '@open-mercato/shared/lib/commands/helpers'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { UniqueConstraintViolationException } from '@mikro-orm/core'
+import { LockMode, UniqueConstraintViolationException } from '@mikro-orm/core'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
@@ -44,7 +52,7 @@ import {
   getErrorMessage,
 } from './shared'
 import { SalesTaxRate } from '@open-mercato/core/modules/sales/data/entities'
-import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
+import type { CrudEventsConfig, CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 
 const variantCrudEvents: CrudEventsConfig = {
   module: 'catalog',
@@ -57,6 +65,21 @@ const variantCrudEvents: CrudEventsConfig = {
   }),
 }
 
+const variantPriceCrudEvents: CrudEventsConfig = {
+  module: 'catalog',
+  entity: 'price',
+  persistent: true,
+  buildPayload: (ctx) => ({
+    id: ctx.identifiers.id,
+    organizationId: ctx.identifiers.organizationId,
+    tenantId: ctx.identifiers.tenantId,
+  }),
+}
+
+const variantPriceCrudIndexer: CrudIndexerConfig = {
+  entityType: E.catalog.catalog_product_price,
+}
+
 type VariantSnapshot = {
   id: string
   productId: string
@@ -357,6 +380,24 @@ async function loadVariantPriceSnapshots(
   return snapshots
 }
 
+async function resetVariantPriceCustomFields(
+  dataEngine: DataEngine,
+  snapshots: VariantPriceSnapshot[]
+): Promise<void> {
+  for (const snapshot of snapshots) {
+    const resetValues = buildCustomFieldResetMap(snapshot.custom ?? undefined, undefined)
+    if (!Object.keys(resetValues).length) continue
+    await setCustomFieldsIfAny({
+      dataEngine,
+      entityId: E.catalog.catalog_product_price,
+      recordId: snapshot.id,
+      organizationId: snapshot.organizationId,
+      tenantId: snapshot.tenantId,
+      values: resetValues,
+    })
+  }
+}
+
 async function restoreVariantPricesFromSnapshots(
   em: EntityManager,
   variant: CatalogProductVariant,
@@ -728,8 +769,57 @@ const createVariantCommand: CommandHandler<VariantCreateInput, { variantId: stri
     if (!record) return
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
-    em.remove(record)
-    await em.flush()
+    const variantScope = { tenantId: record.tenantId, organizationId: record.organizationId }
+    let priceSnapshots: VariantPriceSnapshot[] = []
+    let variantLocked = false
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          const locked = await findOneWithDecryption(
+            em,
+            CatalogProductVariant,
+            { id: record.id },
+            { lockMode: LockMode.PESSIMISTIC_WRITE },
+            variantScope,
+          )
+          if (!locked) return
+          variantLocked = true
+          priceSnapshots = await loadVariantPriceSnapshots(em.fork({ keepTransactionContext: true }), record.id, variantScope)
+          if (priceSnapshots.length) {
+            await em.nativeDelete(CatalogProductPrice, { id: { $in: priceSnapshots.map((price) => price.id) } })
+          }
+        },
+        () => {
+          if (variantLocked) em.remove(record)
+        },
+      ],
+      { transaction: true }
+    )
+    if (!variantLocked) return
+    await capturePriceHistoryEntries(em, priceSnapshots, 'delete', {
+      metadata: { undoneCommand: 'catalog.variants.create' },
+      cache: resolveOmnibusCache(ctx.container),
+    })
+    const dataEngine = ctx.container.resolve('dataEngine') as DataEngine
+    await resetVariantPriceCustomFields(dataEngine, priceSnapshots)
+    for (const price of priceSnapshots) {
+      await emitCrudUndoSideEffects({
+        dataEngine,
+        action: 'deleted',
+        entity: price,
+        identifiers: { id: price.id, organizationId: price.organizationId, tenantId: price.tenantId },
+        events: variantPriceCrudEvents,
+        indexer: variantPriceCrudIndexer,
+      })
+      await invalidateCrudCache(
+        ctx.container,
+        'catalog.price',
+        { id: price.id, organizationId: price.organizationId, tenantId: price.tenantId },
+        price.tenantId,
+        'command:catalog.variants.create:undo'
+      )
+    }
     if (payload?.previousDefaultVariantId) {
       const previousDefault = await em.findOne(CatalogProductVariant, { id: payload.previousDefaultVariantId })
       if (previousDefault) {
@@ -1098,18 +1188,7 @@ const deleteVariantCommand: CommandHandler<
     em.remove(record)
     await em.flush()
     await capturePriceHistoryEntries(em, priceSnapshots, 'delete', { cache: resolveOmnibusCache(ctx.container) })
-    for (const priceSnapshot of priceSnapshots) {
-      const resetValues = buildCustomFieldResetMap(priceSnapshot.custom ?? undefined, undefined)
-      if (!Object.keys(resetValues).length) continue
-      await setCustomFieldsIfAny({
-        dataEngine,
-        entityId: E.catalog.catalog_product_price,
-        recordId: priceSnapshot.id,
-        organizationId: priceSnapshot.organizationId,
-        tenantId: priceSnapshot.tenantId,
-        values: resetValues,
-      })
-    }
+    await resetVariantPriceCustomFields(dataEngine, priceSnapshots)
     if (snapshot?.custom && Object.keys(snapshot.custom).length) {
       const resetValues = buildCustomFieldResetMap(snapshot.custom, undefined)
       if (Object.keys(resetValues).length) {

package/src/modules/catalog/seed/examples.ts

@@ -824,6 +824,13 @@ async function loadPriceKinds(
   return map;
 }
 
+export function listCatalogExampleKeys(): { productHandles: string[]; variantSkus: string[] } {
+  return {
+    productHandles: PRODUCT_SEEDS.map((seed) => seed.handle),
+    variantSkus: PRODUCT_SEEDS.flatMap((seed) => seed.variants.map((variant) => variant.sku)),
+  };
+}
+
 export async function seedCatalogExamples(
   em: EntityManager,
   container: AwilixContainer,

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

@@ -372,12 +372,12 @@ function applyInteractionListFilters(
     // customer_activity / customer_comment. The returned page's title/body are
     // still decrypted for display further below.
     const searchTerm = `%${escapeLikePattern(query.search)}%`
-    q = q.where(sql<boolean>`coalesce(title, '') ilike ${searchTerm} or coalesce(body, '') ilike ${searchTerm}`)
+    q = q.where(sql<boolean>`(coalesce(title, '') ilike ${searchTerm} or coalesce(body, '') ilike ${searchTerm})`)
   }
   if (query.recurrenceMasters === 'true') {
     q = q.where('recurrence_rule', 'is not', null)
     if (query.from) {
-      q = q.where(sql<boolean>`recurrence_end is null or recurrence_end >= ${query.from}`)
+      q = q.where(sql<boolean>`(recurrence_end is null or recurrence_end >= ${query.from})`)
     }
     if (query.to) {
       q = q.where(sql<boolean>`coalesce(occurred_at, scheduled_at, created_at) <= ${query.to}`)