@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/customers/backend/customers/deals/pipeline/components/StatusFilterPopover.tsx

@@ -10,70 +10,45 @@ import {
 } from '@open-mercato/ui/primitives/popover'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
-import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { mapDictionaryColorToTone } from '@open-mercato/shared/lib/query/advanced-filter'
-import { Spinner } from '@open-mercato/ui/primitives/spinner'
-import { useCustomerDictionary } from '../../../../../components/detail/hooks/useCustomerDictionary'
-import { canonicalDealStatus } from '../../../../../lib/dealStatus'
-import { toneToDotClass } from './toneClasses'
 import { ChipButton } from './ChipButton'
 import { FilterPopoverShell } from './FilterPopoverShell'
 
 /**
  * Filter options exposed to the operator.
  *
- * The deal `status` column is dictionary-driven (`deal-statuses`); the seeded dictionary
- * carries five values (`open`, `closed`, `win`, `loose`, `in_progress`) plus any
- * tenant-custom entries. We render every dictionary entry de-duplicated by canonical
- * spelling so the kanban Status pill stays aligned with the list page's advanced filter
- * (which also uses the dictionary). A hard-coded fallback keeps the popover usable while
- * the dictionary is loading or when a tenant has no entries.
- *
- * `won` / `lost` are accepted as aliases for `win` / `loose` at the API layer (see
- * `lib/dealStatus.ts:expandDealStatusAliases`, shared by the deals list route and the
- * kanban aggregate route). The UI only exposes the canonical values to avoid duplicate
- * pills, but `canonicalDealStatus` normalizes any alias passed in through `values` so
- * the chip and draft selection render the correct label.
+ * The deal `status` column accepts the historical 4-value enum (`open` | `closed` | `win` |
+ * `loose`), but the codebase only ever **writes** `loose` for a lost deal — `closed` was a
+ * latent unused state from an earlier iteration. Exposing a separate "Lost (closed)" filter
+ * option therefore filtered to nothing and confused operators. We display a single "Lost"
+ * choice and intentionally map it to the canonical wire value `loose` so the filter matches
+ * what the rest of the app actually persists. (Renaming the column / migrating the data to
+ * `lost` is a deeper data-model change tracked separately.)
  */
