@open-mercato/core 0.6.6-develop.6317.1.b3be10ab84 → 0.6.6-develop.6330.1.a261878aa8

package/src/modules/entities/api/records.ts

@@ -107,6 +107,8 @@ const listRecordsQuerySchema = z
     pageSize: z.coerce.number().int().min(1).max(100).optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
+    search: z.string().optional(),
+    searchFields: z.string().optional(),
     withDeleted: z.coerce.boolean().optional(),
     format: z.enum(['csv', 'json', 'xml', 'markdown']).optional(),
     exportScope: z.enum(['full']).optional(),
@@ -145,10 +147,15 @@ export async function GET(req: Request) {
   const sortField = url.searchParams.get('sortField') || 'id'
   const sortDir = (url.searchParams.get('sortDir') || 'asc').toLowerCase() === 'desc' ? 'desc' : 'asc'
   const withDeleted = parseBooleanWithDefault(url.searchParams.get('withDeleted'), false)
+  const searchTerm = (url.searchParams.get('search') || '').trim()
+  const searchFields = (url.searchParams.get('searchFields') || '')
+    .split(',')
+    .map((field) => field.trim())
+    .filter(Boolean)
 
   const qpEntries: Array<[string, string]> = []
   for (const [key, val] of url.searchParams.entries()) {
-    if (['entityId','page','pageSize','sortField','sortDir','withDeleted','format','exportScope','export_scope','all','full'].includes(key)) continue
+    if (['entityId','page','pageSize','sortField','sortDir','withDeleted','format','exportScope','export_scope','all','full','search','searchFields'].includes(key)) continue
     qpEntries.push([key, val])
   }
 
@@ -246,6 +253,15 @@ export async function GET(req: Request) {
     // even before the first record exists.
     if (isCustomEntity) qopts.forceCustomEntityStorage = true
     for (const [k, v] of qpEntries) buildFilter(k, v, isCustomEntity)
+    // Server-side full-result search: match the term against the requested fields
+    // (defaults to `id`) before pagination so totals/exports stay consistent with
+    // the active search instead of filtering only the current client page (#3229).
+    if (searchTerm) {
+      const fields = searchFields.length ? searchFields : ['id']
+      const pattern = `%${searchTerm}%`
+      const orClauses = fields.map((field) => ({ [field]: { $ilike: pattern } }))
+      ;(filtersObj as any).$or = orClauses
+    }
     const res = await qe.query(entityId as any, qopts)
     const rawItems = res.items || []
     const viewPageItems = rawItems.map(mapRow)

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -97,7 +97,16 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
     keyExtras: [scopeVersion],
   })
 
-  // Fetch records whenever paging/sorting/filters change (do NOT refetch on cfDefs/search changes)
+  // Fields searched server-side: every visible column plus the base `id`.
+  const searchableFields = React.useMemo(() => {
+    const fields = (columns || [])
+      .map((col) => (col as any).accessorKey)
+      .filter((key): key is string => typeof key === 'string' && key.length > 0)
+    return Array.from(new Set(['id', ...fields]))
+  }, [columns])
+
+  // Fetch records whenever paging/sorting/filters/search change. Search is applied
+  // server-side (before pagination) so totals and exports stay consistent (#3229).
   React.useEffect(() => {
     let cancelled = false
     const run = async () => {
@@ -107,6 +116,11 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
         params.set('entityId', entityId)
         params.set('page', String(page))
         params.set('pageSize', String(pageSize))
+        const trimmedSearch = search.trim()
+        if (trimmedSearch) {
+          params.set('search', trimmedSearch)
+          if (searchableFields.length) params.set('searchFields', searchableFields.join(','))
+        }
         const s = sorting?.[0]
         if (s?.id) {
           params.set('sortField', String(s.id))
@@ -154,7 +168,7 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
     }
     if (entityId) run()
     return () => { cancelled = true }
-  }, [entityId, page, pageSize, sorting, filterValues, scopeVersion])
+  }, [entityId, page, pageSize, sorting, filterValues, scopeVersion, search, searchableFields])
 
   // Build columns from custom field definitions only (no data round-trip)
   React.useEffect(() => {
@@ -175,15 +189,9 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
     setColumns(cols)
   }, [cfDefs])
 
