@open-mercato/core 0.6.7-develop.6863.1.61001cf9a8 → 0.6.7

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/config.ts

@@ -1,58 +1,11 @@
 import { type DateRangePreset, isValidDateRangePreset } from '@open-mercato/ui/backend/date-range'
-import type { WidgetDataRequest } from '../../../services/widgetDataService'
-
-// Deal statuses that mean the deal is closed and must stop counting as current pipeline.
-//
-// This is a denylist, not an allowlist: `customer_deals.status` is a lenient `text` column
-// fed by the per-tenant `deal_status` dictionary, so a status unknown to code counts as OPEN
-// and keeps contributing to the chart. That keeps tenant-specific stages visible and mirrors
-// `customers/lib/interactionStatus.ts`, which treats an unknown interaction status as open.
-//
-// Every vocabulary that reaches the column has to be listed here:
-//   - `win` / `loose` are written by the deal closure UI and the kanban board.
-//   - `won` / `lost` are written verbatim by the `customers.update_deal_stage` AI tool, whose
-//     free-form `toStage` is passed straight through to `status`.
-//   - `closed` is a seeded `deal_status` dictionary value, persisted by the dashboards
-//     analytics seed and treated as terminal by the demo-data generator.
-export const CLOSED_DEAL_STATUSES = ['win', 'loose', 'won', 'lost', 'closed'] as const
-
-// A deal is also closed when `closure_outcome` records the outcome, which the deals-summary
-// KPI already treats as terminal: `api/deals/summary/route.ts` counts a deal as won or lost
-// when EITHER `status` OR `closure_outcome` says so. The two columns can disagree — the CRUD
-// API accepts `closureOutcome` on its own, and the AI tool writes `status` without ever setting
-// it — so the chart has to test both signals to agree with those KPI cards (#4668).
-//
-// The `closure_outcome` side is expressed as `IS NULL` rather than as a `neq` denylist for two
-// reasons, and swapping it for `neq` would be a silent regression:
-//   - `closure_outcome` is nullable, and every OPEN deal holds NULL there. `neq` renders as
-//     `column != ?`, and in SQL `NULL != 'won'` is NULL, not true — a `neq` filter would drop
-//     every open deal and empty the chart. `status` has no such problem: it is `text not null
-//     default 'open'`, which is why the status side stays a denylist.
-//   - Unlike `status`, this column is not fed by a per-tenant dictionary. Every write path
-//     validates it against the same closed `z.enum(['won', 'lost'])` (`data/validators.ts`,
-//     `api/deals/[id]/route.ts`, `api/deals/[id]/stats/route.ts`), so a non-null value always
-//     means closed and there is no tenant-specific vocabulary to keep visible.
-export const OPEN_DEAL_CLOSURE_OUTCOME_FILTER = {
-  field: 'closureOutcome',
-  operator: 'is_null',
-} as const
-
-export const PIPELINE_STATUS_SCOPES = ['open', 'all'] as const
-
-export type PipelineStatusScope = typeof PIPELINE_STATUS_SCOPES[number]
 
 export type PipelineSummarySettings = {
   dateRange: DateRangePreset
-  statusScope: PipelineStatusScope
 }
 
 export const DEFAULT_SETTINGS: PipelineSummarySettings = {
   dateRange: 'this_month',
-  statusScope: 'open',
-}
-
-function isValidStatusScope(value: unknown): value is PipelineStatusScope {
-  return typeof value === 'string' && (PIPELINE_STATUS_SCOPES as readonly string[]).includes(value)
 }
 
 export function hydrateSettings(raw: unknown): PipelineSummarySettings {
@@ -60,44 +13,5 @@ export function hydrateSettings(raw: unknown): PipelineSummarySettings {
   const obj = raw as Record<string, unknown>
   return {
     dateRange: isValidDateRangePreset(obj.dateRange) ? obj.dateRange : DEFAULT_SETTINGS.dateRange,
-    statusScope: isValidStatusScope(obj.statusScope) ? obj.statusScope : DEFAULT_SETTINGS.statusScope,
-  }
-}
-
-export function dehydrateSettings(settings: PipelineSummarySettings): Record<string, unknown> {
-  return {
-    dateRange: settings.dateRange,
-    statusScope: settings.statusScope,
-  }
-}
-
-export function buildPipelineDataRequest(settings: PipelineSummarySettings): WidgetDataRequest {
-  const request: WidgetDataRequest = {
-    entityType: 'customers:deals',
-    metric: {
-      field: 'valueAmount',
-      aggregate: 'sum',
-    },
-    groupBy: {
-      field: 'pipelineStage',
-      resolveLabels: true,
-    },
-    dateRange: {
-      field: 'createdAt',
-      preset: settings.dateRange,
-    },
-  }
-
-  if (settings.statusScope === 'open') {
-    request.filters = [
-      ...CLOSED_DEAL_STATUSES.map((status) => ({
-        field: 'status',
-        operator: 'neq' as const,
-        value: status,
-      })),
-      { ...OPEN_DEAL_CLOSURE_OUTCOME_FILTER },
-    ]
   }
-
-  return request
 }

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/widget.client.tsx

@@ -3,30 +3,38 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { BarChart, type BarChartDataItem } from '@open-mercato/ui/backend/charts'
 import {
   DateRangeSelect,
   InlineDateRangeSelect,
   type DateRangePreset,
 } from '@open-mercato/ui/backend/date-range'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@open-mercato/ui/primitives/select'
-import {
-  DEFAULT_SETTINGS,
-  buildPipelineDataRequest,
-  hydrateSettings,
-  type PipelineStatusScope,
-  type PipelineSummarySettings,
-} from './config'
+import { DEFAULT_SETTINGS, hydrateSettings, type PipelineSummarySettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrencyCompact } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'pipeline-summary' })
 
 async function fetchPipelineData(settings: PipelineSummarySettings, fetchWidgetData: WidgetDataFetcher): Promise<WidgetDataResponse> {
-  return fetchWidgetData<WidgetDataResponse>(buildPipelineDataRequest(settings))
+  const body = {
+    entityType: 'customers:deals',
+    metric: {
+      field: 'valueAmount',
+      aggregate: 'sum',
+    },
+    groupBy: {
+      field: 'pipelineStage',
+      resolveLabels: true,
+    },
+    dateRange: {
+      field: 'createdAt',
+      preset: settings.dateRange,
+    },
+  }
+
+  return fetchWidgetData<WidgetDataResponse>(body)
 }
 
 function formatStageLabel(stage: unknown, t: (key: string, fallback: string) => string): string {
@@ -48,13 +56,10 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
   onRefreshStateChange,
 }) => {
   const t = useT()
-  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<BarChartDataItem[]>([])
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -70,7 +75,6 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
           Value: item.value ?? 0,
         }))
       setData(chartData)