-const FALLBACK_STATUS_OPTIONS: Array<{
+const STATUS_OPTIONS: Array<{
   value: string
   labelKey: string
   labelFallback: string
+  /** Tone selects the small ●-dot color on the pill (per Figma: green / amber / gray) */
   dotClass: string
 }> = [
   {
     value: 'open',
     labelKey: 'customers.deals.kanban.filter.status.open',
     labelFallback: 'Open',
-    // Tones mirror mapDictionaryColorToTone over the seeded dictionary colors
-    // (#2563eb → info, #22c55e → success, #ef4444 → error) so the fallback pills
-    // render identically to the dictionary-driven ones.
-    dotClass: 'bg-status-info-icon',
+    dotClass: 'bg-status-success-icon',
   },
   {
     value: 'win',
     labelKey: 'customers.deals.kanban.filter.status.won',
     labelFallback: 'Won',
-    dotClass: 'bg-status-success-icon',
+    dotClass: 'bg-status-warning-icon',
   },
   {
     value: 'loose',
     labelKey: 'customers.deals.kanban.filter.status.lost',
     labelFallback: 'Lost',
-    dotClass: 'bg-status-error-icon',
-  },
-  {
-    value: 'closed',
-    labelKey: 'customers.deals.kanban.filter.status.closed',
-    labelFallback: 'Closed',
     dotClass: 'bg-status-neutral-icon',
   },
-  {
-    value: 'in_progress',
-    labelKey: 'customers.deals.kanban.filter.status.inProgress',
-    labelFallback: 'In progress',
-    dotClass: 'bg-status-warning-icon',
-  },
 ]
 
 type StatusFilterPopoverProps = {
@@ -83,75 +58,29 @@ type StatusFilterPopoverProps = {
 
 export function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProps): React.ReactElement {
   const t = useT()
-  const scopeVersion = useOrganizationScopeVersion()
-  const { data: dictionaryData, isLoading: dictionaryLoading } = useCustomerDictionary(
-    'deal-statuses',
-    scopeVersion,
-  )
   const [open, setOpen] = React.useState(false)
-  const normalizedValues = React.useMemo(
-    () => Array.from(new Set(values.map(canonicalDealStatus))),
-    [values],
-  )
-  const [draft, setDraft] = React.useState<string[]>(normalizedValues)
+  const [draft, setDraft] = React.useState<string[]>(values)
 
   React.useEffect(() => {
-    if (open) setDraft(normalizedValues)
-  }, [open, normalizedValues])
-
-  const statusOptions = React.useMemo(() => {
-    const entries = dictionaryData?.entries
-    if (entries && entries.length > 0) {
-      const byCanonical = new Map<string, { value: string; label: string; dotClass: string }>()
-      for (const entry of entries) {
-        const canonical = canonicalDealStatus(entry.value)
-        if (byCanonical.has(canonical)) continue
-        const tone = mapDictionaryColorToTone(entry.color ?? null)
-        byCanonical.set(canonical, {
-          value: canonical,
-          label: entry.label,
-          dotClass: toneToDotClass(tone),
-        })
-      }
-      // Sort by label exactly like the List page's advanced filter
-      // (backend/customers/deals/page.tsx dictionaryOptions) so both surfaces render
-      // the same pills in the same order.
-      return Array.from(byCanonical.values()).sort((a, b) =>
-        a.label.localeCompare(b.label, undefined, { sensitivity: 'base' }),
-      )
-    }
-    return FALLBACK_STATUS_OPTIONS.map((entry) => ({
-      value: entry.value,
-      label: translateWithFallback(t, entry.labelKey, entry.labelFallback),
-      dotClass: entry.dotClass,
-    }))
-  }, [dictionaryData, t])
-
-  const labelByValue = React.useMemo(() => {
-    const map = new Map<string, string>()
-    for (const option of statusOptions) {
-      map.set(option.value, option.label)
-    }
-    for (const fallback of FALLBACK_STATUS_OPTIONS) {
-      if (!map.has(fallback.value)) {
-        map.set(fallback.value, translateWithFallback(t, fallback.labelKey, fallback.labelFallback))
-      }
-    }
-    return map
-  }, [statusOptions, t])
+    if (open) setDraft(values)
+  }, [open, values])
 
   const chipLabel = translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')
   const chipValue =
-    normalizedValues.length === 0
+    values.length === 0
       ? translateWithFallback(t, 'customers.deals.kanban.filter.all', 'All')
-      : normalizedValues
-          .map((value) => labelByValue.get(value) ?? value)
+      : values
+          .map((value) => {
+            const option = STATUS_OPTIONS.find((entry) => entry.value === value)
+            return option
+              ? translateWithFallback(t, option.labelKey, option.labelFallback)
+              : value
+          })
           .join(', ')
 
   const toggleDraft = (value: string) => {
-    const normalized = canonicalDealStatus(value)
     setDraft((prev) =>
-      prev.includes(normalized) ? prev.filter((entry) => entry !== normalized) : [...prev, normalized],
+      prev.includes(value) ? prev.filter((entry) => entry !== value) : [...prev, value],
     )
   }
 
@@ -172,7 +101,7 @@ export function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProp
   return (
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
-        <ChipButton label={chipLabel} value={chipValue} active={normalizedValues.length > 0} />
+        <ChipButton label={chipLabel} value={chipValue} active={values.length > 0} />
       </PopoverTrigger>
       <PopoverContent
         className="w-96 rounded-2xl border-border bg-transparent p-0 shadow-xl"
@@ -204,19 +133,9 @@ export function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProp
             {translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')}
           </span>
           <div className="flex flex-wrap items-center gap-x-1.5 gap-y-2">
-            {dictionaryLoading ? (
-              <span className="flex items-center gap-2 text-xs text-muted-foreground" role="status" aria-live="polite">
-                <Spinner className="size-3" />
-                {translateWithFallback(
-                  t,
-                  'customers.deals.kanban.filter.status.loading',
-                  'Loading statuses…',
-                )}
-              </span>
-            ) : (
-              statusOptions.map((option) => {
+            {STATUS_OPTIONS.map((option) => {
               const isSelected = draft.includes(option.value)
-              const label = option.label
+              const label = translateWithFallback(t, option.labelKey, option.labelFallback)
               return (
                 <Button
                   key={option.value}
@@ -241,8 +160,7 @@ export function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProp
                   ) : null}
                 </Button>
               )
-              })
-            )}
+            })}
           </div>
         </FilterPopoverShell>
       </PopoverContent>

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

@@ -125,7 +125,6 @@ type PeopleResponse = {
   total?: number
   page?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type DictionaryKindKey = CustomerDictionaryKind
@@ -207,10 +206,9 @@ export default function CustomersPeoplePage() {
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
+  const [search, setSearch] = React.useState('')
   const pathname = usePathname()
   const searchParams = useSearchParams()
-  const [search, setSearch] = React.useState(() => searchParams?.get('search')?.trim() ?? '')
   // One-shot URL hydration used as the hook's initial value. The hook is the
   // single source of truth from this point on — the page MUST NOT keep a
   // parallel `useState<AdvancedFilterTree>` (see spec "Migration & Backward
@@ -437,7 +435,6 @@ export default function CustomersPeoplePage() {
         setRows(items.map((item) => mapApiItem(item as Record<string, unknown>)).filter((row): row is PersonRow => !!row))
         setTotal(typeof payload.total === 'number' ? payload.total : items.length)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch (err) {
         if (!cancelled) {
           setCacheStatus(null)
@@ -856,8 +853,8 @@ export default function CustomersPeoplePage() {
         header: def.label || def.key,
         enableSorting: true,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,
@@ -993,7 +990,7 @@ export default function CustomersPeoplePage() {
             />
           )}
           virtualized
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage, cacheStatus, pageSizeOptions: [10, 25, 50, 100], onPageSizeChange: handlePageSizeChange }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage, cacheStatus, pageSizeOptions: [10, 25, 50, 100], onPageSizeChange: handlePageSizeChange }}
           isLoading={isLoading}
         />
         <AdvancedFilterPanel

package/src/modules/customers/backend/hooks/useEmailDuplicateCheck.ts

@@ -40,24 +40,16 @@ export function useEmailDuplicateCheck(
     }
 
     const normalized = trimmed.toLowerCase()
-    const excludedId = typeof recordId === 'string' && recordId.trim().length ? recordId.trim() : null
     let cancelled = false
     const controller = new AbortController()
     const timer = window.setTimeout(async () => {
       setChecking(true)
       try {
-        const params = [
+        const queryParam =
           matchMode === 'prefix'
             ? `emailStartsWith=${encodeURIComponent(normalized)}`
-            : `email=${encodeURIComponent(normalized)}`,
-          'pageSize=5',
-          'page=1',
-        ]
-        // The record being edited is never its own duplicate (#5534). Excluding it in the
-        // query — not only in the client-side scan below — also stops it from consuming one
-        // of the five returned slots and hiding a genuine duplicate.
-        if (excludedId) params.push(`excludeIds=${encodeURIComponent(excludedId)}`)
-        const call = await apiCall<{ items?: unknown[] }>(`/api/customers/people?${params.join('&')}`, {
+            : `email=${encodeURIComponent(normalized)}`
+        const call = await apiCall<{ items?: unknown[] }>(`/api/customers/people?${queryParam}&pageSize=5&page=1`, {
           signal: controller.signal,
         })
         if (!call.ok) {
@@ -80,7 +72,7 @@ export function useEmailDuplicateCheck(
             })
             .filter((entry: EmailDuplicateMatch | null): entry is EmailDuplicateMatch => !!entry)
             .find((entry: EmailDuplicateMatch) => {
-              if (excludedId && entry.id === excludedId) return false
+              if (entry.id === recordId) return false
               return matchMode === 'prefix'
                 ? entry.email.startsWith(normalized)
                 : entry.email === normalized

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

@@ -45,13 +45,6 @@ import type { CrudIndexerConfig, CrudEventsConfig } from '@open-mercato/shared/l
 import { E } from '#generated/entities.ids.generated'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { isMissingDealStageTransitionTable, warnMissingDealStageTransitionTable } from '../lib/dealStageTransitionTable'
-import {
-  dealClosureOutcomeFromStatus,
-  loadClosurePipelineStageSnapshot,
-  type DealClosureOutcome,
-  type PipelineStageSnapshot,
-} from '../lib/closureStage'
-import { canonicalDealStatus, isClosedDealStatus } from '../lib/dealStatus'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customers')
@@ -72,6 +65,20 @@ const dealCrudEvents: CrudEventsConfig = {
   }),
 }
 
+type PipelineStageSnapshot = {
+  id: string
+  pipelineId: string
+  label: string
+  order: number
+}
+
+type DealClosureOutcome = 'won' | 'lost'
+
+const TERMINAL_PIPELINE_STAGE_LABELS: Record<DealClosureOutcome, ReadonlySet<string>> = {
+  won: new Set(['won', 'win', 'closed won', 'closed win']),
+  lost: new Set(['lost', 'loose', 'closed lost', 'closed loose']),
+}
+
 type DealStageTransitionSnapshot = {
   id: string
   pipelineId: string
@@ -116,14 +123,54 @@ async function loadPipelineStageSnapshot(
   }
 }
 
+function normalizePipelineStageLabel(value: string): string {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+}
+
 function resolveRequestedClosureOutcome(input: DealUpdateInput): DealClosureOutcome | null {
   if (input.closureOutcome === 'won' || input.closureOutcome === 'lost') {
     return input.closureOutcome
   }
-  // `win` / `loose` are what the UI closure flows persist; `won` / `lost` are the
-  // spellings the AI stage tool persists. Both must derive the same closure outcome so
-  // every closed deal lands in the pipeline's terminal stage (#5107).
-  return dealClosureOutcomeFromStatus(input.status)
+  if (input.status === 'win') return 'won'
+  if (input.status === 'loose') return 'lost'
+  return null
+}
+
+async function loadClosurePipelineStageSnapshot(
+  em: EntityManager,
+  input: {
+    pipelineId: string | null
+    closureOutcome: DealClosureOutcome
+    tenantId: string
+    organizationId: string
+  },
+): Promise<PipelineStageSnapshot | null> {
+  if (!input.pipelineId) return null
+
+  const stages = await findWithDecryption(
+    em,
+    CustomerPipelineStage,
+    {
+      pipelineId: input.pipelineId,
+      tenantId: input.tenantId,
+      organizationId: input.organizationId,
+    },
+    { orderBy: { order: 'ASC' } },
+    { tenantId: input.tenantId, organizationId: input.organizationId },
+  )
+  const aliases = TERMINAL_PIPELINE_STAGE_LABELS[input.closureOutcome]
+  const stage = stages.find((candidate) => aliases.has(normalizePipelineStageLabel(candidate.label)))
+  if (!stage) return null
+  return {
+    id: stage.id,
+    pipelineId: stage.pipelineId,
+    label: stage.label,
+    order: stage.order,
+  }
 }
 
 async function resolvePipelineStageValue(
@@ -692,7 +739,6 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
     let nextPipelineStageLabel: string | null = null
     let resolvedCurrentPipelineStageLabel: string | null = null
     let pipelineStageAssignmentChanged = false
-    let requestedClosureOutcome: DealClosureOutcome | null = null
 
     await runCrudCommandWrite({
       ctx,
@@ -713,7 +759,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
       }),
       phases: [
         async () => {
-          requestedClosureOutcome = resolveRequestedClosureOutcome(parsed)
+          const requestedClosureOutcome = resolveRequestedClosureOutcome(parsed)
           const requestedPipelineId =
             parsed.pipelineId !== undefined ? parsed.pipelineId ?? null : record.pipelineId ?? null
           const closureStageSnapshot =
@@ -782,27 +828,6 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
           if (parsed.ownerUserId !== undefined) record.ownerUserId = parsed.ownerUserId ?? null
           if (parsed.source !== undefined) record.source = parsed.source ?? null
           if (parsed.closureOutcome !== undefined) record.closureOutcome = parsed.closureOutcome ?? null
-          // Derive the outcome only when the status spelling alone drives the closure —
-          // the same condition that triggers the terminal-stage move below — so an
-          // explicit non-terminal pipelineStageId never produces a half-closed state.
-          else if (requestedClosureOutcome && parsed.pipelineStageId === undefined) {
-            record.closureOutcome = requestedClosureOutcome
-          } else if (
-            parsed.status !== undefined &&
-            !requestedClosureOutcome &&
-            // `closed` is a seeded dictionary status: saving it is not a reopen, so only
-            // a genuinely non-closed status clears stored closure state — and only when
-            // the deal actually carries any (a no-op status echo must not wipe loss data).
-            // Canonicalize first: `dealClosureOutcomeFromStatus` above already matches
-            // case-insensitively, so matching `closed` exactly would let `Closed` through
-            // this guard and null the operator's loss notes.
-            !isClosedDealStatus(canonicalDealStatus(parsed.status)) &&
-            record.closureOutcome !== null
-          ) {
-            record.closureOutcome = null
-            if (parsed.lossReasonId === undefined) record.lossReasonId = null
-            if (parsed.lossNotes === undefined) record.lossNotes = null
-          }
           if (parsed.lossReasonId !== undefined) record.lossReasonId = parsed.lossReasonId ?? null
           if (parsed.lossNotes !== undefined) record.lossNotes = parsed.lossNotes ?? null
         },

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

@@ -114,7 +114,7 @@ type InteractionSnapshot = {
     allDay: boolean | null
     recurrenceRule: string | null
     recurrenceEnd: Date | null
-    participants: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
+    participants: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
     reminderMinutes: number | null
     visibility: string | null
     linkedEntities: Array<{ id: string; type: string; label: string }> | null