-  // Client-side quick search filtering without triggering server refetch
-  const data = React.useMemo(() => {
-    if (!search.trim()) return rawData
-    const q = search.trim().toLowerCase()
-    return (rawData || []).filter((row: any) => {
-      const values = Object.values(row || {})
-      return values.some((v) => normalizeCell(v).toLowerCase().includes(q))
-    })
-  }, [rawData, search])
+  // Search is server-side (see fetch effect); render the fetched page as-is so
+  // pagination totals and exports stay consistent with the active search (#3229).
+  const data = rawData
 
   const viewExportColumns = React.useMemo(() => {
     return (columns || [])
@@ -213,8 +221,13 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
       qp.set('sortField', String(sort.id))
       qp.set('sortDir', sort.desc ? 'desc' : 'asc')
     }
+    const trimmedSearch = search.trim()
+    if (trimmedSearch) {
+      qp.set('search', trimmedSearch)
+      if (searchableFields.length) qp.set('searchFields', searchableFields.join(','))
+    }
     return `/api/entities/records?${qp.toString()}`
-  }, [entityId, sorting])
+  }, [entityId, sorting, search, searchableFields])
 
   const exportConfig = React.useMemo(() => {
     const safeEntityId = entityId.replace(/[^a-z0-9_-]/gi, '_') || 'records'

package/src/modules/messages/api/unread-count/route.ts

@@ -1,5 +1,11 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely, sql } from 'kysely'
+import { runWithCacheTenant } from '@open-mercato/cache'
+import {
+  buildCollectionTags,
+  isCrudCacheEnabled,
+  resolveCrudCache,
+} from '@open-mercato/shared/lib/crud/cache'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { resolveMessageContext } from '../../lib/routeHelpers'
 import { unreadCountResponseSchema } from '../openapi'
@@ -8,6 +14,16 @@ export const metadata = {
   GET: { requireAuth: true },
 }
 
+const UNREAD_COUNT_RESOURCE = 'messages.message'
+const UNREAD_COUNT_TTL_MS = 10_000
+
+function buildUnreadCountCacheKey(params: {
+  userId: string
+  orgId: string | null
+}): string {
+  return `messages:unread-count:u=${params.userId}:org=${params.orgId ?? 'null'}`
+}
+
 function getDb(em: EntityManager): Kysely<any> {
   return em.getKysely<any>()
 }
@@ -17,6 +33,19 @@ export async function GET(req: Request) {
   const em = ctx.container.resolve('em') as EntityManager
   const db = getDb(em) as any
 
+  const orgId = scope.organizationId ?? null
+  const cache = isCrudCacheEnabled() ? resolveCrudCache(ctx.container) : null
+  const cacheKey = cache
+    ? buildUnreadCountCacheKey({ userId: scope.userId, orgId })
+    : null
+
+  if (cache && cacheKey) {
+    const cached = await runWithCacheTenant(scope.tenantId, () => cache.get(cacheKey))
+    if (typeof cached === 'number') {
+      return Response.json({ unreadCount: cached })
+    }
+  }
+
   let query = db
     .selectFrom('message_recipients as r')
     .innerJoin('messages as m', 'm.id', 'r.message_id')
@@ -38,6 +67,17 @@ export async function GET(req: Request) {
     .executeTakeFirst() as { count: string | number } | undefined
   const count = Number(row?.count ?? 0)
 
+  if (cache && cacheKey) {
+    try {
+      await runWithCacheTenant(scope.tenantId, () =>
+        cache.set(cacheKey, count, {
+          ttl: UNREAD_COUNT_TTL_MS,
+          tags: buildCollectionTags(UNREAD_COUNT_RESOURCE, scope.tenantId, [orgId]),
+        }),
+      )
+    } catch {}
+  }
+
   return Response.json({ unreadCount: count })
 }
 

package/src/modules/query_index/components/QueryIndexesTable.tsx

@@ -11,6 +11,7 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
+import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitives/status-badge'
 
 const MUTATION_CONTEXT_ID = 'query_index.status.list:actions'
 
@@ -127,7 +128,7 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         if (!record.vectorEnabled) return <span>—</span>
         const ok = record.vectorCount != null && record.baseCount != null && record.vectorCount === record.baseCount
         const display = formatCount(record.vectorCount)
-        const className = ok ? 'text-green-600' : 'text-orange-600'
+        const className = ok ? 'text-status-success-text' : 'text-status-warning-text'
         return <span className={className}>{display}</span>
       },
       meta: { priority: 2 },
@@ -141,7 +142,7 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         if (!record.fulltextEnabled) return <span>—</span>
         const ok = record.fulltextCount != null && record.baseCount != null && record.fulltextCount === record.baseCount
         const display = formatCount(record.fulltextCount)
-        const className = ok ? 'text-green-600' : 'text-orange-600'
+        const className = ok ? 'text-status-success-text' : 'text-status-warning-text'
         return <span className={className}>{display}</span>
       },
       meta: { priority: 2 },