-      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load pipeline data', { err })
       setError(t('dashboards.analytics.widgets.pipelineSummary.error', 'Failed to load data'))
@@ -93,30 +97,6 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
           value={hydrated.dateRange}
           onChange={(dateRange: DateRangePreset) => onSettingsChange({ ...hydrated, dateRange })}
         />
-        <div className="space-y-1.5">
-          <label
-            htmlFor="pipeline-summary-status-scope"
-            className="text-xs font-semibold uppercase text-muted-foreground"
-          >
-            {t('dashboards.analytics.settings.dealStatusScope', 'Deals included')}
-          </label>
-          <Select
-            value={hydrated.statusScope}
-            onValueChange={(value) => onSettingsChange({ ...hydrated, statusScope: value as PipelineStatusScope })}
-          >
-            <SelectTrigger id="pipeline-summary-status-scope" size="sm">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="open">
-                {t('dashboards.analytics.settings.dealStatusScopeOpen', 'Open deals only')}
-              </SelectItem>
-              <SelectItem value="all">
-                {t('dashboards.analytics.settings.dealStatusScopeAll', 'All deals, including won and lost')}
-              </SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
       </div>
     )
   }
@@ -137,13 +117,12 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
           categoryLabels={{ Value: t('dashboards.analytics.labels.value', 'Value') }}
           loading={loading}
           error={error}
-          valueFormatter={money.formatCompact}
+          valueFormatter={formatCurrencyCompact}
           colors={['violet']}
           showLegend={false}
           emptyMessage={t('dashboards.analytics.widgets.pipelineSummary.empty', 'No deal data for this period')}
         />
       </div>
-      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
     </div>
   )
 }

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/widget.ts

@@ -1,5 +1,5 @@
 import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import { DEFAULT_SETTINGS, dehydrateSettings, hydrateSettings, type PipelineSummarySettings } from './config'
