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

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

@@ -1,9 +1,18 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
 import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import { parseBooleanFromUnknown } from '@open-mercato/shared/lib/boolean'
-import type { CustomerTodoLink } from '../data/entities'
+import {
+  CustomerInteraction,
+  CustomerTodoLink,
+} from '../data/entities'
 import type { InteractionRecord } from './interactionCompatibility'
-import { CUSTOMER_INTERACTION_TASK_SOURCE } from './interactionCompatibility'
+import {
+  CUSTOMER_INTERACTION_TASK_SOURCE,
+  EXAMPLE_TODO_SOURCE,
+  resolveExampleIntegrationHref,
+} from './interactionCompatibility'
+import { hydrateCanonicalInteractions, loadCustomerSummaries } from './interactionReadModel'
 
 export type CustomerTodoRow = {
   id: string
@@ -20,6 +29,8 @@ export type CustomerTodoRow = {
   organizationId: string
   tenantId: string
   createdAt: string
+  externalHref?: string | null
+  _integrations?: Record<string, unknown>
   customer: {
     id: string | null
     displayName: string | null
@@ -44,6 +55,29 @@ type CustomerSummary = {
   kind: string | null
 }
 
+type CustomersAuthLike = {
+  tenantId: string | null
+  orgId?: string | null
+  sub?: string | null
+  userId?: string | null
+  keyId?: string | null
+}
+
+type CustomersContainerLike = {
+  resolve: (name: string) => unknown
+}
+
+export type CanonicalTodoListResult = {
+  items: CustomerTodoRow[]
+  bridgeIds: Set<string>
+}
+
+function resolveLegacyTodoSource(source: string | null | undefined): string {
+  return typeof source === 'string' && source.trim().length > 0
+    ? source
+    : EXAMPLE_TODO_SOURCE
+}
+
 function extractTodoTitle(record: Record<string, unknown>): string | null {
   const candidates = ['title', 'subject', 'name', 'summary', 'text', 'description']
   for (const key of candidates) {
@@ -88,6 +122,64 @@ function readCustomField(record: Record<string, unknown>, key: string): unknown
   return undefined
 }
 
+export function normalizeTodoSearch(value: string | undefined): string | null {
+  if (typeof value !== 'string') return null
+  const trimmed = value.trim().toLowerCase()
+  return trimmed.length > 0 ? trimmed : null
+}
+
+export function sortTodoRows(rows: CustomerTodoRow[]): CustomerTodoRow[] {
+  return [...rows].sort((left, right) => {
+    const leftTime = new Date(left.createdAt).getTime()
+    const rightTime = new Date(right.createdAt).getTime()
+    if (leftTime === rightTime) {
+      return right.id.localeCompare(left.id)
+    }
+    return rightTime - leftTime
+  })
+}
+
+export function filterTodoRows(rows: CustomerTodoRow[], search: string | null): CustomerTodoRow[] {
+  if (!search) return rows
+  return rows.filter((row) => {
+    const haystack = [
+      row.customer.displayName,
+      row.todoTitle,
+      row.todoDescription,
+    ]
+      .filter((value): value is string => typeof value === 'string' && value.trim().length > 0)
+      .join(' ')
+      .toLowerCase()
+    return haystack.includes(search)
+  })
+}
+
+export function paginateTodoRows(
+  rows: CustomerTodoRow[],
+  page: number,
+  pageSize: number,
+  exportAll: boolean,
+): { items: CustomerTodoRow[]; total: number; page: number; pageSize: number; totalPages: number } {
+  const total = rows.length
+  if (exportAll) {
+    return {
+      items: rows,
+      total,
+      page: 1,
+      pageSize: total,
+      totalPages: 1,
+    }
+  }
+  const start = (page - 1) * pageSize
+  return {
+    items: rows.slice(start, start + pageSize),
+    total,
+    page,
+    pageSize,
+    totalPages: Math.max(1, Math.ceil(total / pageSize)),
+  }
+}
+
 export async function resolveLegacyTodoDetails(
   queryEngine: QueryEngine,
   links: CustomerTodoLink[],
@@ -103,10 +195,7 @@ export async function resolveLegacyTodoDetails(
 
   const idsBySource = new Map<string, Set<string>>()
   for (const link of links) {
-    const source =
-      typeof link.todoSource === 'string' && link.todoSource.trim().length > 0
-        ? link.todoSource
-        : 'example:todo'
+    const source = resolveLegacyTodoSource(link.todoSource)
     const id =
       typeof link.todoId === 'string' && link.todoId.trim().length > 0
         ? link.todoId
@@ -264,6 +353,136 @@ export async function resolveLegacyTodoDetails(
   return details
 }
 
+export async function listLegacyTodoRows(
+  em: EntityManager,
+  queryEngine: QueryEngine,
+  tenantId: string,
+  organizationIds: string[] | null,
+  entityId: string | undefined,
+): Promise<CustomerTodoRow[]> {
+  const where: Record<string, unknown> = { tenantId }
+  if (organizationIds && organizationIds.length > 0) {
+    where.organizationId = { $in: organizationIds }
+  }
+  if (entityId) {
+    where.entity = entityId
+  }
+
+  const links = await em.find(CustomerTodoLink, where, {
+    populate: ['entity'],
+    orderBy: { createdAt: 'desc' },
+  })
+  const details = await resolveLegacyTodoDetails(
+    queryEngine,
+    links,
+    tenantId,
+    organizationIds ?? [],
+  )
+
+  return links.map((link) => {
+    const source = resolveLegacyTodoSource(link.todoSource)
+    return mapLegacyTodoLinkToRow(
+      link,
+      details.get(`${source}:${link.todoId}`) ?? null,
+    )
+  })
+}
+
+export async function listCanonicalTodoRows(
+  em: EntityManager,
+  container: CustomersContainerLike,
+  auth: CustomersAuthLike,
+  selectedOrganizationId: string | null,
+  organizationIds: string[] | null,
+  options?: {
+    entityId?: string
+    includeDeleted?: boolean
+    source?: string | string[] | null
+  },
+): Promise<CanonicalTodoListResult> {
+  const where: Record<string, unknown> = {
+    tenantId: auth.tenantId,
+    interactionType: 'task',
+  }
+  if (!options?.includeDeleted) {
+    where.deletedAt = null
+  }
+  if (organizationIds && organizationIds.length > 0) {
+    where.organizationId = { $in: organizationIds }
+  }
+  if (options?.entityId) {
+    where.entity = options.entityId
+  }
+  if (options?.source) {
+    where.source = Array.isArray(options.source) ? { $in: options.source } : options.source
+  }
+
+  const interactions = await em.find(CustomerInteraction, where, {
+    orderBy: { createdAt: 'desc' },
+  })
+  const activeInteractions = interactions.filter((interaction) => !interaction.deletedAt)
+  const groups = new Map<string, CustomerInteraction[]>()
+
+  for (const interaction of activeInteractions) {
+    const organizationId =
+      typeof interaction.organizationId === 'string' && interaction.organizationId.trim().length > 0
+        ? interaction.organizationId
+        : selectedOrganizationId ?? ''
+    const bucket = groups.get(organizationId)
+    if (bucket) {
+      bucket.push(interaction)
+    } else {
+      groups.set(organizationId, [interaction])
+    }
+  }
+
+  const rowByInteractionId = new Map<string, CustomerTodoRow>()
+
+  for (const [groupOrganizationId, groupedInteractions] of groups.entries()) {
+    const scopedOrganizationId = groupOrganizationId.length > 0 ? groupOrganizationId : null
+    const hydrated = await hydrateCanonicalInteractions({
+      em,
+      container,
+      auth: {
+        ...auth,
+        orgId: auth.orgId ?? null,
+      },
+      selectedOrganizationId: scopedOrganizationId,
+      interactions: groupedInteractions,
+    })
+    const customerIds = Array.from(
+      new Set(
+        hydrated
+          .map((interaction) => interaction.entityId ?? null)
+          .filter((value): value is string => !!value),
+      ),
+    )
+    const customerSummaries = await loadCustomerSummaries(
+      em,
+      customerIds,
+      auth.tenantId,
+      scopedOrganizationId,
+    )
+
+    for (const interaction of hydrated) {
+      rowByInteractionId.set(
+        interaction.id,
+        mapInteractionRecordToTodoRow(
+          interaction,
+          interaction.entityId ? customerSummaries.get(interaction.entityId) ?? null : null,
+        ),
+      )
+    }
+  }
+
+  return {
+    items: activeInteractions
+      .map((interaction) => rowByInteractionId.get(interaction.id) ?? null)
+      .filter((row): row is CustomerTodoRow => !!row),
+    bridgeIds: new Set(interactions.map((interaction) => interaction.id)),
+  }
+}
+
 export function mapLegacyTodoLinkToRow(
   link: CustomerTodoLink,
   detail: LegacyTodoDetail | null,
@@ -278,10 +497,7 @@ export function mapLegacyTodoLinkToRow(
   return {
     id: link.id,
     todoId: link.todoId,
-    todoSource:
-      typeof link.todoSource === 'string' && link.todoSource.trim().length > 0
-        ? link.todoSource
-        : 'example:todo',
+    todoSource: resolveLegacyTodoSource(link.todoSource),
     todoTitle: detail?.title ?? null,
     todoIsDone: detail?.isDone ?? null,
     todoPriority: detail?.priority ?? null,
@@ -293,6 +509,7 @@ export function mapLegacyTodoLinkToRow(
     organizationId: link.organizationId,
     tenantId: link.tenantId,
     createdAt: link.createdAt.toISOString(),
+    _integrations: undefined,
     customer: entity,
   }
 }
@@ -337,6 +554,8 @@ export function mapInteractionRecordToTodoRow(
     organizationId: interaction.organizationId ?? '',
     tenantId: interaction.tenantId ?? '',
     createdAt: interaction.createdAt,
+    externalHref: resolveExampleIntegrationHref(interaction),
+    _integrations: interaction._integrations ?? undefined,
     customer: customer ?? {
       id: interaction.entityId ?? null,
       displayName: null,

package/src/modules/customers/migrations/.snapshot-open-mercato.json

@@ -4045,7 +4045,7 @@
           "length": null,
           "precision": null,
           "scale": null,
-          "default": "'example:todo'",
+          "default": "'customers:interaction'",
           "comment": null,
           "enumItems": [],
           "mappedType": "text"

package/src/modules/customers/migrations/Migration20260401172819.ts

@@ -0,0 +1,45 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260401172819 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_todo_links" alter column "todo_source" set default 'customers:interaction';`);
+    this.addSql(`
+      update "role_acls" as ra
+      set
+        "features_json" = case
+          when ra."features_json" is null or jsonb_typeof(ra."features_json") <> 'array'
+            then '["customers.interactions.view"]'::jsonb
+          else ra."features_json" || '"customers.interactions.view"'::jsonb
+        end,
+        "updated_at" = now()
+      where ra."deleted_at" is null
+        and ra."features_json" is not null
+        and jsonb_typeof(ra."features_json") = 'array'
+        and ra."features_json" ? 'example.todos.view'
+        and ra."features_json" ? 'customers.activities.view'
+        and not (ra."features_json" ? 'customers.interactions.view');
+    `);
+    this.addSql(`
+      update "user_acls" as ua
+      set
+        "features_json" = case
+          when ua."features_json" is null or jsonb_typeof(ua."features_json") <> 'array'
+            then '["customers.interactions.view"]'::jsonb
+          else ua."features_json" || '"customers.interactions.view"'::jsonb
+        end,
+        "updated_at" = now()
+      where ua."deleted_at" is null
+        and ua."features_json" is not null
+        and jsonb_typeof(ua."features_json") = 'array'
+        and ua."features_json" ? 'example.todos.view'
+        and ua."features_json" ? 'customers.activities.view'
+        and not (ua."features_json" ? 'customers.interactions.view');
+    `);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_todo_links" alter column "todo_source" set default 'example:todo';`);
+  }
+
+}

package/src/modules/customers/search.ts

@@ -6,6 +6,7 @@ import type {
   SearchResultLink,
   SearchIndexSource,
 } from '@open-mercato/shared/modules/search'
+import { CUSTOMER_INTERACTION_TASK_SOURCE, EXAMPLE_TODO_SOURCE } from './lib/interactionCompatibility'
 
 // =============================================================================
 // Context Types
@@ -346,9 +347,9 @@ async function getLinkedTodo(ctx: SearchContext) {
   if (todoCache.has(ctx.record)) {
     return todoCache.get(ctx.record)
   }
-  const sourceRaw = typeof ctx.record.todo_source === 'string' ? ctx.record.todo_source : 'example:todo'
+  const sourceRaw = typeof ctx.record.todo_source === 'string' ? ctx.record.todo_source : EXAMPLE_TODO_SOURCE
   const [moduleId, entityName] = sourceRaw.split(':')
-  const entityId = moduleId && entityName ? `${moduleId}:${entityName}` : 'example:todo'
+  const entityId = moduleId && entityName ? `${moduleId}:${entityName}` : CUSTOMER_INTERACTION_TASK_SOURCE
   const todo = await loadRecord(ctx, entityId, ctx.record.todo_id as string ?? ctx.record.todoId as string)
   todoCache.set(ctx.record, todo ?? null)
   return todo ?? null

package/src/modules/customers/widgets/dashboard/customer-todos/widget.client.tsx

@@ -7,6 +7,8 @@ import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { DEFAULT_SETTINGS, hydrateCustomerTodoSettings, type CustomerTodoWidgetSettings } from './config'
+import { resolveExampleIntegrationHref } from '../../../lib/interactionCompatibility'
+import { resolveTodoHref } from '../../../components/detail/utils'
 
 type TodoLinkSummary = {
   id: string
@@ -14,6 +16,12 @@ type TodoLinkSummary = {
   todoSource: string
   todoTitle: string | null
   createdAt: string
+  _integrations?: {
+    example?: {
+      href?: string | null
+    }
+    [key: string]: unknown
+  }
   entity: {
     id: string | null
     displayName: string | null
@@ -21,23 +29,6 @@ type TodoLinkSummary = {
   }
 }
 
-// SPEC-046b: To enable canonical interactions mode, switch from
-// /api/customers/dashboard/widgets/customer-todos to
-// /api/customers/interactions?status=planned&pageSize={pageSize}
-//
-// Response mapping (InteractionSummary → TodoLinkSummary):
-//   interaction.id               → id, todoId
-//   interaction.interactionType  → todoSource
-//   interaction.title            → todoTitle
-//   interaction.createdAt        → createdAt
-//   interaction.entityId         → entity.id (kind/displayName need enrichment
-//                                   or a follow-up customer lookup)
-//
-// The main gap is the `entity` sub-object: the interactions API returns a flat
-// entityId but not customer displayName/kind. Options:
-//   a) Add an enricher to the interactions list API that resolves entity details
-//   b) Batch-fetch customer details client-side after loading interactions
-//   c) Add a dedicated /api/customers/interactions/widget endpoint
 async function loadTodos(settings: CustomerTodoWidgetSettings): Promise<TodoLinkSummary[]> {
   const params = new URLSearchParams({
     limit: String(settings.pageSize),
@@ -67,6 +58,9 @@ async function loadTodos(settings: CustomerTodoWidgetSettings): Promise<TodoLink
         todoSource: typeof data.todoSource === 'string' ? data.todoSource : '',
         todoTitle: typeof data.todoTitle === 'string' ? data.todoTitle : null,
         createdAt: typeof data.createdAt === 'string' ? data.createdAt : '',
+        _integrations: data._integrations && typeof data._integrations === 'object'
+          ? (data._integrations as TodoLinkSummary['_integrations'])
+          : undefined,
         entity: {
           id: typeof entity.id === 'string' ? entity.id : null,
           displayName: typeof entity.displayName === 'string' ? entity.displayName : null,
@@ -84,8 +78,8 @@ function formatDate(value: string | null, locale?: string): string {
   return date.toLocaleString(locale ?? undefined)
 }
 
-function resolveDetailHref(entity: { id: string | null; kind: string | null }): string | null {
-  if (!entity.id) return null
+function resolveDetailHref(entity: { id: string | null; kind: string | null } | null | undefined): string | null {
+  if (!entity?.id) return null
   if (entity.kind === 'company') return `/backend/customers/companies-v2/${encodeURIComponent(entity.id)}`
   if (entity.kind === 'person') return `/backend/customers/people-v2/${encodeURIComponent(entity.id)}`
   return `/backend/customers/people-v2/${encodeURIComponent(entity.id)}`
@@ -171,6 +165,8 @@ const CustomerTodosWidget: React.FC<DashboardWidgetComponentProps<CustomerTodoWi
           {items.map((item) => {
             const createdLabel = formatDate(item.createdAt, locale)
             const href = resolveDetailHref(item.entity)
+            const exampleHref = resolveExampleIntegrationHref(item)
+            const taskHref = exampleHref ?? resolveTodoHref(item.todoSource, item.todoId)
             return (
               <li key={item.id} className="rounded-md border p-3">
                 <div className="flex items-start justify-between gap-3 text-sm font-medium">
@@ -185,13 +181,18 @@ const CustomerTodosWidget: React.FC<DashboardWidgetComponentProps<CustomerTodoWi
                     <p className="text-xs text-muted-foreground">{item.todoSource}</p>
                   ) : null}
                 </div>
-                {href ? (
-                  <div className="mt-2 text-xs">
+                <div className="mt-2 flex flex-wrap gap-3 text-xs">
+                  {href ? (
                     <Link className="text-primary hover:underline" href={href}>
                       {t('customers.widgets.common.viewRecord')}
                     </Link>
-                  </div>
-                ) : null}
+                  ) : null}
+                  {taskHref ? (
+                    <Link className="text-primary hover:underline" href={taskHref}>
+                      {t('customers.workPlan.customerTodos.table.actions.openTask')}
+                    </Link>
+                  ) : null}
+                </div>
               </li>
             )
           })}