@@ -159,17 +160,14 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         const label = jobProgress
           ? t('query_index.table.status.withProgress', { status: statusText, progress: jobProgress })
           : statusText
-        const className = job
-          ? job.status === 'stalled'
-            ? 'text-red-600'
-            : job.status === 'reindexing' || job.status === 'purging'
-              ? 'text-orange-600'
-              : ok
-                ? 'text-green-600'
-                : 'text-muted-foreground'
-          : ok
-            ? 'text-green-600'
-            : 'text-muted-foreground'
+        let variant: StatusBadgeVariant = 'neutral'
+        if (job) {
+          if (job.status === 'stalled') variant = 'error'
+          else if (job.status === 'reindexing' || job.status === 'purging') variant = 'warning'
+          else variant = ok ? 'success' : 'neutral'
+        } else {
+          variant = ok ? 'success' : 'neutral'
+        }
 
         const lines: string[] = []
 
@@ -203,8 +201,12 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         }
 
         return (
-          <div className="space-y-1">
-            <span className={className}>{label}</span>
+          <div className="space-y-1.5">
+            <div>
+              <StatusBadge variant={variant} dot>
+                {label}
+              </StatusBadge>
+            </div>
             {lines.length > 0 && (
               <div className="text-xs text-muted-foreground">
                 {lines.map((line, idx) => (

package/src/modules/shipping_carriers/i18n/de.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Nach",
   "shipping_carriers.create.title": "Sendung beim Transporteur erstellen",
   "shipping_carriers.feature.manage": "Versanddienstleister-Vorgaenge verwalten",
-  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen"
+  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen",
+  "shipping_carriers.status.cancelled": "Storniert",
+  "shipping_carriers.status.delivered": "Zugestellt",
+  "shipping_carriers.status.failed_delivery": "Zustellung fehlgeschlagen",
+  "shipping_carriers.status.in_transit": "Unterwegs",
+  "shipping_carriers.status.label_created": "Label erstellt",
+  "shipping_carriers.status.out_for_delivery": "In Zustellung",
+  "shipping_carriers.status.pending": "Ausstehend",
+  "shipping_carriers.status.picked_up": "Abgeholt",
+  "shipping_carriers.status.returned": "Zuruckgesendet",
+  "shipping_carriers.status.unknown": "Unbekannt"
 }

package/src/modules/shipping_carriers/i18n/en.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "To",
   "shipping_carriers.create.title": "Create carrier shipment",
   "shipping_carriers.feature.manage": "Manage shipping carrier operations",
-  "shipping_carriers.feature.view": "View shipping carrier shipments"
+  "shipping_carriers.feature.view": "View shipping carrier shipments",
+  "shipping_carriers.status.cancelled": "Cancelled",
+  "shipping_carriers.status.delivered": "Delivered",
+  "shipping_carriers.status.failed_delivery": "Delivery failed",
+  "shipping_carriers.status.in_transit": "In transit",
+  "shipping_carriers.status.label_created": "Label created",
+  "shipping_carriers.status.out_for_delivery": "Out for delivery",
+  "shipping_carriers.status.pending": "Pending",
+  "shipping_carriers.status.picked_up": "Picked up",
+  "shipping_carriers.status.returned": "Returned",
+  "shipping_carriers.status.unknown": "Unknown"
 }

package/src/modules/shipping_carriers/i18n/en.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Tracking status',
   'shipping_carriers.column.shippingStatus': 'Shipping status',
   'shipping_carriers.action.createShipment': 'Create shipment',
+  'shipping_carriers.status.cancelled': 'Cancelled',
+  'shipping_carriers.status.delivered': 'Delivered',
+  'shipping_carriers.status.failed_delivery': 'Delivery failed',
+  'shipping_carriers.status.in_transit': 'In transit',
+  'shipping_carriers.status.label_created': 'Label created',
+  'shipping_carriers.status.out_for_delivery': 'Out for delivery',
+  'shipping_carriers.status.pending': 'Pending',
+  'shipping_carriers.status.picked_up': 'Picked up',
+  'shipping_carriers.status.returned': 'Returned',
+  'shipping_carriers.status.unknown': 'Unknown',
 }

package/src/modules/shipping_carriers/i18n/es.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Hasta",
   "shipping_carriers.create.title": "Crear envio con transportista",
   "shipping_carriers.feature.manage": "Gestionar operaciones de transportistas",
-  "shipping_carriers.feature.view": "Ver envios de transportistas"
+  "shipping_carriers.feature.view": "Ver envios de transportistas",
+  "shipping_carriers.status.cancelled": "Cancelado",
+  "shipping_carriers.status.delivered": "Entregado",
+  "shipping_carriers.status.failed_delivery": "Entrega fallida",
+  "shipping_carriers.status.in_transit": "En transito",
+  "shipping_carriers.status.label_created": "Etiqueta creada",
+  "shipping_carriers.status.out_for_delivery": "En reparto",
+  "shipping_carriers.status.pending": "Pendiente",
+  "shipping_carriers.status.picked_up": "Recogido",
+  "shipping_carriers.status.returned": "Devuelto",
+  "shipping_carriers.status.unknown": "Desconocido"
 }

package/src/modules/shipping_carriers/i18n/pl.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Odbiór",
   "shipping_carriers.create.title": "Utwórz przesyłkę u przewoźnika",
   "shipping_carriers.feature.manage": "Zarzadzanie operacjami przewoznikow",
-  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow"
+  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow",
+  "shipping_carriers.status.cancelled": "Anulowano",
+  "shipping_carriers.status.delivered": "Doreczono",
+  "shipping_carriers.status.failed_delivery": "Doreczenie nieudane",
+  "shipping_carriers.status.in_transit": "W transporcie",
+  "shipping_carriers.status.label_created": "Etykieta utworzona",
+  "shipping_carriers.status.out_for_delivery": "W doreczeniu",
+  "shipping_carriers.status.pending": "Oczekuje",
+  "shipping_carriers.status.picked_up": "Odebrano",
+  "shipping_carriers.status.returned": "Zwrocono",
+  "shipping_carriers.status.unknown": "Nieznany"
 }

package/src/modules/shipping_carriers/i18n/pl.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Status śledzenia',
   'shipping_carriers.column.shippingStatus': 'Status wysyłki',
   'shipping_carriers.action.createShipment': 'Utwórz przesyłkę',
+  'shipping_carriers.status.cancelled': 'Anulowano',
+  'shipping_carriers.status.delivered': 'Doręczono',
+  'shipping_carriers.status.failed_delivery': 'Doręczenie nieudane',
+  'shipping_carriers.status.in_transit': 'W transporcie',
+  'shipping_carriers.status.label_created': 'Etykieta utworzona',
+  'shipping_carriers.status.out_for_delivery': 'W doręczeniu',
+  'shipping_carriers.status.pending': 'Oczekuje',
+  'shipping_carriers.status.picked_up': 'Odebrano',
+  'shipping_carriers.status.returned': 'Zwrócono',
+  'shipping_carriers.status.unknown': 'Nieznany',
 }

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.client.tsx

