@open-mercato/core 0.4.11-develop.1355.50152f3ee9 → 0.4.11-develop.1362.574a071900

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

@@ -392,6 +392,7 @@ function EntityMultiSelect({
               onMouseDown={(event) => event.preventDefault()}
               onClick={() => addOption(option)}
               disabled={disabled}
+              aria-label={option.label}
             >
               <span className="flex flex-col items-start">
                 <span>{option.label}</span>

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

@@ -218,6 +218,10 @@
   "customers.companies.list.actions.view": "Details anzeigen",
   "customers.companies.list.booleanNo": "Nein",
   "customers.companies.list.booleanYes": "Ja",
+  "customers.companies.list.bulkDelete.action": "Delete selected",
+  "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.companies.list.bulkDelete.success": "{count} companies deleted",
+  "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "E-Mail",
   "customers.companies.list.columns.lifecycleStage": "Lebenszyklusphase",
   "customers.companies.list.columns.name": "Name",
@@ -420,6 +424,10 @@
   "customers.deals.list.actions.openInNewTab": "In neuem Tab öffnen",
   "customers.deals.list.booleanNo": "Nein",
   "customers.deals.list.booleanYes": "Ja",
+  "customers.deals.list.bulkDelete.action": "Delete selected",
+  "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.deals.list.bulkDelete.success": "{count} deals deleted",
+  "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Unternehmen",
   "customers.deals.list.columns.expectedClose": "Voraussichtlicher Abschluss",
   "customers.deals.list.columns.people": "Personen",
@@ -979,6 +987,10 @@
   "customers.people.list.actions.view": "Details anzeigen",
   "customers.people.list.booleanNo": "Nein",
   "customers.people.list.booleanYes": "Ja",
+  "customers.people.list.bulkDelete.action": "Delete selected",
+  "customers.people.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.people.list.bulkDelete.success": "{count} people deleted",
+  "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "E-Mail",
   "customers.people.list.columns.lifecycleStage": "Lebenszyklusphase",
   "customers.people.list.columns.name": "Name",

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

@@ -218,6 +218,10 @@
   "customers.companies.list.actions.view": "View details",
   "customers.companies.list.booleanNo": "No",
   "customers.companies.list.booleanYes": "Yes",
+  "customers.companies.list.bulkDelete.action": "Delete selected",
+  "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.companies.list.bulkDelete.success": "{count} companies deleted",
+  "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "Email",
   "customers.companies.list.columns.lifecycleStage": "Lifecycle stage",
   "customers.companies.list.columns.name": "Name",
@@ -242,7 +246,7 @@
   "customers.companies.list.filters.status": "Status",
   "customers.companies.list.filters.tags": "Tags",
   "customers.companies.list.noValue": "Not set",
-  "customers.companies.list.searchPlaceholder": "Search companies",
+  "customers.companies.list.searchPlaceholder": "Search by name, email, phone…",
   "customers.companies.list.tags.loadError": "Failed to load tags.",
   "customers.companies.list.title": "Companies",
   "customers.config.addressFormat.description": "Choose how address forms and displays should be structured across the customer module.",
@@ -420,6 +424,10 @@
   "customers.deals.list.actions.openInNewTab": "Open in new tab",
   "customers.deals.list.booleanNo": "No",
   "customers.deals.list.booleanYes": "Yes",
+  "customers.deals.list.bulkDelete.action": "Delete selected",
+  "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.deals.list.bulkDelete.success": "{count} deals deleted",
+  "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Companies",
   "customers.deals.list.columns.expectedClose": "Expected close",
   "customers.deals.list.columns.people": "People",
@@ -440,7 +448,7 @@
   "customers.deals.list.filters.peoplePlaceholder": "Filter by people",
   "customers.deals.list.noValue": "Not set",
   "customers.deals.list.refresh": "Refresh",
-  "customers.deals.list.searchPlaceholder": "Search deals…",
+  "customers.deals.list.searchPlaceholder": "Search by title, description…",
   "customers.deals.list.title": "Deals",
   "customers.deals.list.unnamedCompany": "Unnamed company",
   "customers.deals.list.unnamedPerson": "Unnamed person",
@@ -979,6 +987,10 @@
   "customers.people.list.actions.view": "View details",
   "customers.people.list.booleanNo": "No",
   "customers.people.list.booleanYes": "Yes",
+  "customers.people.list.bulkDelete.action": "Delete selected",
+  "customers.people.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.people.list.bulkDelete.success": "{count} people deleted",
+  "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "Email",
   "customers.people.list.columns.lifecycleStage": "Lifecycle stage",
   "customers.people.list.columns.name": "Name",
@@ -1003,7 +1015,7 @@
   "customers.people.list.filters.status": "Status",
   "customers.people.list.filters.tags": "Tags",
   "customers.people.list.noValue": "Not set",
-  "customers.people.list.searchPlaceholder": "Search people",
+  "customers.people.list.searchPlaceholder": "Search by name, email, phone…",
   "customers.people.list.title": "People",
   "customers.pipelines.actions.create": "Add pipeline",
   "customers.pipelines.actions.delete": "Delete",

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

@@ -218,6 +218,10 @@
   "customers.companies.list.actions.view": "Ver detalles",
   "customers.companies.list.booleanNo": "No",
   "customers.companies.list.booleanYes": "Sí",
+  "customers.companies.list.bulkDelete.action": "Delete selected",
+  "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.companies.list.bulkDelete.success": "{count} companies deleted",
+  "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "Correo electrónico",
   "customers.companies.list.columns.lifecycleStage": "Etapa del ciclo de vida",
   "customers.companies.list.columns.name": "Nombre",
@@ -420,6 +424,10 @@
   "customers.deals.list.actions.openInNewTab": "Abrir en nueva pestaña",
   "customers.deals.list.booleanNo": "No",
   "customers.deals.list.booleanYes": "Sí",
+  "customers.deals.list.bulkDelete.action": "Delete selected",
+  "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.deals.list.bulkDelete.success": "{count} deals deleted",
+  "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Empresas",
   "customers.deals.list.columns.expectedClose": "Cierre esperado",
   "customers.deals.list.columns.people": "Personas",
@@ -979,6 +987,10 @@
   "customers.people.list.actions.view": "Ver detalles",
   "customers.people.list.booleanNo": "No",
   "customers.people.list.booleanYes": "Sí",
+  "customers.people.list.bulkDelete.action": "Delete selected",
+  "customers.people.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.people.list.bulkDelete.success": "{count} people deleted",
+  "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "Correo electrónico",
   "customers.people.list.columns.lifecycleStage": "Etapa del ciclo de vida",
   "customers.people.list.columns.name": "Nombre",

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

@@ -218,6 +218,10 @@
   "customers.companies.list.actions.view": "Zobacz szczegóły",
   "customers.companies.list.booleanNo": "Nie",
   "customers.companies.list.booleanYes": "Tak",
+  "customers.companies.list.bulkDelete.action": "Delete selected",
+  "customers.companies.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.companies.list.bulkDelete.success": "{count} companies deleted",
+  "customers.companies.list.bulkDelete.title": "Delete {count} companies?",
   "customers.companies.list.columns.email": "E-mail",
   "customers.companies.list.columns.lifecycleStage": "Etap cyklu życia",
   "customers.companies.list.columns.name": "Nazwa",
@@ -420,6 +424,10 @@
   "customers.deals.list.actions.openInNewTab": "Otwórz w nowej karcie",
   "customers.deals.list.booleanNo": "Nie",
   "customers.deals.list.booleanYes": "Tak",
+  "customers.deals.list.bulkDelete.action": "Delete selected",
+  "customers.deals.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.deals.list.bulkDelete.success": "{count} deals deleted",
+  "customers.deals.list.bulkDelete.title": "Delete {count} deals?",
   "customers.deals.list.columns.companies": "Firmy",
   "customers.deals.list.columns.expectedClose": "Planowana finalizacja",
   "customers.deals.list.columns.people": "Osoby",
@@ -979,6 +987,10 @@
   "customers.people.list.actions.view": "Zobacz szczegóły",
   "customers.people.list.booleanNo": "Nie",
   "customers.people.list.booleanYes": "Tak",
+  "customers.people.list.bulkDelete.action": "Delete selected",
+  "customers.people.list.bulkDelete.description": "This action cannot be undone.",
+  "customers.people.list.bulkDelete.success": "{count} people deleted",
+  "customers.people.list.bulkDelete.title": "Delete {count} people?",
   "customers.people.list.columns.email": "E-mail",
   "customers.people.list.columns.lifecycleStage": "Etap cyklu życia",
   "customers.people.list.columns.name": "Nazwa",

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

@@ -445,6 +445,7 @@ export class HybridQueryEngine implements QueryEngine {
       ? await this.searchSourcesHaveTokens(searchSources, opts.tenantId ?? null, orgScope)
       : false
     const searchRuntime: SearchRuntime = { ...searchRuntimeBase, searchSources, enabled: searchEnabled && hasSearchTokens }
+    const joinSearchAvailability = new Map<string, boolean>()
     const searchFilters = normalizeFilters(opts.filters).filter((filter) => filter.op === 'like' || filter.op === 'ilike')
     if (searchFilters.length) {
       this.logSearchDebug('search:init', {
@@ -591,7 +592,10 @@ export class HybridQueryEngine implements QueryEngine {
       )
     }
 
-    for (const filter of baseFilters) {
+    const regularBaseFilters = baseFilters.filter((filter) => !filter.orGroup)
+    const orGroupFilters = baseFilters.filter((filter) => filter.orGroup)
+
+    for (const filter of regularBaseFilters) {
       const fieldName = String(filter.field)
       const baseField = resolveBaseColumn(fieldName)
       if (!baseField) {
@@ -640,6 +644,61 @@ export class HybridQueryEngine implements QueryEngine {
       }
     }
 
+    const applyOrGroupedBaseFilters = (target: ResultBuilder | null): ResultBuilder | null => {
+      if (!target || orGroupFilters.length === 0) return target
+      const groups = new Map<string, BaseFilter[]>()
+      for (const filter of orGroupFilters) {
+        if (!filter.orGroup) continue
+        const existing = groups.get(filter.orGroup) ?? []
+        existing.push(filter)
+        groups.set(filter.orGroup, existing)
+      }
+      let next = target
+      for (const [, groupFilters] of groups) {
+        if (!groupFilters.length) continue
+        next = next.where((groupBuilder) => {
+          groupFilters.forEach((filter, index) => {
+            const fieldName = String(filter.field)
+            const baseField = resolveBaseColumn(fieldName)
+            const applyCondition = (conditionBuilder: ResultBuilder) => {
+              if (!baseField) {
+                this.applyIndexDocFilterFromAlias(
+                  knex,
+                  conditionBuilder,
+                  'ei',
+                  entity,
+                  fieldName,
+                  filter.op,
+                  filter.value,
+                  'b.id',
+                  searchRuntime,
+                )
+                return
+              }
+              this.applyColumnFilter(conditionBuilder, qualify(baseField), filter, {
+                ...searchRuntime,
+                knex,
+                entity,
+                field: fieldName,
+                recordIdColumn: 'b.id',
+              })
+            }
+            if (index === 0) {
+              applyCondition(groupBuilder as ResultBuilder)
+              return
+            }
+            groupBuilder.orWhere((conditionBuilder) => {
+              applyCondition(conditionBuilder as ResultBuilder)
+            })
+          })
+        })
+      }
+      return next
+    }
+
+    builder = applyOrGroupedBaseFilters(builder) ?? builder
+    optimizedCountBuilder = applyOrGroupedBaseFilters(optimizedCountBuilder)
+
     const applyAliasScopes = async (target: ResultBuilder, aliasName: string) => {
       const tableName = aliasTables.get(aliasName)
       if (!tableName) return
@@ -688,6 +747,37 @@ export class HybridQueryEngine implements QueryEngine {
       }
     }
 
+    const applyJoinSearchFilterOp = async (
+      target: ResultBuilder,
+      filter: { column: string; op: FilterOp; value?: unknown },
+      _qualified: string,
+      join: ResolvedJoin,
+    ): Promise<boolean> => {
+      if (!searchEnabled || !join.entityId) return false
+      if (!['eq', 'like', 'ilike'].includes(filter.op)) return false
+      if (typeof filter.value !== 'string' || filter.value.trim().length === 0) return false
+
+      let searchAvailable = joinSearchAvailability.get(join.entityId)
+      if (searchAvailable === undefined) {
+        searchAvailable = await this.hasSearchTokens(String(join.entityId), opts.tenantId ?? null, orgScope)
+        joinSearchAvailability.set(join.entityId, searchAvailable)
+      }
+      if (!searchAvailable) return false
+
+      const tokens = tokenizeText(String(filter.value), searchConfig)
+      if (!tokens.hashes.length) return false
+
+      return this.applySearchTokens(target, {
+        knex,
+        entity: String(join.entityId),
+        field: filter.column,
+        hashes: tokens.hashes,
+        recordIdColumn: `${join.alias}.id`,
+        tenantId: opts.tenantId ?? null,
+        organizationScope: orgScope,
+      })
+    }
+
     await applyJoinFilters({
       knex,
       baseTable,
@@ -698,6 +788,8 @@ export class HybridQueryEngine implements QueryEngine {
       qualifyBase: (column) => qualify(column),
       applyAliasScope: (target, alias) => applyAliasScopes(target, alias),
       applyFilterOp: (target, column, op, value) => applyJoinFilterOp(target as ResultBuilder, column, op, value),
+      applyJoinFilterOp: (target, filter, qualified, join) =>
+        applyJoinSearchFilterOp(target as ResultBuilder, filter, qualified, join),
       columnExists: (tbl, column) => this.columnExists(tbl, column),
     }) as ResultBuilder
 
@@ -712,6 +804,8 @@ export class HybridQueryEngine implements QueryEngine {
         qualifyBase: (column) => qualify(column),
         applyAliasScope: (target, alias) => applyAliasScopes(target, alias),
         applyFilterOp: (target, column, op, value) => applyJoinFilterOp(target as ResultBuilder, column, op, value),
+        applyJoinFilterOp: (target, filter, qualified, join) =>
+          applyJoinSearchFilterOp(target as ResultBuilder, filter, qualified, join),
         columnExists: (tbl, column) => this.columnExists(tbl, column),
       })
     }