+import { DEFAULT_SETTINGS, hydrateSettings, type PipelineSummarySettings } from './config'
 const PipelineSummaryWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<PipelineSummarySettings> = {
@@ -18,7 +18,7 @@ const widget: DashboardWidgetModule<PipelineSummarySettings> = {
   },
   Widget: PipelineSummaryWidget,
   hydrateSettings,
-  dehydrateSettings,
+  dehydrateSettings: (s) => ({ dateRange: s.dateRange }),
 }
 
 export default widget

package/src/modules/dashboards/widgets/dashboard/revenue-kpi/widget.client.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { KpiCard, type KpiTrend } from '@open-mercato/ui/backend/charts'
 import {
   DateRangeSelect,
@@ -13,8 +13,7 @@ import {
 } from '@open-mercato/ui/backend/date-range'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueKpiSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrency } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'revenue-kpi' })
@@ -44,14 +43,11 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
   onRefreshStateChange,
 }) => {
   const t = useT()
-  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [value, setValue] = React.useState<number | null>(null)
   const [trend, setTrend] = React.useState<KpiTrend | undefined>(undefined)
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -61,7 +57,6 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
     try {
       const data = await fetchRevenueData(hydrated, fetchWidgetData)
       setValue(data.value)
-      setCurrency(data.metadata?.currency ?? null)
       if (data.comparison) {
         setTrend({
           value: data.comparison.change,
@@ -119,8 +114,7 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
       comparisonLabel={comparisonLabel}
       loading={loading}
       error={error}
-      formatValue={money.format}
-      footer={<UnlabelledAmountNotice currency={currency} loading={loading} error={error} />}
+      formatValue={formatCurrency}
       headerAction={
         <InlineDateRangeSelect
           value={hydrated.dateRange}

package/src/modules/dashboards/widgets/dashboard/revenue-trend/widget.client.tsx

@@ -20,8 +20,7 @@ import {
 import type { DateGranularity } from '@open-mercato/shared/modules/analytics'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueTrendSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrencyCompact } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'revenue-trend' })
@@ -115,10 +114,8 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
   const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<LineChartDataItem[]>([])
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -137,7 +134,6 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
         Revenue: item.value ?? 0,
       }))
       setData(chartData)
-      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load revenue trend data', { err })
       setError(t('dashboards.analytics.widgets.revenueTrend.error', 'Failed to load data'))
@@ -216,11 +212,10 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
         loading={loading}
         error={error}
         showArea={hydrated.showArea}
-        valueFormatter={money.formatCompact}
+        valueFormatter={formatCurrencyCompact}
         colors={['blue']}
         emptyMessage={t('dashboards.analytics.widgets.revenueTrend.empty', 'No revenue data for this period')}
       />
-      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
     </div>
   )
 }

package/src/modules/dashboards/widgets/dashboard/sales-by-region/widget.client.tsx

@@ -3,14 +3,13 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { BarChart, type BarChartDataItem } from '@open-mercato/ui/backend/charts'
 import { DateRangeSelect, type DateRangePreset } from '@open-mercato/ui/backend/date-range'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { DEFAULT_SETTINGS, hydrateSettings, type SalesByRegionSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrencyCompact } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'sales-by-region' })
@@ -43,13 +42,10 @@ const SalesByRegionWidget: React.FC<DashboardWidgetComponentProps<SalesByRegionS
   onRefreshStateChange,
 }) => {
   const t = useT()
-  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<BarChartDataItem[]>([])
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -63,7 +59,6 @@ const SalesByRegionWidget: React.FC<DashboardWidgetComponentProps<SalesByRegionS
         Revenue: item.value ?? 0,
       }))
       setData(chartData)
-      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load sales by region data', { err })
       setError(t('dashboards.analytics.widgets.salesByRegion.error', 'Failed to load data'))
@@ -111,24 +106,19 @@ const SalesByRegionWidget: React.FC<DashboardWidgetComponentProps<SalesByRegionS
   }
 
   return (
-    <div className="flex flex-col h-full">
-      <div className="flex-1 min-h-0">
-        <BarChart
-          data={data}
-          index="region"
-          categories={['Revenue']}
-          categoryLabels={{ Revenue: t('dashboards.analytics.widgets.topCustomers.column.revenue', 'Revenue') }}
-          loading={loading}
-          error={error}
-          layout="horizontal"
-          valueFormatter={money.formatCompact}
-          colors={['cyan']}
-          showLegend={false}
-          emptyMessage={t('dashboards.analytics.widgets.salesByRegion.empty', 'No regional sales data for this period')}
-        />
-      </div>
-      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
-    </div>
+    <BarChart
+      data={data}
+      index="region"
+      categories={['Revenue']}
+      categoryLabels={{ Revenue: t('dashboards.analytics.widgets.topCustomers.column.revenue', 'Revenue') }}
+      loading={loading}
+      error={error}
+      layout="horizontal"
+      valueFormatter={formatCurrencyCompact}
+      colors={['cyan']}
+      showLegend={false}
+      emptyMessage={t('dashboards.analytics.widgets.salesByRegion.empty', 'No regional sales data for this period')}
+    />
   )
 }
 

