@open-mercato/core 0.5.1-develop.2663.2c29774b5b → 0.5.1-develop.2681.c559bb2bc3

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

@@ -4,6 +4,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { ensureOrganizationScope, ensureSameScope } from '@open-mercato/shared/lib/commands/scope'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import type { EventBus } from '@open-mercato/events'
 export { ensureOrganizationScope, ensureSameScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
 export { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
 
@@ -126,23 +127,19 @@ const DICTIONARY_KINDS = new Set([
   'pipeline_stage',
   'job_title',
   'industry',
+  'temperature',
+  'renewal_quarter',
+  'person_company_role',
 ])
 
+const CUSTOM_DICTIONARY_KIND_PATTERN = /^[a-z0-9]+(?:[-_][a-z0-9]+)*$/
+
 export async function ensureDictionaryEntry(
   em: EntityManager,
   params: {
     tenantId: string
     organizationId: string
-    kind:
-      | 'status'
-      | 'source'
-      | 'lifecycle_stage'
-      | 'address_type'
-      | 'activity_type'
-      | 'deal_status'
-      | 'pipeline_stage'
-      | 'job_title'
-      | 'industry'
+    kind: string
     value: string
     label?: string | null
     color?: string | null | undefined
@@ -151,7 +148,7 @@ export async function ensureDictionaryEntry(
 ): Promise<CustomerDictionaryEntry | null> {
   const trimmed = params.value?.trim()
   if (!trimmed) return null
-  if (!DICTIONARY_KINDS.has(params.kind)) {
+  if (!DICTIONARY_KINDS.has(params.kind) && !CUSTOM_DICTIONARY_KIND_PATTERN.test(params.kind)) {
     throw new CrudHttpError(400, { error: 'Unsupported dictionary kind' })
   }
   const normalized = trimmed.toLowerCase()
@@ -245,10 +242,11 @@ async function emitQueryIndexEvents(
   const normalized = normalizeEventEntries(entries)
   if (!normalized.length) return
 
-  let bus: { emitEvent(event: string, payload: any, options?: any): Promise<void> } | null = null
+  let bus: EventBus | null = null
   try {
-    bus = ctx.container.resolve('eventBus')
-  } catch {
+    bus = ctx.container.resolve<EventBus>('eventBus')
+  } catch (err) {
+    console.warn('[customers.commands.shared] eventBus resolve failed; skipping query index events', err)
     bus = null
   }
   if (!bus) return
@@ -273,7 +271,10 @@ async function emitQueryIndexEvents(
             organizationId: entry.organizationId ?? null,
           },
         )
-        .catch(() => undefined),
+        .catch((err) => {
+          console.warn('[customers.commands.shared] query index emitEvent failed', entry, err)
+          return undefined
+        }),
     ),
   )
 }

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

@@ -125,6 +125,8 @@ function mapTodoCreateInput(
 ): InteractionCreateInput & { customValues?: Record<string, unknown> } {
   const customValues = collectTodoCustomValues(input)
   return {
+    tenantId: input.tenantId,
+    organizationId: input.organizationId,
     entityId: input.entityId,
     interactionType: 'task',
     title: input.title,
@@ -170,7 +172,8 @@ async function loadLegacyTodoDetail(
   let queryEngine: QueryEngine | null = null
   try {
     queryEngine = ctx.container.resolve('queryEngine') as QueryEngine
-  } catch {
+  } catch (err) {
+    console.warn('[customers.commands.todos] queryEngine resolve failed; returning null legacy detail', err)
     queryEngine = null
   }
   if (!queryEngine) return null
@@ -251,6 +254,8 @@ function mapLegacyLinkToInteractionCreateInput(
   }
   return {
     id: link.todoId,
+    tenantId: link.tenantId,
+    organizationId: link.organizationId,
     entityId,
     interactionType: 'task',
     title: detail?.title ?? null,
@@ -401,6 +406,9 @@ const createTodoCommand: CommandHandler<TodoLinkWithTodoCreateInput, { linkId: s
     if (!canonicalCreate.captureAfter) return null
     return canonicalCreate.captureAfter(
       {
+        tenantId: ctx.auth?.tenantId ?? '00000000-0000-0000-0000-000000000000',
+        organizationId:
+          ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? '00000000-0000-0000-0000-000000000000',
         entityId: '00000000-0000-0000-0000-000000000000',
         interactionType: 'task',
         status: 'planned',
@@ -440,6 +448,14 @@ const createTodoCommand: CommandHandler<TodoLinkWithTodoCreateInput, { linkId: s
     if (!canonicalCreate.undo) return
     await canonicalCreate.undo({
       input: {
+        tenantId:
+          payload?.after?.interaction.tenantId ??
+          (typeof logEntry.tenantId === 'string' ? logEntry.tenantId : '00000000-0000-0000-0000-000000000000'),
+        organizationId:
+          payload?.after?.interaction.organizationId ??
+          (typeof logEntry.organizationId === 'string'
+            ? logEntry.organizationId
+            : '00000000-0000-0000-0000-000000000000'),
         entityId: payload?.after?.interaction.entityId ?? '00000000-0000-0000-0000-000000000000',
         interactionType: 'task',
         status: 'planned',

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

@@ -153,7 +153,7 @@ export function AddressEditor({
   const inputClass = (field: AddressEditorField) =>
     [
       'w-full rounded-md border px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-ring',
-      errors[field] ? 'border-red-500 focus:ring-red-500' : 'border-input bg-background',
+      errors[field] ? 'border-status-error-border focus:ring-status-error-border' : 'border-input bg-background',
     ].join(' ')
 
   return (

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

@@ -0,0 +1,36 @@
+"use client"
+
+import * as React from 'react'
+import { AddressFormatSettings } from './AddressFormatSettings'
+import PipelineSettings from './PipelineSettings'
+import DictionarySettings from './DictionarySettings'
+
+function SettingsSectionSkeleton() {
+  return <section className="min-h-32 rounded-lg border bg-background p-4" aria-hidden="true" />
+}
+
+export default function CustomersConfigurationSections() {
+  const [mounted, setMounted] = React.useState(false)
+
+  React.useEffect(() => {
+    setMounted(true)
+  }, [])
+
+  if (!mounted) {
+    return (
+      <>
+        <SettingsSectionSkeleton />
+        <SettingsSectionSkeleton />
+        <SettingsSectionSkeleton />
+      </>
+    )
+  }
+
+  return (
+    <>
+      <AddressFormatSettings />
+      <PipelineSettings />
+      <DictionarySettings />
+    </>
+  )
+}

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

@@ -29,6 +29,11 @@ type SectionDefinition = {
   description: string
 }
 
+type DictionaryDeleteError = Error & {
+  code?: string
+  usageCount?: number
+}
+
 type DialogState =
   | { mode: 'create' }
   | { mode: 'edit'; entry: DictionaryTableEntry }
@@ -44,6 +49,11 @@ export default function DictionarySettings() {
   const t = useT()
 
   const sections = React.useMemo<SectionDefinition[]>(() => [
+    {
+      kind: 'person-company-roles',
+      title: t('customers.config.dictionaries.sections.personCompanyRoles.title', 'Role types'),
+      description: t('customers.config.dictionaries.sections.personCompanyRoles.description', 'Manage the ownership roles available in People tab assignments.'),
+    },
     {
       kind: 'statuses',
       title: t('customers.config.dictionaries.sections.statuses.title', 'Statuses'),
@@ -126,8 +136,18 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
   const successSave = t('customers.config.dictionaries.success.save', 'Dictionary entry saved.')
   const successDelete = t('customers.config.dictionaries.success.delete', 'Dictionary entry deleted.')
   const deleteConfirmTemplate = t('customers.config.dictionaries.deleteConfirm', 'Delete "{{value}}"?')
+  const roleTypeDeleteBlockedTitle = t('customers.config.dictionaries.roleTypes.deleteBlocked.title', 'Role type is in use')
+  const roleTypeDeleteBlockedText = t(
+    'customers.config.dictionaries.roleTypes.deleteBlocked.text',
+    'This role type is assigned to {{count}} records. Remove or replace those assignments before deleting it.',
+  )
+  const usageCountLabel = t('customers.config.dictionaries.roleTypes.usageCount', 'In use on {{count}} records')
   const searchPlaceholder = t('customers.config.dictionaries.searchPlaceholder', 'Search entries…')
 
+  const formatCountMessage = React.useCallback((template: string, count: number) => {
+    return template.replace('{{count}}', String(count))
+  }, [])
+
   const loadEntries = React.useCallback(async () => {
     setLoading(true)
     try {
@@ -143,6 +163,7 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
         label: typeof item.label === 'string' ? item.label : '',
         color: typeof item.color === 'string' ? item.color : null,
         icon: typeof item.icon === 'string' ? item.icon : null,
+        usageCount: typeof item.usageCount === 'number' ? item.usageCount : undefined,
         organizationId: typeof item.organizationId === 'string' ? item.organizationId : null,
         tenantId: typeof item.tenantId === 'string' ? item.tenantId : null,
         isInherited: item.isInherited === true,
@@ -183,6 +204,15 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
       flash(inheritedActionBlocked, 'info')
       return
     }
+    if (kind === 'person-company-roles' && (entry.usageCount ?? 0) > 0) {
+      await confirm({
+        title: roleTypeDeleteBlockedTitle,
+        description: formatCountMessage(roleTypeDeleteBlockedText, entry.usageCount ?? 0),
+        confirmText: false,
+        cancelText: t('customers.config.dictionaries.dialog.cancel', 'Cancel'),
+      })
+      return
+    }
     const message = deleteConfirmTemplate.replace('{{value}}', entry.label || entry.value)
     const confirmed = await confirm({
       title: message,
@@ -199,10 +229,20 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
       await loadEntries()
     } catch (err) {
       console.error('customers.dictionaries.delete failed', err)
+      if (kind === 'person-company-roles' && (err as DictionaryDeleteError)?.code === 'role_type_in_use') {
+        const usageCount = Number((err as DictionaryDeleteError).usageCount ?? 0)
+        await confirm({
+          title: roleTypeDeleteBlockedTitle,
+          description: formatCountMessage(roleTypeDeleteBlockedText, usageCount),
+          confirmText: false,
+          cancelText: t('customers.config.dictionaries.dialog.cancel', 'Cancel'),
+        })
+        return
+      }
       const messageValue = err instanceof Error ? err.message : errorDelete
       flash(messageValue, 'error')
     }
-  }, [confirm, deleteConfirmTemplate, errorDelete, inheritedActionBlocked, kind, loadEntries, successDelete])
+  }, [confirm, deleteConfirmTemplate, errorDelete, formatCountMessage, inheritedActionBlocked, kind, loadEntries, roleTypeDeleteBlockedText, roleTypeDeleteBlockedTitle, successDelete, t])
 
   const submitForm = React.useCallback(async (values: DictionaryFormValues) => {
     const payload = {
@@ -286,8 +326,9 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
     inheritedLabel,
     inheritedTooltip,
     emptyLabel: t('customers.config.dictionaries.empty', 'No entries yet.'),
+    usageCountLabel: kind === 'person-company-roles' ? usageCountLabel : undefined,
     searchPlaceholder,
-  }), [inheritedLabel, inheritedTooltip, searchPlaceholder, t, title])
+  }), [inheritedLabel, inheritedTooltip, kind, searchPlaceholder, t, title, usageCountLabel])
 
   const formTranslations = React.useMemo(() => ({
     title: dialog?.mode === 'edit'

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

@@ -0,0 +1,175 @@
+"use client"
+
+import * as React from 'react'
+import { ArrowUpRight, EyeOff, Handshake } from 'lucide-react'
+import { cn } from '@open-mercato/shared/lib/utils'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { Badge } from '@open-mercato/ui/primitives/badge'
+import { IconButton } from '@open-mercato/ui/primitives/icon-button'
+import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import type { DealSummary } from '../formConfig'
+import { formatCurrency } from './utils'
+
+type ActiveDealCardProps = {
+  deals: DealSummary[]
+  onHide?: () => void
+}
+
+type PipelineStageOption = {
+  id: string
+  label: string
+}
+
+export function ActiveDealCard({ deals, onHide }: ActiveDealCardProps) {
+  const t = useT()
+  const [pipelineStages, setPipelineStages] = React.useState<PipelineStageOption[]>([])
+
+  const activeDeals = React.useMemo(
+    () => deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed'),
+    [deals],
+  )
+
+  const topDeal = React.useMemo(() => {
+    if (activeDeals.length === 0) return null
+    return [...activeDeals].sort((a, b) => {
+      const va = typeof a.valueAmount === 'number' ? a.valueAmount : parseFloat(String(a.valueAmount ?? '0'))
+      const vb = typeof b.valueAmount === 'number' ? b.valueAmount : parseFloat(String(b.valueAmount ?? '0'))
+      return vb - va
+    })[0]
+  }, [activeDeals])
+
+  React.useEffect(() => {
+    let active = true
+
+    if (!topDeal?.pipelineId) {
+      setPipelineStages([])
+      return () => {
+        active = false
+      }
+    }
+
+    readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
+      `/api/customers/pipeline-stages?pipelineId=${encodeURIComponent(topDeal.pipelineId)}`,
+    )
+      .then((payload) => {
+        if (!active) return
+        const nextStages = (Array.isArray(payload?.items) ? payload.items : [])
+          .map((item) => {
+            const id = typeof item.id === 'string' ? item.id : null
+            const label = typeof item.label === 'string' ? item.label.trim() : ''
+            if (!id || label.length === 0) return null
+            return { id, label }
+          })
+          .filter((stage): stage is PipelineStageOption => stage !== null)
+        setPipelineStages(nextStages)
+      })
+      .catch(() => {
+        if (!active) return
+        setPipelineStages([])
+      })
+
+    return () => {
+      active = false
+    }
+  }, [topDeal?.pipelineId])
+
+  if (!topDeal) {
+    return (
+      <div className="rounded-lg border bg-card p-5">
+        <h3 className="flex items-center gap-2 text-sm font-semibold text-foreground">
+          <Handshake className="size-4" />
+          {t('customers.companies.dashboard.activeDeal', 'Active deal')}
+        </h3>
+        <p className="mt-3 text-sm text-muted-foreground">
+          {t('customers.companies.dashboard.noDeals', 'No active deals')}
+        </p>
+      </div>
+    )
+  }
+
+  const amount = typeof topDeal.valueAmount === 'number'
+    ? topDeal.valueAmount
+    : parseFloat(String(topDeal.valueAmount ?? '0'))
+
+  const currentStage = topDeal.pipelineStage ?? null
+  const stageIndex =
+    topDeal.pipelineStageId && pipelineStages.length > 0
+      ? pipelineStages.findIndex((stage) => stage.id === topDeal.pipelineStageId)
+      : currentStage
+        ? pipelineStages.findIndex((stage) => stage.label.toLowerCase() === currentStage.toLowerCase())
+        : -1
+  const hasPipelineProgress = pipelineStages.length > 0 && stageIndex >= 0
+
+  return (
+    <div className="group relative rounded-lg border bg-card p-5">
+      <div className="flex items-center justify-between">
+        <h3 className="flex items-center gap-2 text-sm font-semibold text-foreground">
+          <Handshake className="size-4" />
+          {t('customers.companies.dashboard.activeDeal', 'Active deal')}
+        </h3>
+        <div className="flex items-center gap-1">
+          {onHide && (
+            <IconButton
+              type="button"
+              variant="ghost"
+              size="xs"
+              onClick={onHide}
+              className="opacity-0 transition-opacity group-hover:opacity-60"
+              aria-label={t('customers.companies.dashboard.hideTile', 'Hide tile')}
+            >
+              <EyeOff className="size-3.5" />
+            </IconButton>
+          )}
+          <ArrowUpRight className="size-4 text-muted-foreground" />
+        </div>
+      </div>
+
+      <div className="mt-3">
+        <p className="font-semibold text-foreground">{topDeal.title}</p>
+        {topDeal.createdAt && (
+          <p className="mt-0.5 text-xs text-muted-foreground">
+            {t('customers.companies.dashboard.created', 'Created')} {new Date(topDeal.createdAt).toLocaleDateString()}
+          </p>
+        )}
+
+        {/* Pipeline stage progress bar */}
+        {currentStage && hasPipelineProgress && (
+          <div className="mt-3">
+            <div className="flex gap-1">
+              {pipelineStages.map((stage, idx) => (
+                <div key={stage.id} className="flex-1">
+                  <div
+                    className={cn(
+                      'h-1.5 rounded-full',
+                      idx <= stageIndex ? 'bg-primary' : 'bg-muted',
+                    )}
+                  />
+                  <p className={cn(
+                    'mt-1 text-xs',
+                    idx <= stageIndex ? 'font-medium text-foreground' : 'text-muted-foreground',
+                  )}>
+                    {stage.label}
+                  </p>
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+        {currentStage && !hasPipelineProgress && (
+          <div className="mt-2">
+            <Badge variant="outline" className="text-xs">{currentStage}</Badge>
+          </div>
+        )}
+
+        {Number.isFinite(amount) && amount > 0 && (
+          <p className="mt-2 text-lg font-bold text-foreground">
+            {formatCurrency(amount, topDeal.valueCurrency)}
+            <span className="ml-1.5 text-xs font-normal text-muted-foreground">
+              {t('customers.companies.dashboard.potentialValue', 'potential value')}
+            </span>
+          </p>
+        )}
+      </div>
+    </div>
+  )
+}