@@ -0,0 +1,35 @@
+'use client'
+
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { StatusBadge, type StatusMap } from '@open-mercato/ui/primitives/status-badge'
+import type { UnifiedShipmentStatus } from '../../../lib/adapter'
+
+type ShippingStatus = UnifiedShipmentStatus | 'pending'
+
+const shippingStatusVariantMap: StatusMap<ShippingStatus> = {
+  pending: 'neutral',
+  label_created: 'info',
+  picked_up: 'info',
+  in_transit: 'info',
+  out_for_delivery: 'info',
+  delivered: 'success',
+  failed_delivery: 'error',
+  returned: 'warning',
+  cancelled: 'error',
+  unknown: 'neutral',
+}
+
+export type ShippingStatusBadgeWidgetProps = {
+  status: string
+}
+
+export default function ShippingStatusBadgeWidget({ status }: ShippingStatusBadgeWidgetProps) {
+  const t = useT()
+  const variant = shippingStatusVariantMap[status as ShippingStatus] ?? 'neutral'
+
+  return (
+    <StatusBadge variant={variant} dot>
+      {t(`shipping_carriers.status.${status}`, status)}
+    </StatusBadge>
+  )
+}

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.tsx

@@ -1,20 +1,6 @@
+import * as React from 'react'
 import type { InjectionColumnWidget } from '@open-mercato/shared/modules/widgets/injection'