package/src/modules/dashboards/widgets/dashboard/top-customers/widget.client.tsx

@@ -3,14 +3,13 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { TopNTable, type TopNTableColumn } from '@open-mercato/ui/backend/charts'
 import { DateRangeSelect, type DateRangePreset } from '@open-mercato/ui/backend/date-range'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopCustomersSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrencySafe } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'top-customers' })
@@ -55,13 +54,10 @@ const TopCustomersWidget: React.FC<DashboardWidgetComponentProps<TopCustomersSet
   onRefreshStateChange,
 }) => {
   const t = useT()
-  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<CustomerRow[]>([])
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const unknownLabel = t('dashboards.analytics.labels.unknown', 'Unknown')
   const columns: TopNTableColumn<CustomerRow>[] = React.useMemo(
@@ -80,10 +76,10 @@ const TopCustomersWidget: React.FC<DashboardWidgetComponentProps<TopCustomersSet
         key: 'revenue',
         header: t('dashboards.analytics.widgets.topCustomers.column.revenue', 'Revenue'),
         align: 'right',
-        formatter: (value: unknown) => money.formatSafe(value),
+        formatter: (value: unknown) => formatCurrencySafe(value),
       },
     ],
-    [t, unknownLabel, money],
+    [t, unknownLabel],
   )
 
   const fetchWidgetData = useWidgetData()
@@ -99,7 +95,6 @@ const TopCustomersWidget: React.FC<DashboardWidgetComponentProps<TopCustomersSet
         revenue: item.value ?? 0,
       }))
       setData(tableData)
-      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load top customers data', { err })
       setError(t('dashboards.analytics.widgets.topCustomers.error', 'Failed to load data'))
@@ -147,18 +142,13 @@ const TopCustomersWidget: React.FC<DashboardWidgetComponentProps<TopCustomersSet
   }
 
   return (
-    <div className="flex flex-col h-full">
-      <div className="flex-1 min-h-0">
-        <TopNTable
-          data={data}
-          columns={columns}
-          loading={loading}
-          error={error}
-          emptyMessage={t('dashboards.analytics.widgets.topCustomers.empty', 'No customer data for this period')}
-        />
-      </div>
-      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
-    </div>
+    <TopNTable
+      data={data}
+      columns={columns}
+      loading={loading}
+      error={error}
+      emptyMessage={t('dashboards.analytics.widgets.topCustomers.empty', 'No customer data for this period')}
+    />
   )
 }
 

package/src/modules/dashboards/widgets/dashboard/top-products/widget.client.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { BarChart, type BarChartDataItem } from '@open-mercato/ui/backend/charts'
 import { DateRangeSelect, InlineDateRangeSelect, type DateRangePreset } from '@open-mercato/ui/backend/date-range'
 import { Input } from '@open-mercato/ui/primitives/input'
@@ -16,8 +16,7 @@ import {
 } from '@open-mercato/ui/primitives/select'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopProductsSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { createCurrencyFormatters } from '../../../lib/formatters'
-import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
+import { formatCurrencyCompact } from '../../../lib/formatters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'top-products' })
@@ -69,14 +68,11 @@ const TopProductsWidget: React.FC<DashboardWidgetComponentProps<TopProductsSetti
   onRefreshStateChange,
 }) => {
   const t = useT()
-  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<BarChartDataItem[]>([])
-  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const fetchingRef = React.useRef(false)
-  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -92,7 +88,6 @@ const TopProductsWidget: React.FC<DashboardWidgetComponentProps<TopProductsSetti
         Revenue: item.value ?? 0,
       }))
       setData(chartData)
-      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load top products data', { err })
       setError(t('dashboards.analytics.widgets.topProducts.error', 'Failed to load data'))
@@ -177,13 +172,12 @@ const TopProductsWidget: React.FC<DashboardWidgetComponentProps<TopProductsSetti
           loading={loading}
           error={error}
           layout={hydrated.layout}
