@open-mercato/core 0.6.8-develop.7072.1.19c2a8bbe0 → 0.6.8-develop.7077.1.94f1126c13

package/dist/modules/customers/backend/customers/deals/pipeline/components/StatusFilterPopover.js

@@ -10,43 +10,107 @@ 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.js";
+import { canonicalDealStatus } from "../../../../../lib/dealStatus.js";
+import { toneToDotClass } from "./toneClasses.js";
 import { ChipButton } from "./ChipButton.js";
 import { FilterPopoverShell } from "./FilterPopoverShell.js";
-const STATUS_OPTIONS = [
+const FALLBACK_STATUS_OPTIONS = [
   {
     value: "open",
     labelKey: "customers.deals.kanban.filter.status.open",
     labelFallback: "Open",
-    dotClass: "bg-status-success-icon"
+    // 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"
   },
   {
     value: "win",
     labelKey: "customers.deals.kanban.filter.status.won",
     labelFallback: "Won",
-    dotClass: "bg-status-warning-icon"
+    dotClass: "bg-status-success-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"
   }
 ];
 function StatusFilterPopover({ values, onApply }) {
   const t = useT();
+  const scopeVersion = useOrganizationScopeVersion();
+  const { data: dictionaryData, isLoading: dictionaryLoading } = useCustomerDictionary(
+    "deal-statuses",
+    scopeVersion
+  );
   const [open, setOpen] = React.useState(false);
-  const [draft, setDraft] = React.useState(values);
+  const normalizedValues = React.useMemo(
+    () => Array.from(new Set(values.map(canonicalDealStatus))),
+    [values]
+  );
+  const [draft, setDraft] = React.useState(normalizedValues);
   React.useEffect(() => {
-    if (open) setDraft(values);
-  }, [open, values]);
+    if (open) setDraft(normalizedValues);
+  }, [open, normalizedValues]);
+  const statusOptions = React.useMemo(() => {
+    const entries = dictionaryData?.entries;
+    if (entries && entries.length > 0) {
+      const byCanonical = /* @__PURE__ */ new Map();
+      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)
+        });
+      }
+      return Array.from(byCanonical.values()).sort(
+        (a, b) => a.label.localeCompare(b.label, void 0, { 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 = /* @__PURE__ */ new Map();
+    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]);
   const chipLabel = translateWithFallback(t, "customers.deals.kanban.filter.status", "Status");
-  const chipValue = values.length === 0 ? translateWithFallback(t, "customers.deals.kanban.filter.all", "All") : values.map((value) => {
-    const option = STATUS_OPTIONS.find((entry) => entry.value === value);
-    return option ? translateWithFallback(t, option.labelKey, option.labelFallback) : value;
-  }).join(", ");
+  const chipValue = normalizedValues.length === 0 ? translateWithFallback(t, "customers.deals.kanban.filter.all", "All") : normalizedValues.map((value) => labelByValue.get(value) ?? value).join(", ");
   const toggleDraft = (value) => {
+    const normalized = canonicalDealStatus(value);
     setDraft(
-      (prev) => prev.includes(value) ? prev.filter((entry) => entry !== value) : [...prev, value]
+      (prev) => prev.includes(normalized) ? prev.filter((entry) => entry !== normalized) : [...prev, normalized]
     );
   };
   const handleApply = () => {
@@ -60,7 +124,7 @@ function StatusFilterPopover({ values, onApply }) {
     }
   };
   return /* @__PURE__ */ jsxs(Popover, { open, onOpenChange: setOpen, children: [
-    /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsx(ChipButton, { label: chipLabel, value: chipValue, active: values.length > 0 }) }),
+    /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsx(ChipButton, { label: chipLabel, value: chipValue, active: normalizedValues.length > 0 }) }),
     /* @__PURE__ */ jsx(
       PopoverContent,
       {
@@ -84,9 +148,16 @@ function StatusFilterPopover({ values, onApply }) {
             ] }),
             children: [
               /* @__PURE__ */ jsx("span", { className: "text-xs font-semibold uppercase leading-normal tracking-wide text-muted-foreground", children: translateWithFallback(t, "customers.deals.kanban.filter.status", "Status") }),
-              /* @__PURE__ */ jsx("div", { className: "flex flex-wrap items-center gap-x-1.5 gap-y-2", children: STATUS_OPTIONS.map((option) => {
+              /* @__PURE__ */ jsx("div", { className: "flex flex-wrap items-center gap-x-1.5 gap-y-2", children: dictionaryLoading ? /* @__PURE__ */ jsxs("span", { className: "flex items-center gap-2 text-xs text-muted-foreground", role: "status", "aria-live": "polite", children: [
+                /* @__PURE__ */ jsx(Spinner, { className: "size-3" }),
+                translateWithFallback(
+                  t,
+                  "customers.deals.kanban.filter.status.loading",
+                  "Loading statuses\u2026"
+                )
+              ] }) : statusOptions.map((option) => {
                 const isSelected = draft.includes(option.value);
-                const label = translateWithFallback(t, option.labelKey, option.labelFallback);
+                const label = option.label;
                 return /* @__PURE__ */ jsxs(
                   Button,
                   {

package/dist/modules/customers/backend/customers/deals/pipeline/components/StatusFilterPopover.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../../src/modules/customers/backend/customers/deals/pipeline/components/StatusFilterPopover.tsx"],
-  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { X } from 'lucide-react'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport {\n  Popover,\n  PopoverContent,\n  PopoverTrigger,\n} from '@open-mercato/ui/primitives/popover'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'\nimport { ChipButton } from './ChipButton'\nimport { FilterPopoverShell } from './FilterPopoverShell'\n\n/**\n * Filter options exposed to the operator.\n *\n * The deal `status` column accepts the historical 4-value enum (`open` | `closed` | `win` |\n * `loose`), but the codebase only ever **writes** `loose` for a lost deal \u2014 `closed` was a\n * latent unused state from an earlier iteration. Exposing a separate \"Lost (closed)\" filter\n * option therefore filtered to nothing and confused operators. We display a single \"Lost\"\n * choice and intentionally map it to the canonical wire value `loose` so the filter matches\n * what the rest of the app actually persists. (Renaming the column / migrating the data to\n * `lost` is a deeper data-model change tracked separately.)\n */\nconst STATUS_OPTIONS: Array<{\n  value: string\n  labelKey: string\n  labelFallback: string\n  /** Tone selects the small \u25CF-dot color on the pill (per Figma: green / amber / gray) */\n  dotClass: string\n}> = [\n  {\n    value: 'open',\n    labelKey: 'customers.deals.kanban.filter.status.open',\n    labelFallback: 'Open',\n    dotClass: 'bg-status-success-icon',\n  },\n  {\n    value: 'win',\n    labelKey: 'customers.deals.kanban.filter.status.won',\n    labelFallback: 'Won',\n    dotClass: 'bg-status-warning-icon',\n  },\n  {\n    value: 'loose',\n    labelKey: 'customers.deals.kanban.filter.status.lost',\n    labelFallback: 'Lost',\n    dotClass: 'bg-status-neutral-icon',\n  },\n]\n\ntype StatusFilterPopoverProps = {\n  values: string[]\n  onApply: (next: string[]) => void\n}\n\nexport function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProps): React.ReactElement {\n  const t = useT()\n  const [open, setOpen] = React.useState(false)\n  const [draft, setDraft] = React.useState<string[]>(values)\n\n  React.useEffect(() => {\n    if (open) setDraft(values)\n  }, [open, values])\n\n  const chipLabel = translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')\n  const chipValue =\n    values.length === 0\n      ? translateWithFallback(t, 'customers.deals.kanban.filter.all', 'All')\n      : values\n          .map((value) => {\n            const option = STATUS_OPTIONS.find((entry) => entry.value === value)\n            return option\n              ? translateWithFallback(t, option.labelKey, option.labelFallback)\n              : value\n          })\n          .join(', ')\n\n  const toggleDraft = (value: string) => {\n    setDraft((prev) =>\n      prev.includes(value) ? prev.filter((entry) => entry !== value) : [...prev, value],\n    )\n  }\n\n  const handleApply = () => {\n    onApply(draft)\n    setOpen(false)\n  }\n\n  // Cmd/Ctrl+Enter from anywhere inside the popover confirms \u2014 parity with the dialog\n  // primary-action shortcut (`AGENTS.md` UI Interaction rules).\n  const handleKeyDown = (event: React.KeyboardEvent) => {\n    if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {\n      event.preventDefault()\n      handleApply()\n    }\n  }\n\n  return (\n    <Popover open={open} onOpenChange={setOpen}>\n      <PopoverTrigger asChild>\n        <ChipButton label={chipLabel} value={chipValue} active={values.length > 0} />\n      </PopoverTrigger>\n      <PopoverContent\n        className=\"w-96 rounded-2xl border-border bg-transparent p-0 shadow-xl\"\n        align=\"start\"\n        onKeyDown={handleKeyDown}\n      >\n        <FilterPopoverShell\n          title={\n            <>\n              <span className=\"font-bold\">\n                {translateWithFallback(t, 'customers.deals.kanban.filter.status.title.label', 'Filter : ')}\n              </span>\n              <span className=\"font-normal\">\n                {translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')}\n              </span>\n            </>\n          }\n          onClose={() => setOpen(false)}\n          onCancel={() => setOpen(false)}\n          onApply={handleApply}\n          footerLeft={\n            <span>\n              {draft.length}{' '}\n              {translateWithFallback(t, 'customers.deals.kanban.filter.selected', 'selected')}\n            </span>\n          }\n        >\n          <span className=\"text-xs font-semibold uppercase leading-normal tracking-wide text-muted-foreground\">\n            {translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')}\n          </span>\n          <div className=\"flex flex-wrap items-center gap-x-1.5 gap-y-2\">\n            {STATUS_OPTIONS.map((option) => {\n              const isSelected = draft.includes(option.value)\n              const label = translateWithFallback(t, option.labelKey, option.labelFallback)\n              return (\n                <Button\n                  key={option.value}\n                  type=\"button\"\n                  variant=\"ghost\"\n                  size=\"2xs\"\n                  onClick={() => toggleDraft(option.value)}\n                  aria-pressed={isSelected}\n                  className={`gap-1.5 rounded-full px-2.5 py-1.5 text-xs leading-normal ${\n                    isSelected\n                      ? 'bg-muted font-semibold text-foreground'\n                      : 'border border-border bg-card font-normal text-muted-foreground hover:bg-muted'\n                  }`}\n                >\n                  <span\n                    className={`inline-block size-2 shrink-0 rounded-full ${option.dotClass}`}\n                    aria-hidden=\"true\"\n                  />\n                  <span>{label}</span>\n                  {isSelected ? (\n                    <X className=\"size-2.5 shrink-0 text-muted-foreground\" aria-hidden=\"true\" />\n                  ) : null}\n                </Button>\n              )\n            })}\n          </div>\n        </FilterPopoverShell>\n      </PopoverContent>\n    </Popover>\n  )\n}\n\nexport default StatusFilterPopover\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { X } from 'lucide-react'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport {\n  Popover,\n  PopoverContent,\n  PopoverTrigger,\n} from '@open-mercato/ui/primitives/popover'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'\nimport { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'\nimport { mapDictionaryColorToTone } from '@open-mercato/shared/lib/query/advanced-filter'\nimport { Spinner } from '@open-mercato/ui/primitives/spinner'\nimport { useCustomerDictionary } from '../../../../../components/detail/hooks/useCustomerDictionary'\nimport { canonicalDealStatus } from '../../../../../lib/dealStatus'\nimport { toneToDotClass } from './toneClasses'\nimport { ChipButton } from './ChipButton'\nimport { FilterPopoverShell } from './FilterPopoverShell'\n\n/**\n * Filter options exposed to the operator.\n *\n * The deal `status` column is dictionary-driven (`deal-statuses`); the seeded dictionary\n * carries five values (`open`, `closed`, `win`, `loose`, `in_progress`) plus any\n * tenant-custom entries. We render every dictionary entry de-duplicated by canonical\n * spelling so the kanban Status pill stays aligned with the list page's advanced filter\n * (which also uses the dictionary). A hard-coded fallback keeps the popover usable while\n * the dictionary is loading or when a tenant has no entries.\n *\n * `won` / `lost` are accepted as aliases for `win` / `loose` at the API layer (see\n * `lib/dealStatus.ts:expandDealStatusAliases`, shared by the deals list route and the\n * kanban aggregate route). The UI only exposes the canonical values to avoid duplicate\n * pills, but `canonicalDealStatus` normalizes any alias passed in through `values` so\n * the chip and draft selection render the correct label.\n */\nconst FALLBACK_STATUS_OPTIONS: Array<{\n  value: string\n  labelKey: string\n  labelFallback: string\n  dotClass: string\n}> = [\n  {\n    value: 'open',\n    labelKey: 'customers.deals.kanban.filter.status.open',\n    labelFallback: 'Open',\n    // Tones mirror mapDictionaryColorToTone over the seeded dictionary colors\n    // (#2563eb \u2192 info, #22c55e \u2192 success, #ef4444 \u2192 error) so the fallback pills\n    // render identically to the dictionary-driven ones.\n    dotClass: 'bg-status-info-icon',\n  },\n  {\n    value: 'win',\n    labelKey: 'customers.deals.kanban.filter.status.won',\n    labelFallback: 'Won',\n    dotClass: 'bg-status-success-icon',\n  },\n  {\n    value: 'loose',\n    labelKey: 'customers.deals.kanban.filter.status.lost',\n    labelFallback: 'Lost',\n    dotClass: 'bg-status-error-icon',\n  },\n  {\n    value: 'closed',\n    labelKey: 'customers.deals.kanban.filter.status.closed',\n    labelFallback: 'Closed',\n    dotClass: 'bg-status-neutral-icon',\n  },\n  {\n    value: 'in_progress',\n    labelKey: 'customers.deals.kanban.filter.status.inProgress',\n    labelFallback: 'In progress',\n    dotClass: 'bg-status-warning-icon',\n  },\n]\n\ntype StatusFilterPopoverProps = {\n  values: string[]\n  onApply: (next: string[]) => void\n}\n\nexport function StatusFilterPopover({ values, onApply }: StatusFilterPopoverProps): React.ReactElement {\n  const t = useT()\n  const scopeVersion = useOrganizationScopeVersion()\n  const { data: dictionaryData, isLoading: dictionaryLoading } = useCustomerDictionary(\n    'deal-statuses',\n    scopeVersion,\n  )\n  const [open, setOpen] = React.useState(false)\n  const normalizedValues = React.useMemo(\n    () => Array.from(new Set(values.map(canonicalDealStatus))),\n    [values],\n  )\n  const [draft, setDraft] = React.useState<string[]>(normalizedValues)\n\n  React.useEffect(() => {\n    if (open) setDraft(normalizedValues)\n  }, [open, normalizedValues])\n\n  const statusOptions = React.useMemo(() => {\n    const entries = dictionaryData?.entries\n    if (entries && entries.length > 0) {\n      const byCanonical = new Map<string, { value: string; label: string; dotClass: string }>()\n      for (const entry of entries) {\n        const canonical = canonicalDealStatus(entry.value)\n        if (byCanonical.has(canonical)) continue\n        const tone = mapDictionaryColorToTone(entry.color ?? null)\n        byCanonical.set(canonical, {\n          value: canonical,\n          label: entry.label,\n          dotClass: toneToDotClass(tone),\n        })\n      }\n      // Sort by label exactly like the List page's advanced filter\n      // (backend/customers/deals/page.tsx dictionaryOptions) so both surfaces render\n      // the same pills in the same order.\n      return Array.from(byCanonical.values()).sort((a, b) =>\n        a.label.localeCompare(b.label, undefined, { sensitivity: 'base' }),\n      )\n    }\n    return FALLBACK_STATUS_OPTIONS.map((entry) => ({\n      value: entry.value,\n      label: translateWithFallback(t, entry.labelKey, entry.labelFallback),\n      dotClass: entry.dotClass,\n    }))\n  }, [dictionaryData, t])\n\n  const labelByValue = React.useMemo(() => {\n    const map = new Map<string, string>()\n    for (const option of statusOptions) {\n      map.set(option.value, option.label)\n    }\n    for (const fallback of FALLBACK_STATUS_OPTIONS) {\n      if (!map.has(fallback.value)) {\n        map.set(fallback.value, translateWithFallback(t, fallback.labelKey, fallback.labelFallback))\n      }\n    }\n    return map\n  }, [statusOptions, t])\n\n  const chipLabel = translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')\n  const chipValue =\n    normalizedValues.length === 0\n      ? translateWithFallback(t, 'customers.deals.kanban.filter.all', 'All')\n      : normalizedValues\n          .map((value) => labelByValue.get(value) ?? value)\n          .join(', ')\n\n  const toggleDraft = (value: string) => {\n    const normalized = canonicalDealStatus(value)\n    setDraft((prev) =>\n      prev.includes(normalized) ? prev.filter((entry) => entry !== normalized) : [...prev, normalized],\n    )\n  }\n\n  const handleApply = () => {\n    onApply(draft)\n    setOpen(false)\n  }\n\n  // Cmd/Ctrl+Enter from anywhere inside the popover confirms \u2014 parity with the dialog\n  // primary-action shortcut (`AGENTS.md` UI Interaction rules).\n  const handleKeyDown = (event: React.KeyboardEvent) => {\n    if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {\n      event.preventDefault()\n      handleApply()\n    }\n  }\n\n  return (\n    <Popover open={open} onOpenChange={setOpen}>\n      <PopoverTrigger asChild>\n        <ChipButton label={chipLabel} value={chipValue} active={normalizedValues.length > 0} />\n      </PopoverTrigger>\n      <PopoverContent\n        className=\"w-96 rounded-2xl border-border bg-transparent p-0 shadow-xl\"\n        align=\"start\"\n        onKeyDown={handleKeyDown}\n      >\n        <FilterPopoverShell\n          title={\n            <>\n              <span className=\"font-bold\">\n                {translateWithFallback(t, 'customers.deals.kanban.filter.status.title.label', 'Filter : ')}\n              </span>\n              <span className=\"font-normal\">\n                {translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')}\n              </span>\n            </>\n          }\n          onClose={() => setOpen(false)}\n          onCancel={() => setOpen(false)}\n          onApply={handleApply}\n          footerLeft={\n            <span>\n              {draft.length}{' '}\n              {translateWithFallback(t, 'customers.deals.kanban.filter.selected', 'selected')}\n            </span>\n          }\n        >\n          <span className=\"text-xs font-semibold uppercase leading-normal tracking-wide text-muted-foreground\">\n            {translateWithFallback(t, 'customers.deals.kanban.filter.status', 'Status')}\n          </span>\n          <div className=\"flex flex-wrap items-center gap-x-1.5 gap-y-2\">\n            {dictionaryLoading ? (\n              <span className=\"flex items-center gap-2 text-xs text-muted-foreground\" role=\"status\" aria-live=\"polite\">\n                <Spinner className=\"size-3\" />\n                {translateWithFallback(\n                  t,\n                  'customers.deals.kanban.filter.status.loading',\n                  'Loading statuses\u2026',\n                )}\n              </span>\n            ) : (\n              statusOptions.map((option) => {\n              const isSelected = draft.includes(option.value)\n              const label = option.label\n              return (\n                <Button\n                  key={option.value}\n                  type=\"button\"\n                  variant=\"ghost\"\n                  size=\"2xs\"\n                  onClick={() => toggleDraft(option.value)}\n                  aria-pressed={isSelected}\n                  className={`gap-1.5 rounded-full px-2.5 py-1.5 text-xs leading-normal ${\n                    isSelected\n                      ? 'bg-muted font-semibold text-foreground'\n                      : 'border border-border bg-card font-normal text-muted-foreground hover:bg-muted'\n                  }`}\n                >\n                  <span\n                    className={`inline-block size-2 shrink-0 rounded-full ${option.dotClass}`}\n                    aria-hidden=\"true\"\n                  />\n                  <span>{label}</span>\n                  {isSelected ? (\n                    <X className=\"size-2.5 shrink-0 text-muted-foreground\" aria-hidden=\"true\" />\n                  ) : null}\n                </Button>\n              )\n              })\n            )}\n          </div>\n        </FilterPopoverShell>\n      </PopoverContent>\n    </Popover>\n  )\n}\n\nexport default StatusFilterPopover\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/customers/backend/customers/deals/pipeline/components/toneClasses.js

@@ -0,0 +1,18 @@
+const TONE_DOT_CLASS = {
+  success: "bg-status-success-icon",
+  error: "bg-status-error-icon",
+  warning: "bg-status-warning-icon",
+  info: "bg-status-info-icon",
+  neutral: "bg-status-neutral-icon",
+  brand: "bg-brand-violet",
+  pink: "bg-status-pink-icon"
+};
+function toneToDotClass(tone, fallback = "bg-status-neutral-icon") {
+  if (tone && tone in TONE_DOT_CLASS) return TONE_DOT_CLASS[tone];
+  return fallback;
+}
+export {
+  TONE_DOT_CLASS,
+  toneToDotClass
+};
+//# sourceMappingURL=toneClasses.js.map

package/dist/modules/customers/backend/customers/deals/pipeline/components/toneClasses.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../../src/modules/customers/backend/customers/deals/pipeline/components/toneClasses.ts"],
+  "sourcesContent": ["import type { FilterOptionTone } from '@open-mercato/shared/lib/query/advanced-filter'\n\n// Saturated icon tokens shared by the kanban lane accent bar and the status filter\n// pills, so both surfaces render the same tone identically (#5107 review).\nexport const TONE_DOT_CLASS: Record<FilterOptionTone, string> = {\n  success: 'bg-status-success-icon',\n  error: 'bg-status-error-icon',\n  warning: 'bg-status-warning-icon',\n  info: 'bg-status-info-icon',\n  neutral: 'bg-status-neutral-icon',\n  brand: 'bg-brand-violet',\n  pink: 'bg-status-pink-icon',\n}\n\nexport function toneToDotClass(\n  tone: FilterOptionTone | null | undefined,\n  fallback = 'bg-status-neutral-icon',\n): string {\n  if (tone && tone in TONE_DOT_CLASS) return TONE_DOT_CLASS[tone]\n  return fallback\n}\n"],
+  "mappings": "AAIO,MAAM,iBAAmD;AAAA,EAC9D,SAAS;AAAA,EACT,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,OAAO;AAAA,EACP,MAAM;AACR;AAEO,SAAS,eACd,MACA,WAAW,0BACH;AACR,MAAI,QAAQ,QAAQ,eAAgB,QAAO,eAAe,IAAI;AAC9D,SAAO;AACT;",
+  "names": []
+}

package/dist/modules/customers/commands/deals.js

@@ -38,6 +38,11 @@ import { CrudHttpError, notFound } from "@open-mercato/shared/lib/crud/errors";
 import { E } from "../../../generated/entities.ids.generated.js";
 import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { isMissingDealStageTransitionTable, warnMissingDealStageTransitionTable } from "../lib/dealStageTransitionTable.js";
+import {
+  dealClosureOutcomeFromStatus,
+  loadClosurePipelineStageSnapshot
+} from "../lib/closureStage.js";
+import { canonicalDealStatus, isClosedDealStatus } from "../lib/dealStatus.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 const logger = createLogger("customers");
 const DEAL_ENTITY_ID = "customers:customer_deal";
@@ -54,10 +59,6 @@ const dealCrudEvents = {
     tenantId: ctx.identifiers.tenantId
   })
 };
-const TERMINAL_PIPELINE_STAGE_LABELS = {
-  won: /* @__PURE__ */ new Set(["won", "win", "closed won", "closed win"]),
-  lost: /* @__PURE__ */ new Set(["lost", "loose", "closed lost", "closed loose"])
-};
 function coerceSnapshotDate(value, fieldName) {
   if (value === void 0 || value === null) return null;
   if (value instanceof Date) return value;
@@ -84,39 +85,11 @@ async function loadPipelineStageSnapshot(em, pipelineStageId, tenantId, organiza
     order: stage.order
   };
 }
-function normalizePipelineStageLabel(value) {
-  return value.trim().toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();
-}
 function resolveRequestedClosureOutcome(input) {
   if (input.closureOutcome === "won" || input.closureOutcome === "lost") {
     return input.closureOutcome;
   }
-  if (input.status === "win") return "won";
-  if (input.status === "loose") return "lost";
-  return null;
-}
-async function loadClosurePipelineStageSnapshot(em, input) {
-  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
-  };
+  return dealClosureOutcomeFromStatus(input.status);
 }
 async function resolvePipelineStageValue(em, pipelineStageId, tenantId, organizationId) {
   const stage = await loadPipelineStageSnapshot(em, pipelineStageId, tenantId, organizationId);
@@ -582,6 +555,7 @@ const updateDealCommand = {
     let nextPipelineStageLabel = null;
     let resolvedCurrentPipelineStageLabel = null;
     let pipelineStageAssignmentChanged = false;
+    let requestedClosureOutcome = null;
     await runCrudCommandWrite({
       ctx,
       em,
@@ -601,7 +575,7 @@ const updateDealCommand = {
       }),
       phases: [
         async () => {
-          const requestedClosureOutcome = resolveRequestedClosureOutcome(parsed);
+          requestedClosureOutcome = resolveRequestedClosureOutcome(parsed);
           const requestedPipelineId = parsed.pipelineId !== void 0 ? parsed.pipelineId ?? null : record.pipelineId ?? null;
           const closureStageSnapshot = parsed.pipelineStageId === void 0 && requestedClosureOutcome ? await loadClosurePipelineStageSnapshot(em, {
             pipelineId: requestedPipelineId,
@@ -649,6 +623,19 @@ const updateDealCommand = {
           if (parsed.ownerUserId !== void 0) record.ownerUserId = parsed.ownerUserId ?? null;
           if (parsed.source !== void 0) record.source = parsed.source ?? null;
           if (parsed.closureOutcome !== void 0) record.closureOutcome = parsed.closureOutcome ?? null;
+          else if (requestedClosureOutcome && parsed.pipelineStageId === void 0) {
+            record.closureOutcome = requestedClosureOutcome;
+          } else if (parsed.status !== void 0 && !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 === void 0) record.lossReasonId = null;
+            if (parsed.lossNotes === void 0) record.lossNotes = null;
+          }
           if (parsed.lossReasonId !== void 0) record.lossReasonId = parsed.lossReasonId ?? null;
           if (parsed.lossNotes !== void 0) record.lossNotes = parsed.lossNotes ?? null;
         },