-
-const SHIPPING_STATUS_COLORS: Record<string, string> = {
-  pending: 'bg-gray-100 text-gray-700',
-  label_created: 'bg-slate-100 text-slate-700',
-  picked_up: 'bg-sky-100 text-sky-700',
-  in_transit: 'bg-blue-100 text-blue-700',
-  out_for_delivery: 'bg-indigo-100 text-indigo-700',
-  delivered: 'bg-green-100 text-green-700',
-  returned: 'bg-amber-100 text-amber-700',
-  cancelled: 'bg-red-100 text-red-700',
-  failed_delivery: 'bg-orange-100 text-orange-700',
-}
-
-function formatShippingStatusLabel(value: string): string {
-  return value.replace(/_/g, ' ')
-}
+import ShippingStatusBadgeWidget from './widget.client'
 
 const widget: InjectionColumnWidget = {
   metadata: {
@@ -30,12 +16,7 @@ const widget: InjectionColumnWidget = {
       cell: ({ getValue }) => {
         const value = getValue()
         if (typeof value !== 'string' || value.length === 0) return null
-        const colors = SHIPPING_STATUS_COLORS[value] ?? 'bg-gray-100 text-gray-700'
-        return (
-          <span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium ${colors}`}>
-            {formatShippingStatusLabel(value)}
-          </span>
-        )
+        return React.createElement(ShippingStatusBadgeWidget, { status: value })
       },
     },
   ],

package/src/modules/translations/widgets/injection/translation-manager/widget.client.tsx

@@ -3,9 +3,12 @@
 import * as React from 'react'
 import { useParams } from 'next/navigation'
 import Link from 'next/link'
+import { useQuery } from '@tanstack/react-query'
 import { ExternalLink, Languages } from 'lucide-react'
 import type { InjectionWidgetComponentProps } from '@open-mercato/shared/modules/widgets/injection'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { hasAllFeatures } from '@open-mercato/shared/lib/auth/featureMatch'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { Button } from '@open-mercato/ui/primitives/button'
 import {
   Drawer,
@@ -21,20 +24,34 @@ import { extractRecordId } from '../../../lib/extract-record-id'
 type WidgetContext = { entityId?: string; recordId?: string }
 type WidgetData = Record<string, unknown> & { id?: string | number }
 
+type FeatureCheckResponse = {
+  ok: boolean
+  granted: string[]
+  userId: string
+}
+
+const TRANSLATION_ACCESS_FEATURES = ['translations.view']
+
+// Probe access through the shared apiCall/React Query path so multiple injected
+// widget instances dedupe a single request via the query key. feature-check
+// always answers 200 with the granted feature list, so a user without
+// translations.view is hidden gracefully — no login redirect, no forbidden flash.
 function useTranslationAccess(): boolean {
-  const [hasAccess, setHasAccess] = React.useState(false)
-  React.useEffect(() => {
-    let mounted = true
-    // Use the original fetch to bypass the global apiFetch wrapper
-    // that redirects to login on 403. This lets us gracefully hide the widget
-    // when the user lacks translations.view instead of crashing the page.
-    const nativeFetch = ((window as any).__omOriginalFetch as typeof fetch) || fetch
-    nativeFetch('/api/translations/locales', { credentials: 'include' })
-      .then((res) => { if (mounted) setHasAccess(res.ok) })
-      .catch(() => { if (mounted) setHasAccess(false) })
-    return () => { mounted = false }
-  }, [])
-  return hasAccess
+  const { data } = useQuery<boolean>({
+    queryKey: ['translations', 'widget-access', ...TRANSLATION_ACCESS_FEATURES],
+    queryFn: async () => {
+      const res = await apiCall<FeatureCheckResponse>('/api/auth/feature-check', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ features: TRANSLATION_ACCESS_FEATURES }),
+      })
+      if (!res.ok) return false
+      return hasAllFeatures(TRANSLATION_ACCESS_FEATURES, res.result?.granted ?? [])
+    },
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  })
+  return data === true
 }
 
 export default function TranslationWidget({ context, data }: InjectionWidgetComponentProps<WidgetContext, WidgetData>) {