-          valueFormatter={money.formatCompact}
+          valueFormatter={formatCurrencyCompact}
           colors={['emerald']}
           showLegend={false}
           emptyMessage={t('dashboards.analytics.widgets.topProducts.empty', 'No product sales data for this period')}
         />
       </div>
-      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
     </div>
   )
 }

package/src/modules/data_sync/AGENTS.md

@@ -9,7 +9,6 @@ The `data_sync` module provides a streaming data synchronization hub for import/
 ## Always
 
 - **Always scope by organizationId + tenantId** — every entity query
-- **Resolve the organization in API routes with `resolveActiveOrganizationId(auth)`** from `@open-mercato/shared/lib/auth/organizationScope`, never with raw `auth.orgId` — a super-admin viewing "all organizations" has `auth.orgId === null`. The fallback is tenant-aware: it never pairs the actor organization with a foreign selected tenant. When it returns `null` for an authenticated caller, answer with `organizationScopeRequiredResponse()` (400) — never 401, which sends `apiFetch` into a session-refresh loop
 - **Use the queue system** — never run syncs inline in API handlers
 - **New sync providers MUST support provider-owned env preconfiguration** when fresh installs need credentials or default mappings/locales/channels from deployment env
 - **Persist cursor after each batch** — enables resume on failure

package/src/modules/data_sync/api/mappings/[id]/route.ts

@@ -1,7 +1,6 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
-import { organizationScopeRequiredResponse, resolveActiveOrganizationId } from '@open-mercato/shared/lib/auth/organizationScope'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -37,13 +36,9 @@ async function resolveParams(ctx: { params?: Promise<{ id?: string }> | { id?: s
 
 export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }> | { id?: string } }) {
   const auth = await getAuthFromRequest(req)
-  if (!auth?.tenantId) {
+  if (!auth?.tenantId || !auth.orgId) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
-  const organizationId = resolveActiveOrganizationId(auth)
-  if (!organizationId) {
-    return organizationScopeRequiredResponse()
-  }
 
   const parsedParams = await resolveParams(ctx)
   if (!parsedParams.success) {
@@ -52,14 +47,14 @@ export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }>
 
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
-  const scope = { organizationId, tenantId: auth.tenantId }
+  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId }
 
   const mapping = await findOneWithDecryption(
     em,
     SyncMapping,
     {
       id: parsedParams.data.id,
-      organizationId,
+      organizationId: auth.orgId as string,
       tenantId: auth.tenantId,
     },
     undefined,
@@ -82,13 +77,9 @@ export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }>
 
 export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }> | { id?: string } }) {
   const auth = await getAuthFromRequest(req)
-  if (!auth?.tenantId) {
+  if (!auth?.tenantId || !auth.orgId) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
-  const organizationId = resolveActiveOrganizationId(auth)
-  if (!organizationId) {
-    return organizationScopeRequiredResponse()
-  }
 
   const parsedParams = await resolveParams(ctx)
   if (!parsedParams.success) {
@@ -103,14 +94,14 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
 
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
-  const scope = { organizationId, tenantId: auth.tenantId }
+  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId }
 
   const mapping = await findOneWithDecryption(
     em,
     SyncMapping,
     {
       id: parsedParams.data.id,
-      organizationId,
+      organizationId: auth.orgId as string,
       tenantId: auth.tenantId,
     },
     undefined,
@@ -164,13 +155,9 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
 
 export async function DELETE(req: Request, ctx: { params?: Promise<{ id?: string }> | { id?: string } }) {
   const auth = await getAuthFromRequest(req)
-  if (!auth?.tenantId) {
+  if (!auth?.tenantId || !auth.orgId) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
-  const organizationId = resolveActiveOrganizationId(auth)
-  if (!organizationId) {
-    return organizationScopeRequiredResponse()
-  }
 
   const parsedParams = await resolveParams(ctx)
   if (!parsedParams.success) {
@@ -179,14 +166,14 @@ export async function DELETE(req: Request, ctx: { params?: Promise<{ id?: string
 
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
-  const scope = { organizationId, tenantId: auth.tenantId }
+  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId }
 
   const mapping = await findOneWithDecryption(
     em,
     SyncMapping,
     {
       id: parsedParams.data.id,
-      organizationId,
+      organizationId: auth.orgId as string,
       tenantId: auth.tenantId,
     },
     undefined,