@open-mercato/core 0.4.11-develop.1309.4b37381a7a → 0.4.11-develop.1347.c693e6dfee

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

@@ -53,6 +53,26 @@ const interactionCrudEvents: CrudEventsConfig = {
     id: ctx.identifiers.id,
     organizationId: ctx.identifiers.organizationId,
     tenantId: ctx.identifiers.tenantId,
+    entityId:
+      ctx.entity && typeof ctx.entity === 'object' && 'entity' in (ctx.entity as Record<string, unknown>)
+        ? (() => {
+            const entityRef = (ctx.entity as CustomerInteraction).entity
+            return typeof entityRef === 'string' ? entityRef : entityRef?.id ?? null
+          })()
+        : null,
+    interactionType:
+      ctx.entity && typeof ctx.entity === 'object' && 'interactionType' in (ctx.entity as Record<string, unknown>)
+        ? (ctx.entity as CustomerInteraction).interactionType
+        : null,
+    status:
+      ctx.entity && typeof ctx.entity === 'object' && 'status' in (ctx.entity as Record<string, unknown>)
+        ? (ctx.entity as CustomerInteraction).status
+        : null,
+    source:
+      ctx.entity && typeof ctx.entity === 'object' && 'source' in (ctx.entity as Record<string, unknown>)
+        ? (ctx.entity as CustomerInteraction).source ?? null
+        : null,
+    ...(ctx.syncOrigin ? { syncOrigin: ctx.syncOrigin } : {}),
   }),
 }
 
@@ -167,8 +187,12 @@ async function emitInteractionRevertedEvent(
     id: interaction.id,
     organizationId: interaction.organizationId,
     tenantId: interaction.tenantId,
+    entityId: interaction.entityId,
+    interactionType: interaction.interactionType,
+    source: interaction.source ?? null,
     status: interaction.status,
     occurredAt: interaction.occurredAt?.toISOString() ?? null,
+    ...(ctx.syncOrigin ? { syncOrigin: ctx.syncOrigin } : {}),
   })
 }
 
@@ -287,6 +311,7 @@ const createInteractionCommand: CommandHandler<InteractionCreateInput, { interac
         organizationId: interaction.organizationId,
         tenantId: interaction.tenantId,
       },
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
@@ -413,6 +438,7 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
         organizationId: interaction.organizationId,
         tenantId: interaction.tenantId,
       },
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
@@ -532,6 +558,7 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
         organizationId: interaction.organizationId,
         tenantId: interaction.tenantId,
       },
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
@@ -587,10 +614,19 @@ const completeInteractionCommand: CommandHandler<InteractionCompleteInput, { int
       action: 'updated',
       entity: interaction,
       identifiers,
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
-    await emitLifecycleEvent(ctx, 'customers.interaction.completed', identifiers)
+    await emitLifecycleEvent(ctx, 'customers.interaction.completed', {
+      ...identifiers,
+      entityId,
+      interactionType: interaction.interactionType,
+      status: interaction.status,
+      source: interaction.source ?? null,
+      occurredAt: interaction.occurredAt?.toISOString() ?? null,
+      ...(ctx.syncOrigin ? { syncOrigin: ctx.syncOrigin } : {}),
+    })
     await emitNextInteractionUpdatedEvent(ctx, { entityId, nextInteractionId }, identifiers)
 
     return { interactionId: interaction.id }
@@ -653,6 +689,7 @@ const completeInteractionCommand: CommandHandler<InteractionCompleteInput, { int
         organizationId: result.interaction.organizationId,
         tenantId: result.interaction.tenantId,
       },
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
@@ -708,10 +745,18 @@ const cancelInteractionCommand: CommandHandler<InteractionCancelInput, { interac
       action: 'updated',
       entity: interaction,
       identifiers,
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
-    await emitLifecycleEvent(ctx, 'customers.interaction.canceled', identifiers)
+    await emitLifecycleEvent(ctx, 'customers.interaction.canceled', {
+      ...identifiers,
+      entityId,
+      interactionType: interaction.interactionType,
+      status: interaction.status,
+      source: interaction.source ?? null,
+      ...(ctx.syncOrigin ? { syncOrigin: ctx.syncOrigin } : {}),
+    })
     await emitNextInteractionUpdatedEvent(ctx, { entityId, nextInteractionId }, identifiers)
 
     return { interactionId: interaction.id }
@@ -773,6 +818,7 @@ const cancelInteractionCommand: CommandHandler<InteractionCancelInput, { interac
         organizationId: result.interaction.organizationId,
         tenantId: result.interaction.tenantId,
       },
+      syncOrigin: ctx.syncOrigin,
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents,
     })
