@open-mercato/core 0.6.7-develop.6706.1.b3a4c759bb → 0.6.7-develop.6725.1.07a748cfc2

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

@@ -3,6 +3,7 @@ import * as React from 'react'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
+import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
@@ -52,15 +53,54 @@ type Row = {
   baseCount: number | null
   indexCount: number | null
   vectorCount: number | null
+  /** The entity is configured for vector search (declares `buildSource`). */
   vectorEnabled: boolean
+  /** Vector indexing can actually run — provider reachable and auto-indexing on. */
+  vectorIndexingActive?: boolean
   fulltextCount: number | null
   fulltextEnabled: boolean
+  hasCustomFields?: boolean
+  /** Legacy aggregate: query index AND vector coverage. Preserved for API consumers. */
   ok: boolean
+  /** Query index alone is in sync with the base table — the signal this page reports. */
+  queryIndexOk?: boolean
   job?: JobStatus
 }
 
 type Resp = { items: Row[] }
 
+const BACKEND_FILTER_ID = 'backend'
+// Kept at or below the repository-wide 100-row cap; the entity list grows with every
+// installed module, so it cannot be allowed to scale with the row count.
+const PAGE_SIZE = 50
+
+/** Sort key for a column id. Mirrors the column `accessorFn`s so paging and sorting agree. */
+function sortValue(row: Row, columnId: string): string | number {
+  if (columnId === 'entityId') return row.entityId
+  if (columnId === 'baseCount') return row.baseCount ?? 0
+  if (columnId === 'indexCount') return row.indexCount ?? 0
+  if (columnId === 'vectorCount') return isVectorReportable(row) ? row.vectorCount ?? 0 : -1
+  if (columnId === 'fulltextCount') return row.fulltextEnabled ? row.fulltextCount ?? 0 : -1
+  return row.entityId
+}
+
+type BackendFilter = 'vector' | 'fulltext' | 'custom_fields'
+
+/**
+ * Vector coverage is only worth showing when embeddings can actually be written; otherwise
+ * the count is a permanent 0 that reads as a gap. Older payloads without the flag are
+ * treated as active so the column keeps working against an un-upgraded server.
+ */
+function isVectorReportable(row: Row): boolean {
+  return row.vectorEnabled && (row.vectorIndexingActive ?? true)
+}
+
+function matchesBackendFilter(row: Row, backend: BackendFilter): boolean {
+  if (backend === 'vector') return row.vectorEnabled
+  if (backend === 'fulltext') return row.fulltextEnabled
+  return Boolean(row.hasCustomFields)
+}
+
 function formatCount(value: number | null): string {
   if (value == null) return '—'
   return value.toLocaleString()
@@ -83,15 +123,24 @@ function formatProgressLabel(
   return t('query_index.table.status.progressSingle', { processed: processedText })
 }
 
-function translateJobStatus(t: Translator, status: JobStatus['status'] | undefined, ok: boolean): string {
-  if (!status || status === 'idle') {
+function translateJobStatus(
+  t: Translator,
+  status: JobStatus['status'] | undefined,
+  ok: boolean,
+  measured: boolean,
+): string {
+  const idleLabel = () => {
+    // No coverage snapshot yet — an async refresh is pending, so the index is not known to
+    // be out of sync. Saying so would be the same false alarm this page used to raise.
+    if (!measured) return t('query_index.table.status.not_measured')
     return ok ? t('query_index.table.status.in_sync') : t('query_index.table.status.out_of_sync')
   }
+  if (!status || status === 'idle') return idleLabel()
   if (status === 'reindexing') return t('query_index.table.status.reindexing')
   if (status === 'purging') return t('query_index.table.status.purging')
   if (status === 'stalled') return t('query_index.table.status.stalled')
   if (status === 'failed') return t('query_index.table.status.failed')
-  return ok ? t('query_index.table.status.in_sync') : t('query_index.table.status.out_of_sync')
+  return idleLabel()
 }
 
 function translateScopeStatus(
@@ -108,8 +157,15 @@ function translateScopeStatus(
 
 function createColumns(t: Translator): ColumnDef<Row>[] {
   return [
-    { id: 'entityId', header: () => t('query_index.table.columns.entity'), accessorKey: 'entityId', meta: { priority: 1 } },
-    { id: 'label', header: () => t('query_index.table.columns.label'), accessorKey: 'label', meta: { priority: 2 } },
+    {
+      id: 'entityId',
+      header: () => t('query_index.table.columns.entity'),
+      accessorKey: 'entityId',
+      // The entity id is the only identifier on this page and ids run to ~45 characters
+      // (`catalog:catalog_product_category_assignment`). DataTable's default 150px clamp
+      // ellipsised them into indistinguishable `customers:customer…` rows.
+      meta: { priority: 1, maxWidth: '340px' },
+    },
     {
       id: 'baseCount',
       header: () => t('query_index.table.columns.records'),
@@ -127,10 +183,10 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
     {
       id: 'vectorCount',
       header: () => t('query_index.table.columns.vector'),
-      accessorFn: (row) => (row.vectorEnabled ? row.vectorCount ?? 0 : -1),
+      accessorFn: (row) => (isVectorReportable(row) ? row.vectorCount ?? 0 : -1),
       cell: ({ row }) => {
         const record = row.original
-        if (!record.vectorEnabled) return <span>—</span>
+        if (!isVectorReportable(record)) return <span>—</span>
         const ok = record.vectorCount != null && record.baseCount != null && record.vectorCount === record.baseCount
         const display = formatCount(record.vectorCount)
         const className = ok ? 'text-status-success-text' : 'text-status-warning-text'
@@ -159,17 +215,45 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         const record = row.original
         const job = record.job
         const partitions = job?.partitions ?? []
-        const ok = record.ok && (!job || job.status === 'idle')
-        const jobFailed = job?.status === 'failed'
-        const statusText = translateJobStatus(t, job?.status, ok)
-        const jobProgress = job ? formatProgressLabel(job.processedCount ?? null, job.totalCount ?? null, t) : null
+        const measured = record.baseCount != null || record.indexCount != null
+
+        // A non-partitioned reindex — and every purge, which never partitions
+        // (`lib/purge.ts` always passes `partitionIndex: null`) — is tracked as a scope row.
+        // The server derives the top-level status from partition rows only, so it reports
+        // `idle` for those runs; without folding the scope row in, the default reindex and
+        // every purge would render as though nothing were happening.
+        const scopeStatus = job?.scope?.status ?? null
+        const scopeInFlight = scopeStatus != null && scopeStatus !== 'completed'
+        const effectiveStatus: JobStatus['status'] | undefined = job
+          ? (job.status !== 'idle'
+              ? job.status
+              : (scopeInFlight ? (scopeStatus as JobStatus['status']) : 'idle'))
+          : undefined
+
+        const indexOk = record.queryIndexOk ?? record.ok
+        const ok = indexOk && (!job || effectiveStatus === 'idle')
+        const jobFailed = effectiveStatus === 'failed'
+        const statusText = translateJobStatus(t, effectiveStatus, ok, measured)
+
+        const jobInFlight = Boolean(effectiveStatus && effectiveStatus !== 'idle')
+          || partitions.some((part) => part.status !== 'completed')
+
+        // Job counters and index coverage are different numbers: the counters describe the
+        // last reindex run, the Records/Indexed columns describe the index right now. While
+        // a job runs, "Reindexing (5/14)" is the only place progress is visible. Once it is
+        // idle the counters are stale and duplicate the columns — worse, they can contradict
+        // them: an entity whose last run processed 14 rows but landed 2 in the index rendered
+        // "Out of sync (14/14)" next to Records 14 / Indexed 2.
+        const jobProgress = jobInFlight && job
+          ? formatProgressLabel(job.processedCount ?? null, job.totalCount ?? null, t)
+          : null
         const label = jobProgress
           ? t('query_index.table.status.withProgress', { status: statusText, progress: jobProgress })
           : statusText
         let variant: StatusBadgeVariant = 'neutral'
         if (job) {
-          if (job.status === 'stalled' || jobFailed) variant = 'error'
-          else if (job.status === 'reindexing' || job.status === 'purging') variant = 'warning'
+          if (effectiveStatus === 'stalled' || jobFailed) variant = 'error'
+          else if (effectiveStatus === 'reindexing' || effectiveStatus === 'purging') variant = 'warning'
           else variant = ok ? 'success' : 'neutral'
         } else {
           variant = ok ? 'success' : 'neutral'
@@ -177,33 +261,28 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
 
         const lines: string[] = []
 
-        if (job?.scope && partitions.length <= 1) {
-          const scopeStatus = translateScopeStatus(t, job.scope.status ?? null)
-          const scopeProgress = formatProgressLabel(job.scope.processedCount ?? null, job.scope.totalCount ?? null, t)
-          const scopeLabel = t('query_index.table.status.scopeLabel')
-          lines.push(`${scopeLabel}: ${scopeStatus}${scopeProgress ? ` (${scopeProgress})` : ''}`)
-        }
-
-        if (partitions.length > 1) {
-          for (const part of partitions) {
-            const partitionLabel =
-              part.partitionIndex != null
-                ? t('query_index.table.status.partitionLabel', { index: Number(part.partitionIndex) + 1 })
-                : t('query_index.table.status.scopeLabel')
-            const partitionStatus = translateScopeStatus(t, part.status)
-            const partitionProgress = formatProgressLabel(part.processedCount ?? null, part.totalCount ?? null, t)
-            lines.push(`${partitionLabel}: ${partitionStatus}${partitionProgress ? ` (${partitionProgress})` : ''}`)
+        // Per-partition detail earns its space only while work is in flight — that is when
+        // it tells you which partition is running or stuck. Once the job is idle and every
+        // partition is finished, each line just restates the badge, on every row.
+        if (jobInFlight) {
+          if (job?.scope && partitions.length <= 1) {
+            const scopeStatusText = translateScopeStatus(t, scopeStatus)
+            const scopeProgress = formatProgressLabel(job.scope.processedCount ?? null, job.scope.totalCount ?? null, t)
+            const scopeLabel = t('query_index.table.status.scopeLabel')
+            lines.push(`${scopeLabel}: ${scopeStatusText}${scopeProgress ? ` (${scopeProgress})` : ''}`)
           }
-        }
 
-        if (record.vectorEnabled) {
-          const vectorLabel = t('query_index.table.status.vectorLabel')
-          const vectorCount = formatCount(record.vectorCount)
-          const vectorTotal = record.baseCount != null ? formatCount(record.baseCount) : null
-          const vectorValue = vectorTotal
-            ? t('query_index.table.status.vectorValue', { count: vectorCount, total: vectorTotal })
-            : vectorCount
-          lines.push(`${vectorLabel}: ${vectorValue}`)
+          if (partitions.length > 1) {
+            for (const part of partitions) {
+              const partitionLabel =
+                part.partitionIndex != null
+                  ? t('query_index.table.status.partitionLabel', { index: Number(part.partitionIndex) + 1 })
+                  : t('query_index.table.status.scopeLabel')
+              const partitionStatus = translateScopeStatus(t, part.status)
+              const partitionProgress = formatProgressLabel(part.processedCount ?? null, part.totalCount ?? null, t)
+              lines.push(`${partitionLabel}: ${partitionStatus}${partitionProgress ? ` (${partitionProgress})` : ''}`)
+            }
+          }
         }
 
         return (
@@ -230,14 +309,27 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
 
 export default function QueryIndexesTable() {
   const [sorting, setSorting] = React.useState<SortingState>([{ id: 'entityId', desc: false }])
-  const [page, setPage] = React.useState(1)
   const [search, setSearch] = React.useState('')
+  const [page, setPage] = React.useState(1)
+  const [filterValues, setFilterValues] = React.useState<FilterValues>({})
   const qc = useQueryClient()
   const scopeVersion = useOrganizationScopeVersion()
   const [refreshSeq, setRefreshSeq] = React.useState(0)
   const t = useT()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const columns = React.useMemo(() => createColumns(t), [t])
+  const filters = React.useMemo<FilterDef[]>(() => [
+    {
+      id: BACKEND_FILTER_ID,
+      label: t('query_index.table.filters.backend'),
+      type: 'select',
+      options: [
+        { label: t('query_index.table.filters.backendOptions.vector'), value: 'vector' },
+        { label: t('query_index.table.filters.backendOptions.fulltext'), value: 'fulltext' },
+        { label: t('query_index.table.filters.backendOptions.customFields'), value: 'custom_fields' },
+      ],
+    },
+  ], [t])
   const { runMutation, retryLastMutation } = useGuardedMutation<{
     formId: string
     resourceKind: string
@@ -263,11 +355,49 @@ export default function QueryIndexesTable() {
   })
 
   const rowsAll = data?.items || []
-  const rows = React.useMemo(() => {
-    if (!search) return rowsAll
-    const q = search.toLowerCase()
-    return rowsAll.filter((r) => r.entityId.toLowerCase().includes(q) || r.label.toLowerCase().includes(q))
-  }, [rowsAll, search])
+  const matchedRows = React.useMemo(() => {
+    const backend = filterValues[BACKEND_FILTER_ID] as BackendFilter | undefined
+    const q = search.trim().toLowerCase()
+    if (!q && !backend) return rowsAll
+    return rowsAll.filter((row) => {
+      if (q && !row.entityId.toLowerCase().includes(q)) return false
+      if (backend && !matchesBackendFilter(row, backend)) return false
+      return true
+    })
+  }, [rowsAll, search, filterValues])
+
+  // The endpoint returns every entity in one payload, so paging is ours to do. Sorting has
+  // to happen here rather than in the table: slicing first would let DataTable sort only the
+  // visible page, so page 2 would not hold the rows that sort into it.
+  const sortedRows = React.useMemo(() => {
+    const sort = sorting[0]
+    if (!sort) return matchedRows
+    const direction = sort.desc ? -1 : 1
+    return [...matchedRows].sort((a, b) => {
+      const left = sortValue(a, sort.id)
+      const right = sortValue(b, sort.id)
+      if (typeof left === 'string' || typeof right === 'string') {
+        return String(left).localeCompare(String(right)) * direction
+      }
+      return (Number(left) - Number(right)) * direction
+    })
+  }, [matchedRows, sorting])
+
+  const total = sortedRows.length
+  const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
+  const currentPage = Math.min(page, totalPages)
+  const rows = React.useMemo(
+    () => sortedRows.slice((currentPage - 1) * PAGE_SIZE, currentPage * PAGE_SIZE),
+    [sortedRows, currentPage],
+  )
+
+  const pagination = React.useMemo(() => ({
+    page: currentPage,
+    pageSize: PAGE_SIZE,
+    total,
+    totalPages,
+    onPageChange: setPage,
+  }), [currentPage, total, totalPages])
 
   const trigger = React.useCallback(
     async (action: 'reindex' | 'purge', entityId: string, opts?: { force?: boolean }) => {
@@ -416,9 +546,23 @@ export default function QueryIndexesTable() {
           setSearch(value)
           setPage(1)
         }}
+        filters={filters}
+        filterValues={filterValues}
+        onFiltersApply={(values) => {
+          setFilterValues(values)
+          setPage(1)
+        }}
+        onFiltersClear={() => {
+          setFilterValues({})
+          setPage(1)
+        }}
         sortable
+        manualSorting
         sorting={sorting}
-        onSortingChange={setSorting}
+        onSortingChange={(next) => {
+          setSorting(next)
+          setPage(1)
+        }}
         perspective={{ tableId: 'query_index.status.list' }}
         rowActions={(row) => {
           const items: Array<{ id: string; label: string; onSelect: () => void; destructive?: boolean }> = [
@@ -436,6 +580,8 @@ export default function QueryIndexesTable() {
             },
           ]
 
+          // Manual vector actions stay available whenever the entity declares `buildSource`,
+          // even when auto-indexing is off — a manual reindex is still a valid operation.
           if (row.vectorEnabled) {
             items.push(
               {
@@ -470,7 +616,7 @@ export default function QueryIndexesTable() {
 
           return <RowActions items={items} />
         }}
-        pagination={{ page, pageSize: 50, total: rows.length, totalPages: 1, onPageChange: setPage }}
+        pagination={pagination}
         isLoading={isLoading}
       />
       {ConfirmDialogElement}

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

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entität",
   "query_index.table.columns.fulltext": "Volltext",
   "query_index.table.columns.indexed": "Indexiert",
-  "query_index.table.columns.label": "Beschriftung",
   "query_index.table.columns.records": "Datensätze",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Vektor",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Die letzten 100 Fehler für Query- und Vektor-Indexer in diesem Bereich.",
   "query_index.table.errors.title": "Aktuelle Indexer-Fehler",
   "query_index.table.errors.viewDetails": "Technische Details anzeigen",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Benutzerdefinierte Felder",
+  "query_index.table.filters.backendOptions.fulltext": "Volltextsuche",
+  "query_index.table.filters.backendOptions.vector": "Vektorsuche",
   "query_index.table.logs.columns.message": "Nachricht",
   "query_index.table.logs.columns.source": "Quelle",
   "query_index.table.logs.columns.timestamp": "Zeitstempel",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Nach Entität filtern",
   "query_index.table.status.failed": "Fehlgeschlagen",
   "query_index.table.status.in_sync": "Synchron",
+  "query_index.table.status.not_measured": "Noch nicht gemessen",
   "query_index.table.status.out_of_sync": "Nicht synchron",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Angehalten",
   "query_index.table.status.scopeLabel": "Bereich",
   "query_index.table.status.stalled": "Angehalten",
-  "query_index.table.status.vectorLabel": "Vektor",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entity",
   "query_index.table.columns.fulltext": "Full-text",
   "query_index.table.columns.indexed": "Indexed",
-  "query_index.table.columns.label": "Label",
   "query_index.table.columns.records": "Records",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Vector",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Last 100 errors recorded for query index and vector index jobs in this scope.",
   "query_index.table.errors.title": "Recent indexer errors",
   "query_index.table.errors.viewDetails": "View technical details",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Custom fields",
+  "query_index.table.filters.backendOptions.fulltext": "Full-text search",
+  "query_index.table.filters.backendOptions.vector": "Vector search",
   "query_index.table.logs.columns.message": "Message",
   "query_index.table.logs.columns.source": "Source",
   "query_index.table.logs.columns.timestamp": "Timestamp",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filter by entity",
   "query_index.table.status.failed": "Failed",
   "query_index.table.status.in_sync": "In sync",
+  "query_index.table.status.not_measured": "Not measured yet",
   "query_index.table.status.out_of_sync": "Out of sync",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Stalled",
   "query_index.table.status.scopeLabel": "Scope",
   "query_index.table.status.stalled": "Stalled",
-  "query_index.table.status.vectorLabel": "Vector",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entidad",
   "query_index.table.columns.fulltext": "Texto completo",
   "query_index.table.columns.indexed": "Indexados",
-  "query_index.table.columns.label": "Etiqueta",
   "query_index.table.columns.records": "Registros",
   "query_index.table.columns.status": "Estado",
   "query_index.table.columns.vector": "Vectorial",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Últimos 100 errores registrados para los trabajos del índice de consultas y vector en este ámbito.",
   "query_index.table.errors.title": "Errores recientes del indexador",
   "query_index.table.errors.viewDetails": "Ver detalles técnicos",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Campos personalizados",
+  "query_index.table.filters.backendOptions.fulltext": "Búsqueda de texto completo",
+  "query_index.table.filters.backendOptions.vector": "Búsqueda vectorial",
   "query_index.table.logs.columns.message": "Mensaje",
   "query_index.table.logs.columns.source": "Origen",
   "query_index.table.logs.columns.timestamp": "Marca de tiempo",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filtrar por entidad",
   "query_index.table.status.failed": "Con errores",
   "query_index.table.status.in_sync": "Sincronizado",
+  "query_index.table.status.not_measured": "Aún no medido",
   "query_index.table.status.out_of_sync": "Fuera de sincronización",
   "query_index.table.status.partitionLabel": "Partición {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Detenido",
   "query_index.table.status.scopeLabel": "Ámbito",
   "query_index.table.status.stalled": "Detenido",
-  "query_index.table.status.vectorLabel": "Vectorial",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Encja",
   "query_index.table.columns.fulltext": "Pełnotekstowy",
   "query_index.table.columns.indexed": "Zindeksowane",
-  "query_index.table.columns.label": "Etykieta",
   "query_index.table.columns.records": "Rekordy",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Wektor",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Ostatnie 100 błędów zapisanych dla zadań indeksu zapytań i wektorowego w tym zakresie.",
   "query_index.table.errors.title": "Ostatnie błędy indeksowania",
   "query_index.table.errors.viewDetails": "Pokaż szczegóły techniczne",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Pola niestandardowe",
+  "query_index.table.filters.backendOptions.fulltext": "Wyszukiwanie pełnotekstowe",
+  "query_index.table.filters.backendOptions.vector": "Wyszukiwanie wektorowe",
   "query_index.table.logs.columns.message": "Komunikat",
   "query_index.table.logs.columns.source": "Źródło",
   "query_index.table.logs.columns.timestamp": "Znacznik czasu",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filtruj według encji",
   "query_index.table.status.failed": "Niepowodzenie",
   "query_index.table.status.in_sync": "Zsynchronizowany",
+  "query_index.table.status.not_measured": "Jeszcze nie zmierzono",
   "query_index.table.status.out_of_sync": "Poza synchronizacją",
   "query_index.table.status.partitionLabel": "Partycja {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Zatrzymane",
   "query_index.table.status.scopeLabel": "Zakres",
   "query_index.table.status.stalled": "Zatrzymany",
-  "query_index.table.status.vectorLabel": "Wektor",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

package/src/modules/query_index/lib/batch.ts

@@ -4,6 +4,7 @@ import { isUniqueViolation } from '@open-mercato/shared/lib/db/pg-errors'
 import { buildIndexDocument, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 
 const logger = createLogger('query_index').child({ component: 'reindex-batch' })
 
@@ -228,6 +229,7 @@ export async function upsertIndexBatch(
   const basePayloads: IndexRowPayload[] = []
 
   const debugEnabled = isSearchDebugEnabled()
+  const searchConfig = resolveSearchConfig()
 
   for (const row of rows) {
     const recordId = normalizeId(row.id)
@@ -264,10 +266,15 @@ export async function upsertIndexBatch(
       if (!entityRow) return row
       return { ...entityRow, ...row }
     })()
-    let doc = buildIndexDocument(mergedRow, values, {
-      organizationId: scopeOrg ?? null,
-      tenantId: scopeTenant ?? null,
-    })
+    let doc = buildIndexDocument(
+      mergedRow,
+      values,
+      {
+        organizationId: scopeOrg ?? null,
+        tenantId: scopeTenant ?? null,
+      },
+      { entityType, config: searchConfig },
+    )
     let tokenDoc: Record<string, unknown> = doc
     if (typeof options.encryptDoc === 'function') {
       try {

package/src/modules/query_index/lib/document.ts

@@ -1,3 +1,9 @@
+import {
+  isSearchFieldBlocklisted,
+  resolveSearchConfig,
+  type SearchConfig,
+} from '@open-mercato/shared/lib/search/config'
+
 export type IndexDocumentScope = {
   organizationId?: string | null
   tenantId?: string | null
@@ -12,6 +18,18 @@ export type IndexCustomFieldValue = {
 
 export const AGGREGATE_SEARCH_FIELD = 'search_text'
 
+/**
+ * Controls which fields may contribute text to the `search_text` aggregate.
+ *
+ * Both properties are optional so existing callers keep working unchanged: an
+ * omitted `config` is resolved from the environment, and an omitted `entityType`
+ * means only the global blocklist entries apply.
+ */
+export type AggregateSearchOptions = {
+  entityType?: string | null
+  config?: SearchConfig
+}
+
 function normalizeScopeValue(value: string | null | undefined): string | null {
   if (value === undefined || value === null || value === '') return null
   return value
@@ -30,7 +48,12 @@ function normalizeValue(value: unknown): unknown {
   return value
 }
 
-function collectAggregateSearchValues(field: string, value: unknown): string[] {
+function collectAggregateSearchValues(
+  field: string,
+  value: unknown,
+  entityType: string | null,
+  config: SearchConfig,
+): string[] {
   const lower = field.toLowerCase()
   if (
     lower === AGGREGATE_SEARCH_FIELD
@@ -43,6 +66,8 @@ function collectAggregateSearchValues(field: string, value: unknown): string[] {
     return []
   }
 
+  if (isSearchFieldBlocklisted(field, entityType, config)) return []
+
   if (typeof value === 'string') {
     const trimmed = value.trim()
     return trimmed.length > 0 ? [trimmed] : []
@@ -58,12 +83,17 @@ function collectAggregateSearchValues(field: string, value: unknown): string[] {
   return []
 }
 
-export function attachAggregateSearchField(doc: Record<string, unknown>): Record<string, unknown> {
+export function attachAggregateSearchField(
+  doc: Record<string, unknown>,
+  options: AggregateSearchOptions = {},
+): Record<string, unknown> {
+  const config = options.config ?? resolveSearchConfig()
+  const entityType = options.entityType ?? null
   const parts: string[] = []
   const seen = new Set<string>()
 
   for (const [field, value] of Object.entries(doc)) {
-    const values = collectAggregateSearchValues(field, value)
+    const values = collectAggregateSearchValues(field, value, entityType, config)
     for (const entry of values) {
       const key = entry.toLowerCase()
       if (seen.has(key)) continue
@@ -83,6 +113,7 @@ export function buildIndexDocument(
   baseRow: Record<string, unknown>,
   customFieldValues: Iterable<IndexCustomFieldValue> = [],
   scope: IndexDocumentScope = {},
+  options: AggregateSearchOptions = {},
 ): Record<string, unknown> {
   const doc: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(baseRow)) {
@@ -123,5 +154,5 @@ export function buildIndexDocument(
     }
   }
 
-  return attachAggregateSearchField(doc)
+  return attachAggregateSearchField(doc, options)
 }