@open-mercato/core 0.6.6-develop.6314.1.c7b8291aa2 → 0.6.6-develop.6330.1.a261878aa8

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

@@ -438,53 +438,49 @@ export function EntityTagsDialog({
   const loadData = React.useCallback(async () => {
     setLoading(true)
     try {
-      let kindSettings: KindSetting[] = []
       const scopedQuery = new URLSearchParams()
       if (entityOrganizationId) {
         scopedQuery.set('organizationId', entityOrganizationId)
       }
-      try {
-        const settingsCall = await apiCall<{ items?: KindSetting[] }>(
-          `/api/customers/dictionaries/kind-settings${scopedQuery.size ? `?${scopedQuery.toString()}` : ''}`,
-          { cache: 'no-store', headers: { 'x-om-unauthorized-redirect': '0' } },
-        )
-        if (settingsCall.ok && settingsCall.result?.items) {
-          kindSettings = settingsCall.result.items
+
+      const loadKindSettings = async (): Promise<KindSetting[]> => {
+        try {
+          const settingsCall = await apiCall<{ items?: KindSetting[] }>(
+            `/api/customers/dictionaries/kind-settings${scopedQuery.size ? `?${scopedQuery.toString()}` : ''}`,
+            { cache: 'no-store', headers: { 'x-om-unauthorized-redirect': '0' } },
+          )
+          if (settingsCall.ok && settingsCall.result?.items) {
+            return settingsCall.result.items
+          }
+        } catch {
+          // Default category order works without explicit settings rows.
         }
-      } catch {
-        // Default category order works without explicit settings rows.
+        return []
       }
 
-      const settingsMap = new Map(kindSettings.map((setting) => [setting.kind, setting]))
-
-      const selectedTagEntries = Array.isArray(entityData.tags)
-        ? entityData.tags.map((tag) => ({
-            id: tag.id,
-            value: tag.id,
-            label: tag.label,
-            color: tag.color ?? null,
-          }))
-        : []
-
-      let assignedLabelIds: string[] = []
-      let selectedLabelEntries: CategoryOption[] = []
-      try {
-        const labelsQuery = new URLSearchParams()
-        labelsQuery.set('entityId', entityId)
-        labelsQuery.set('pageSize', '1')
-        if (entityOrganizationId) {
-          labelsQuery.set('organizationId', entityOrganizationId)
-        }
-        const labelsCall = await apiCall<{
-          items?: LabelItem[]
-          assignedIds?: string[]
-        }>(`/api/customers/labels?${labelsQuery.toString()}`, {
-          cache: 'no-store',
-          headers: { 'x-om-unauthorized-redirect': '0' },
-        })
-        const labelsData = labelsCall.ok ? labelsCall.result : null
-        assignedLabelIds = labelsData?.assignedIds ?? []
-        if (assignedLabelIds.length > 0) {
+      const loadLabelData = async (): Promise<{
+        assignedLabelIds: string[]
+        selectedLabelEntries: CategoryOption[]
+      }> => {
+        try {
+          const labelsQuery = new URLSearchParams()
+          labelsQuery.set('entityId', entityId)
+          labelsQuery.set('pageSize', '1')
+          if (entityOrganizationId) {
+            labelsQuery.set('organizationId', entityOrganizationId)
+          }
+          const labelsCall = await apiCall<{
+            items?: LabelItem[]
+            assignedIds?: string[]
+          }>(`/api/customers/labels?${labelsQuery.toString()}`, {
+            cache: 'no-store',
+            headers: { 'x-om-unauthorized-redirect': '0' },
+          })
+          const labelsData = labelsCall.ok ? labelsCall.result : null
+          const assignedLabelIds = labelsData?.assignedIds ?? []
+          if (assignedLabelIds.length === 0) {
+            return { assignedLabelIds, selectedLabelEntries: [] }
+          }
           const detailQuery = new URLSearchParams({
             ids: assignedLabelIds.join(','),
             pageSize: String(Math.min(assignedLabelIds.length, 100)),
@@ -500,44 +496,36 @@ export function EntityTagsDialog({
             },
           )
           const selectedLabels = selectedLabelsCall.ok ? selectedLabelsCall.result?.items ?? [] : []
-          selectedLabelEntries = selectedLabels.map((label) => ({
+          const selectedLabelEntries = selectedLabels.map((label) => ({
             id: label.id,
             value: label.id,
             label: label.label,
             color: null,
           }))
+          return { assignedLabelIds, selectedLabelEntries }
+        } catch {
+          return { assignedLabelIds: [], selectedLabelEntries: [] }
         }
-      } catch {
-        assignedLabelIds = []
-        selectedLabelEntries = []
       }
 
-      const categoryDefs = buildApplicableCategories(entityType, kindSettings)
-      const loadedCategories: CategorySection[] = []
+      const selectedTagEntries = Array.isArray(entityData.tags)
+        ? entityData.tags.map((tag) => ({
+            id: tag.id,
+            value: tag.id,
+            label: tag.label,
+            color: tag.color ?? null,
+          }))
+        : []
 
-      for (const categoryDef of categoryDefs) {
-        if (categoryDef.source === 'tags') {
-          loadedCategories.push({
-            ...categoryDef,
-            label: t(categoryDef.labelKey, categoryDef.labelFallback),
-            description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
-            entries: sortOptions(selectedTagEntries),
-            selectionMode: categoryDef.selectionMode ?? 'multi',
-          })
-          continue
-        }
+      // The label chain is independent of kind settings and the dictionary
+      // fan-out, so kick it off immediately and let it resolve in parallel.
+      const labelDataPromise = loadLabelData()
 
-        if (categoryDef.source === 'labels') {
-          loadedCategories.push({
-            ...categoryDef,
-            label: t(categoryDef.labelKey, categoryDef.labelFallback),
-            description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
-            entries: sortOptions(selectedLabelEntries),
-            selectionMode: categoryDef.selectionMode ?? 'multi',
-          })
-          continue
-        }
+      const kindSettings = await loadKindSettings()
+      const settingsMap = new Map(kindSettings.map((setting) => [setting.kind, setting]))
+      const categoryDefs = buildApplicableCategories(entityType, kindSettings)
 
+      const loadDictionaryCategory = async (categoryDef: CategoryDef): Promise<CategorySection> => {
         try {
           const dictionaryUrl = new URL(`/api/customers/dictionaries/${categoryDef.routeKind}`, 'http://localhost')
           if (entityOrganizationId) {
@@ -568,7 +556,7 @@ export function EntityTagsDialog({
               color: null,
             })
           })
-          loadedCategories.push({
+          return {
             ...categoryDef,
             label: categoryDef.labelKey
               ? t(categoryDef.labelKey, categoryDef.labelFallback)
@@ -582,7 +570,7 @@ export function EntityTagsDialog({
               : categoryDef.descriptionFallback,
             entries: sortOptions(entries),
             selectionMode,
-          })
+          }
         } catch {
           const setting = categoryDef.settingKind
             ? settingsMap.get(categoryDef.settingKind)
@@ -594,7 +582,7 @@ export function EntityTagsDialog({
             label: value,
             color: null,
           }))
-          loadedCategories.push({
+          return {
             ...categoryDef,
             label: categoryDef.labelKey
               ? t(categoryDef.labelKey, categoryDef.labelFallback)
@@ -608,10 +596,40 @@ export function EntityTagsDialog({
               : categoryDef.descriptionFallback,
             entries: fallbackEntries,
             selectionMode,
-          })
+          }
         }
       }
 
+      // Independent dictionary requests fan out together instead of awaiting
+      // each one sequentially; Promise.all preserves categoryDefs order so the
+      // subsequent sort and selection initialization stay stable.
+      const loadedCategories = await Promise.all(
+        categoryDefs.map(async (categoryDef): Promise<CategorySection> => {
+          if (categoryDef.source === 'tags') {
+            return {
+              ...categoryDef,
+              label: t(categoryDef.labelKey, categoryDef.labelFallback),
+              description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
+              entries: sortOptions(selectedTagEntries),
+              selectionMode: categoryDef.selectionMode ?? 'multi',
+            }
+          }
+          if (categoryDef.source === 'labels') {
+            const { selectedLabelEntries } = await labelDataPromise
+            return {
+              ...categoryDef,
+              label: t(categoryDef.labelKey, categoryDef.labelFallback),
+              description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
+              entries: sortOptions(selectedLabelEntries),
+              selectionMode: categoryDef.selectionMode ?? 'multi',
+            }
+          }
+          return loadDictionaryCategory(categoryDef)
+        }),
+      )
+
+      const { assignedLabelIds, selectedLabelEntries } = await labelDataPromise
+
       loadedCategories.sort((left, right) => {
         const leftSortOrder =
           left.settingKind && settingsMap.has(left.settingKind)

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

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 Teilnehmer",
   "customers.calendar.peek.attendees": "{count} Teilnehmer",
   "customers.calendar.peek.edit": "Bearbeiten",
+  "customers.calendar.peek.editForbidden": "Sie haben keine Berechtigung, Termine zu bearbeiten",
   "customers.calendar.peek.join": "Beitreten",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

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

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 attendee",
   "customers.calendar.peek.attendees": "{count} attendees",
   "customers.calendar.peek.edit": "Edit",
+  "customers.calendar.peek.editForbidden": "You don't have permission to edit events",
   "customers.calendar.peek.join": "Join",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

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

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 asistente",
   "customers.calendar.peek.attendees": "{count} asistentes",
   "customers.calendar.peek.edit": "Editar",
+  "customers.calendar.peek.editForbidden": "No tienes permiso para editar eventos",
   "customers.calendar.peek.join": "Unirse",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

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

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 uczestnik",
   "customers.calendar.peek.attendees": "{count} uczestników",
   "customers.calendar.peek.edit": "Edytuj",
+  "customers.calendar.peek.editForbidden": "Nie masz uprawnień do edycji wydarzeń",
   "customers.calendar.peek.join": "Dołącz",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

package/src/modules/dashboards/components/WidgetVisibilityEditor.tsx

@@ -193,9 +193,12 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
       setLoading(true)
       setError(null)
       try {
-        await loadCatalog()
-        if (kind === 'role') await loadRoleData(tenantIdRef.current, organizationIdRef.current)
-        else await loadUserData(tenantIdRef.current, organizationIdRef.current)
+        await Promise.all([
+          loadCatalog(),
+          kind === 'role'
+            ? loadRoleData(tenantIdRef.current, organizationIdRef.current)
+            : loadUserData(tenantIdRef.current, organizationIdRef.current),
+        ])
       } catch (err) {
         console.error('Failed to load widget visibility data', err)
         if (!cancelled) {

package/src/modules/data_sync/api/runs.ts

@@ -25,6 +25,7 @@ export async function GET(req: Request) {
     entityType: url.searchParams.get('entityType') ?? undefined,
     direction: url.searchParams.get('direction') ?? undefined,
     status: url.searchParams.get('status') ?? undefined,
+    search: url.searchParams.get('search') ?? undefined,
     page: url.searchParams.get('page') ?? undefined,
     pageSize: url.searchParams.get('pageSize') ?? undefined,
   })

package/src/modules/data_sync/backend/data-sync/page.tsx

@@ -167,6 +167,7 @@ export default function SyncRunsDashboardPage() {
       params.set('pageSize', '20')
       if (filterValues.status) params.set('status', filterValues.status as string)
       if (filterValues.direction) params.set('direction', filterValues.direction as string)
+      if (search.trim()) params.set('search', search.trim())
       const fallback: ResponsePayload = { items: [], total: 0, page, totalPages: 1 }
       const call = await apiCall<ResponsePayload>(
         `/api/data_sync/runs?${params.toString()}`,
@@ -188,7 +189,7 @@ export default function SyncRunsDashboardPage() {
     }
     load()
     return () => { cancelled = true }
-  }, [page, filterValues, reloadToken, scopeVersion, t])
+  }, [page, filterValues, search, reloadToken, scopeVersion, t])
 
   React.useEffect(() => {
     let cancelled = false
@@ -965,6 +966,7 @@ export default function SyncRunsDashboardPage() {
           onFiltersClear={handleFiltersClear}
           searchValue={search}
           onSearchChange={(value) => { setSearch(value); setPage(1) }}
+          searchPlaceholder={t('data_sync.dashboard.searchPlaceholder')}
           perspective={{ tableId: 'data_sync.runs' }}
           onRowClick={(row) => {
             router.push(`/backend/data-sync/runs/${encodeURIComponent(row.id)}`)

package/src/modules/data_sync/data/validators.ts

@@ -28,6 +28,7 @@ export const listSyncRunsQuerySchema = z.object({
   entityType: z.string().optional(),
   direction: z.enum(['import', 'export']).optional(),
   status: z.enum(['pending', 'running', 'completed', 'failed', 'cancelled', 'paused']).optional(),
+  search: z.string().trim().min(1).max(200).optional(),
   page: z.coerce.number().int().min(1).default(1),
   pageSize: z.coerce.number().int().min(1).max(100).default(20),
 })

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

@@ -47,6 +47,7 @@
   "data_sync.dashboard.schedule.timezone": "Timezone",
   "data_sync.dashboard.schedule.title": "Recurring schedule",
   "data_sync.dashboard.schedule.type": "Schedule type",
+  "data_sync.dashboard.searchPlaceholder": "Nach Integration, Entitätstyp, Status oder Lauf-ID suchen",
   "data_sync.dashboard.start.batchSize": "Batch Size",
   "data_sync.dashboard.start.description": "Pick a sync target, launch an ad-hoc run, or save a recurring schedule for the same entity and direction from this page.",
   "data_sync.dashboard.start.error": "Failed to start sync run",

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

@@ -47,6 +47,7 @@
   "data_sync.dashboard.schedule.timezone": "Timezone",
   "data_sync.dashboard.schedule.title": "Recurring schedule",
   "data_sync.dashboard.schedule.type": "Schedule type",
+  "data_sync.dashboard.searchPlaceholder": "Search by integration, entity type, status, or run ID",
   "data_sync.dashboard.start.batchSize": "Batch Size",
   "data_sync.dashboard.start.description": "Pick a sync target, launch an ad-hoc run, or save a recurring schedule for the same entity and direction from this page.",
   "data_sync.dashboard.start.error": "Failed to start sync run",

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

@@ -47,6 +47,7 @@
   "data_sync.dashboard.schedule.timezone": "Timezone",
   "data_sync.dashboard.schedule.title": "Recurring schedule",
   "data_sync.dashboard.schedule.type": "Schedule type",
+  "data_sync.dashboard.searchPlaceholder": "Buscar por integración, tipo de entidad, estado o ID de ejecución",
   "data_sync.dashboard.start.batchSize": "Batch Size",
   "data_sync.dashboard.start.description": "Pick a sync target, launch an ad-hoc run, or save a recurring schedule for the same entity and direction from this page.",
   "data_sync.dashboard.start.error": "Failed to start sync run",

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

@@ -47,6 +47,7 @@
   "data_sync.dashboard.schedule.timezone": "Timezone",
   "data_sync.dashboard.schedule.title": "Recurring schedule",
   "data_sync.dashboard.schedule.type": "Schedule type",
+  "data_sync.dashboard.searchPlaceholder": "Szukaj po integracji, typie encji, statusie lub ID przebiegu",
   "data_sync.dashboard.start.batchSize": "Batch Size",
   "data_sync.dashboard.start.description": "Pick a sync target, launch an ad-hoc run, or save a recurring schedule for the same entity and direction from this page.",
   "data_sync.dashboard.start.error": "Failed to start sync run",

package/src/modules/data_sync/lib/sync-run-service.ts

@@ -1,8 +1,26 @@
 import type { EntityManager, FilterQuery } from '@mikro-orm/postgresql'
 import { findAndCountWithDecryption, findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { SyncCursor, SyncRun } from '../data/entities'
 
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+function buildRunSearchFilter(search: string): FilterQuery<SyncRun>[] | null {
+  const trimmed = search.trim()
+  if (!trimmed) return null
+  const pattern = `%${escapeLikePattern(trimmed)}%`
+  const conditions: FilterQuery<SyncRun>[] = [
+    { integrationId: { $ilike: pattern } },
+    { entityType: { $ilike: pattern } },
+    { status: { $ilike: pattern } },
+  ]
+  if (UUID_PATTERN.test(trimmed)) {
+    conditions.push({ id: trimmed })
+  }
+  return conditions
+}
+
 type SyncScope = {
   organizationId: string
   tenantId: string
@@ -89,6 +107,7 @@ export function createSyncRunService(em: EntityManager) {
       entityType?: string
       direction?: 'import' | 'export'
       status?: string
+      search?: string
       page: number
       pageSize: number
     }, scope: SyncScope): Promise<{ items: SyncRun[]; total: number }> {
@@ -102,6 +121,10 @@ export function createSyncRunService(em: EntityManager) {
       if (query.entityType) where.entityType = query.entityType
       if (query.direction) where.direction = query.direction
       if (query.status) where.status = query.status as SyncRun['status']
+      if (query.search) {
+        const searchConditions = buildRunSearchFilter(query.search)
+        if (searchConditions) where.$or = searchConditions
+      }
 
       const [items, total] = await findAndCountWithDecryption(
         em,

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) => (