@@ -828,6 +874,7 @@ const deleteInteractionCommand: CommandHandler<{ body?: Record<string, unknown>;
           organizationId: interaction.organizationId,
           tenantId: interaction.tenantId,
         },
+        syncOrigin: ctx.syncOrigin,
         indexer: interactionCrudIndexer,
         events: interactionCrudEvents,
       })
@@ -939,6 +986,7 @@ const deleteInteractionCommand: CommandHandler<{ body?: Record<string, unknown>;
           organizationId: interaction.organizationId,
           tenantId: interaction.tenantId,
         },
+        syncOrigin: ctx.syncOrigin,
         indexer: interactionCrudIndexer,
         events: interactionCrudEvents,
       })

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

@@ -11,10 +11,10 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { buildCrudExportUrl } from '@open-mercato/ui/backend/utils/crud'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { resolveTodoHref } from './detail/utils'
 
 type CustomerTodoItem = {
   id: string
@@ -31,6 +31,8 @@ type CustomerTodoItem = {
   organizationId: string
   tenantId: string
   createdAt: string
+  externalHref?: string | null
+  _integrations?: Record<string, unknown>
   customer: {
     id: string | null
     displayName: string | null
@@ -47,6 +49,7 @@ type CustomerTodosResponse = {
 }
 
 const TASKS_TAB_QUERY = 'tab=tasks'
+const CUSTOMER_TASKS_API_PATH = '/api/customers/interactions/tasks'
 
 function buildCustomerHref(item: CustomerTodoItem): string | null {
   const customerId = item.customer?.id
@@ -59,25 +62,31 @@ function buildCustomerHref(item: CustomerTodoItem): string | null {
   return `${base}?${TASKS_TAB_QUERY}`
 }
 
-// SPEC-046b: To enable canonical interactions mode, switch this table to
-// /api/customers/interactions?status=planned&pageSize=N&page=N&search=...
-//
-// Column mapping (InteractionSummary → CustomerTodoItem shape):
-//   interaction.id        → todoId (also use as id)
-//   interaction.title     → todoTitle
-//   interaction.status    → todoIsDone: status === 'done'
-//   interaction.entityId  → requires a separate lookup or API enricher
-//                           to resolve customer displayName/kind
-//
-// The main gap is the `customer` sub-object: the interactions API does not
-// embed customer details. Options:
-//   a) Add a response enricher to the interactions API that populates
-//      customer displayName/kind from entityId
-//   b) Fetch customer details client-side for visible rows
-//   c) Add an /api/customers/interactions/table endpoint that joins entities
-//
-// Export config would switch from 'customers/todos' to 'customers/interactions'
-// with exportScope: 'full' and an adjusted column mapping.
+function buildCustomerTasksQueryString(input: {
+  page: number
+  pageSize: number
+  search: string
+  all?: boolean
+}): string {
+  const usp = new URLSearchParams({
+    page: String(input.page),
+    pageSize: String(input.pageSize),
+  })
+  if (input.search.trim().length > 0) usp.set('search', input.search.trim())
+  if (input.all) usp.set('all', 'true')
+  return usp.toString()
+}
+
+function readValueAtPath(record: Record<string, unknown>, path: string): unknown {
+  const segments = path.split('.').filter((segment) => segment.length > 0)
+  let current: unknown = record
+  for (const segment of segments) {
+    if (!current || typeof current !== 'object') return null
+    current = (current as Record<string, unknown>)[segment]
+  }
+  return current ?? null
+}
+
 export function CustomerTodosTable(): React.JSX.Element {
   const t = useT()
   const router = useRouter()
@@ -87,14 +96,11 @@ export function CustomerTodosTable(): React.JSX.Element {
   const [page, setPage] = React.useState(1)
   const [pageSize] = React.useState(50)
 
-  const params = React.useMemo(() => {
-    const usp = new URLSearchParams({
-      page: String(page),
-      pageSize: String(pageSize),
-    })
-    if (search.trim().length > 0) usp.set('search', search.trim())
-    return usp.toString()
-  }, [page, pageSize, search])
+  const params = React.useMemo(() => buildCustomerTasksQueryString({
+    page,
+    pageSize,
+    search,
+  }), [page, pageSize, search])
 
   const columns = React.useMemo<ColumnDef<CustomerTodoItem>[]>(() => [
     {
@@ -118,10 +124,10 @@ export function CustomerTodosTable(): React.JSX.Element {
       header: t('customers.workPlan.customerTodos.table.column.todo'),
       cell: ({ row }) => {
         const title = row.original.todoTitle ?? t('customers.workPlan.customerTodos.table.column.todo.unnamed')
-        const todoId = row.original.todoId
-        if (!todoId) return <span className="text-muted-foreground">{title}</span>
+        const todoHref = row.original.externalHref ?? resolveTodoHref(row.original.todoSource, row.original.todoId)
+        if (!todoHref) return <span className="text-muted-foreground">{title}</span>
         return (
-          <Link href={`/backend/todos/${todoId}/edit`} className="underline-offset-2 hover:underline">
+          <Link href={todoHref} className="underline-offset-2 hover:underline">
             {title}
           </Link>
         )
@@ -150,15 +156,30 @@ export function CustomerTodosTable(): React.JSX.Element {
       .filter((col): col is { field: string; header: string } => !!col)
   }, [columns])
 
-  const { data, isLoading, error, refetch, isFetching } = useQuery<CustomerTodosResponse>({
-    queryKey: ['customers-todos', params, scopeVersion],
-    queryFn: async () => {
-      return readApiResultOrThrow<CustomerTodosResponse>(
-        `/api/customers/todos?${params}`,
-        undefined,
-        { errorMessage: t('customers.workPlan.customerTodos.table.error.load') },
+  const buildPreparedExport = React.useCallback((
+    exportRows: CustomerTodoItem[],
+    exportColumns: Array<{ field: string; header: string }>,
+  ): PreparedExport => ({
+    columns: exportColumns.map((col) => ({ field: col.field, header: col.header })),
+    rows: exportRows.map((row) => {
+      const record = row as Record<string, unknown>
+      return Object.fromEntries(
+        exportColumns.map((col) => [col.field, readValueAtPath(record, col.field)]),
       )
-    },
+    }),
+  }), [])
+
+  const fetchTasks = React.useCallback(async (queryString: string): Promise<CustomerTodosResponse> => {
+    return readApiResultOrThrow<CustomerTodosResponse>(
+      `${CUSTOMER_TASKS_API_PATH}?${queryString}`,
+      undefined,
+      { errorMessage: t('customers.workPlan.customerTodos.table.error.load') },
+    )
+  }, [t])
+
+  const { data, isLoading, error, refetch, isFetching } = useQuery<CustomerTodosResponse>({
+    queryKey: ['customers-interactions-tasks', params, scopeVersion],
+    queryFn: async () => fetchTasks(params),
     placeholderData: keepPreviousData,
   })
 
@@ -168,27 +189,28 @@ export function CustomerTodosTable(): React.JSX.Element {
     view: {
       description: t('customers.workPlan.customerTodos.table.export.view'),
       prepare: async (): Promise<{ prepared: PreparedExport; filename: string }> => {
-        const rowsForExport = rows.map((row) => {
-          const out: Record<string, unknown> = {}
-          for (const col of viewExportColumns) {
-            out[col.field] = (row as Record<string, unknown>)[col.field]
-          }
-          return out
-        })
-        const prepared: PreparedExport = {
-          columns: viewExportColumns.map((col) => ({ field: col.field, header: col.header })),
-          rows: rowsForExport,
+        return {
+          prepared: buildPreparedExport(rows, viewExportColumns),
+          filename: 'customer_todos_view',
         }
-        return { prepared, filename: 'customer_todos_view' }
       },
     },
     full: {
       description: t('customers.workPlan.customerTodos.table.export.full'),
-      getUrl: (format: DataTableExportFormat) =>
-        buildCrudExportUrl('customers/todos', { exportScope: 'full', all: 'true' }, format),
-      filename: () => 'customer_todos_full',
+      prepare: async (_format: DataTableExportFormat): Promise<{ prepared: PreparedExport; filename: string }> => {
+        const fullData = await fetchTasks(buildCustomerTasksQueryString({
+          page: 1,
+          pageSize,
+          search,
+          all: true,
+        }))
+        return {
+          prepared: buildPreparedExport(fullData.items, viewExportColumns),
+          filename: 'customer_todos_full',
+        }
+      },
     },
-  }), [rows, t, viewExportColumns])
+  }), [buildPreparedExport, fetchTasks, pageSize, rows, search, t, viewExportColumns])
 
   const handleRefresh = React.useCallback(async () => {
     try {
@@ -234,18 +256,21 @@ export function CustomerTodosTable(): React.JSX.Element {
       perspective={{ tableId: 'customers.todos.list' }}
       rowActions={(row) => {
         const customerLink = buildCustomerHref(row)
-        if (!customerLink) return null
-        return (
-          <RowActions
-            items={[
-              {
-                id: 'open-customer',
-                label: t('customers.workPlan.customerTodos.table.actions.openCustomer'),
-                href: customerLink,
-              },
-            ]}
-          />
-        )
+        const todoHref = row.externalHref ?? resolveTodoHref(row.todoSource, row.todoId)
+        const items = [
+          customerLink ? {
+            id: 'open-customer',
+            label: t('customers.workPlan.customerTodos.table.actions.openCustomer'),
+            href: customerLink,
+          } : null,
+          todoHref ? {
+            id: 'open-task',
+            label: t('customers.workPlan.customerTodos.table.actions.openTask'),
+            href: todoHref,
+          } : null,
+        ].filter((item): item is { id: string; label: string; href: string } => !!item)
+        if (!items.length) return null
+        return <RowActions items={items} />
       }}
       onRowClick={handleNavigate}
       pagination={{

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

@@ -449,7 +449,7 @@ export function TasksSection({
               </div>
             ) : null}
             {sortedTasks.map((task) => {
-              const todoHref = resolveTodoHref(task.todoSource, task.todoId)
+              const todoHref = task.externalHref ?? resolveTodoHref(task.todoSource, task.todoId)
               const createdLabel = formatDateTime(task.createdAt) ?? emptyLabel
               const meta = renderTaskMeta(task)
               const title = task.title ?? t('customers.people.detail.tasks.untitled', 'Untitled task')
@@ -570,15 +570,15 @@ export function TasksSection({
                 {t('customers.people.detail.tasks.loadingMore', 'Loading…')}
               </div>
             ) : null}
-            <div className="flex justify-center">
-              <Button asChild variant="outline" size="sm">
-                <Link href="/backend/customer-tasks">
-                  {t('customers.people.detail.tasks.viewAll', 'View all tasks')}
-                </Link>
-              </Button>
-            </div>
           </div>
         ) : null}
+        <div className="flex justify-center">
+          <Button asChild variant="outline" size="sm">
+            <Link href="/backend/customer-tasks">
+              {t('customers.people.detail.tasks.viewAll', 'View all tasks')}
+            </Link>
+          </Button>
+        </div>
       </div>
 
       <TaskDialog

package/src/modules/customers/components/detail/hooks/usePersonTasks.ts

@@ -6,8 +6,9 @@ import { resolveTodoApiPath } from '../utils'
 import type { TodoLinkSummary } from '../types'
 import { generateTempId } from '@open-mercato/core/modules/customers/lib/detailHelpers'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { CUSTOMER_INTERACTION_TASK_SOURCE } from '../../../lib/interactionCompatibility'
 
-const DEFAULT_TODO_SOURCE = 'example:todo'
+const DEFAULT_TODO_SOURCE = CUSTOMER_INTERACTION_TASK_SOURCE
 
 type CustomerTodoRow = {
   id: string

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

@@ -109,6 +109,7 @@ export type TodoLinkSummary = {
   dueAt?: string | null
   todoOrganizationId?: string | null
   customValues?: Record<string, unknown> | null
+  externalHref?: string | null
 }
 
 export type InteractionSummary = {
@@ -133,6 +134,11 @@ export type InteractionSummary = {
   authorEmail?: string | null
   dealTitle?: string | null
   customValues?: Record<string, unknown> | null
+  customer?: {
+    id: string | null
+    displayName: string | null
+    kind: string | null
+  } | null
   _integrations?: Record<string, unknown>
   createdAt: string
   updatedAt: string

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

@@ -39,6 +39,9 @@ export function resolveTodoHref(source: string, todoId: string | null | undefine
   if (source === CUSTOMER_INTERACTION_TASK_SOURCE || source === CUSTOMER_INTERACTION_TASK_TYPE) return null
   const [module] = source.split(':')
   if (!module) return null
+  if (module === 'example') {
+    return `/backend/todos/${encodeURIComponent(todoId)}/edit`
+  }
   return `/backend/${module}/todos/${encodeURIComponent(todoId)}/edit`
 }
 

package/src/modules/customers/data/entities.ts

@@ -809,8 +809,8 @@ export class CustomerTodoLink {
   @Property({ name: 'todo_id', type: 'uuid' })
   todoId!: string
 
-  @Property({ name: 'todo_source', type: 'text', default: 'example:todo' })
-  todoSource: string = 'example:todo'
+  @Property({ name: 'todo_source', type: 'text', default: 'customers:interaction' })
+  todoSource: string = 'customers:interaction'
 
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()

package/src/modules/customers/data/validators.ts

@@ -282,7 +282,7 @@ export const tagAssignmentSchema = scopedSchema.extend({
 export const todoLinkCreateSchema = scopedSchema.extend({
   entityId: uuid(),
   todoId: uuid(),
-  todoSource: z.string().min(1).max(120).default('example:todo'),
+  todoSource: z.string().min(1).max(120).default('customers:interaction'),
   createdByUserId: uuid().optional(),
 })
 
@@ -291,7 +291,7 @@ export const todoLinkWithTodoCreateSchema = scopedSchema.extend({
   title: z.string().min(1).max(200),
   isDone: z.boolean().optional(),
   is_done: z.boolean().optional(),
-  todoSource: z.string().min(1).max(120).default('example:todo'),
+  todoSource: z.string().min(1).max(120).default('customers:interaction'),
   createdByUserId: uuid().optional(),
   todoCustom: z.record(z.string(), z.any()).optional(),
   custom: z.record(z.string(), z.any()).optional(),

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

@@ -5,6 +5,7 @@ export const CUSTOMER_INTERACTION_TASK_SOURCE = 'customers:interaction'
 export const CUSTOMER_INTERACTION_TASK_TYPE = 'task'
 export const CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE = 'adapter:activity'
 export const CUSTOMER_INTERACTION_TODO_ADAPTER_SOURCE = 'adapter:todo'
+export const EXAMPLE_TODO_SOURCE = 'example:todo'
 
 export type InteractionRecord = InteractionSummary & {
   authorName?: string | null
@@ -48,6 +49,7 @@ export function mapInteractionRecordToActivitySummary(interaction: InteractionRe
 
 export function mapInteractionRecordToTodoSummary(interaction: InteractionRecord): TodoLinkSummary {
   const customValues: Record<string, unknown> = { ...(interaction.customValues ?? {}) }
+  const externalHref = resolveExampleIntegrationHref(interaction)
   if (interaction.priority !== undefined) customValues.priority = interaction.priority
   if (interaction.body !== undefined && customValues.description === undefined) {
     customValues.description = interaction.body ?? null
@@ -73,5 +75,19 @@ export function mapInteractionRecordToTodoSummary(interaction: InteractionRecord
     dueAt: interaction.scheduledAt ?? null,
     todoOrganizationId: null,
     customValues: Object.keys(customValues).length > 0 ? customValues : null,
+    externalHref,
   }
 }
+
+type IntegrationCarrier = {
+  _integrations?: {
+    example?: { href?: string | null; syncStatus?: string | null; [key: string]: unknown }
+    [key: string]: unknown
+  }
+}
+
+export function resolveExampleIntegrationHref(item: IntegrationCarrier): string | null {
+  const example = item._integrations?.example
+  if (!example || typeof example !== 'object') return null
+  return typeof example.href === 'string' && example.href.trim().length > 0 ? example.href : null
+}