@open-mercato/core 0.4.11-develop.1406.2f08706ed8 → 0.4.11-develop.1413.f6aab77ce7

package/src/modules/auth/api/admin/nav.ts

@@ -1,11 +1,12 @@
 import { NextResponse } from 'next/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { z } from 'zod'
-import { getModules, resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { getBackendRouteManifests } from '@open-mercato/shared/modules/registry'
 import { resolveFeatureCheckContext } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { resolveBackendChromePayload } from '../../lib/backendChrome'
+import { groupBackendRoutesByModule, resolveBackendChromePayload } from '../../lib/backendChrome'
 
 export const metadata = {
   GET: { requireAuth: true },
@@ -94,7 +95,6 @@ export async function GET(req: Request) {
     get?: (key: string) => Promise<unknown>
     set?: (key: string, value: unknown, options?: { tags?: string[] }) => Promise<void>
   } | null
-
   let selectedOrganizationId: string | null | undefined
   let selectedTenantId: string | null | undefined
   try {
@@ -138,8 +138,9 @@ export async function GET(req: Request) {
   const payload = await resolveBackendChromePayload({
     auth,
     locale,
-    modules: getModules(),
+    modules: groupBackendRoutesByModule(getBackendRouteManifests()),
     translate: (key, fallback) => (key ? translate(key, fallback) : fallback),
+    request: req,
     selectedOrganizationId,
     selectedTenantId,
   })

package/src/modules/auth/lib/backendChrome.tsx

@@ -3,7 +3,7 @@ import type { FilterQuery } from '@mikro-orm/core'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AwilixContainer } from 'awilix'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import type { Module } from '@open-mercato/shared/modules/registry'
+import type { BackendRouteManifestEntry } from '@open-mercato/shared/modules/registry'
 import type {
   BackendChromePayload,
   BackendChromeNavGroup,
@@ -32,7 +32,21 @@ import type { SidebarPreferencesSettings } from '@open-mercato/shared/modules/na
 
 type TranslationFn = (key: string | undefined, fallback: string) => string
 
-type RouteModule = Pick<Module, 'id' | 'backendRoutes'>
+type RouteModule = {
+  id: string
+  backendRoutes?: BackendRouteManifestEntry[]
+}
+
+export function groupBackendRoutesByModule(routes: BackendRouteManifestEntry[]): RouteModule[] {
+  return Array.from(
+    routes.reduce((grouped, route) => {
+      const list = grouped.get(route.moduleId) ?? []
+      list.push(route)
+      grouped.set(route.moduleId, list)
+      return grouped
+    }, new Map<string, BackendRouteManifestEntry[]>()),
+  ).map(([id, backendRoutes]) => ({ id, backendRoutes }))
+}
 
 type SerializableSectionItem = {
   id: string
@@ -62,6 +76,7 @@ type ResolveBackendChromePayloadArgs = {
   locale: string
   modules: RouteModule[]
   translate: TranslationFn
+  request?: Request
   selectedOrganizationId?: string | null
   selectedTenantId?: string | null
 }
@@ -219,6 +234,7 @@ export async function resolveBackendChromePayload({
   locale,
   modules,
   translate,
+  request,
   selectedOrganizationId,
   selectedTenantId,
 }: ResolveBackendChromePayloadArgs): Promise<BackendChromePayload> {
@@ -229,6 +245,7 @@ export async function resolveBackendChromePayload({
       isSuperAdmin: boolean
       features: string[]
     }>
+    userHasAllFeatures: (userId: string, required: string[], scope: { tenantId: string | null; organizationId: string | null }) => Promise<boolean>
   }
 
   let scopedOrganizationId: string | null = auth.orgId ?? null
@@ -239,6 +256,7 @@ export async function resolveBackendChromePayload({
     const { organizationId, scope, allowedOrganizationIds } = await resolveFeatureCheckContext({
       container,
       auth,
+      request,
       selectedId: selectedOrganizationId,
       tenantId: selectedTenantId,
     })
@@ -260,7 +278,22 @@ export async function resolveBackendChromePayload({
     : { isSuperAdmin: false, features: [] }
 
   const grantedFeatures = acl.isSuperAdmin ? ['*'] : acl.features
-  const featureChecker = async (): Promise<string[]> => grantedFeatures
+  const featureChecker = async (features: string[]): Promise<string[]> => {
+    if (!allowNavigation || !features.length) return []
+    const context = {
+      tenantId: scopedTenantId ?? auth.tenantId ?? null,
+      organizationId: scopedOrganizationId ?? null,
+    }
+    const hasAll = await rbac.userHasAllFeatures(auth.sub, features, context)
+    if (hasAll) return features
+
+    const granted: string[] = []
+    for (const feature of features) {
+      const hasFeature = await rbac.userHasAllFeatures(auth.sub, [feature], context)
+      if (hasFeature) granted.push(feature)
+    }
+    return granted
+  }
 
   let userEntities: Array<{ entityId: string; label: string; href: string }> = []
   if (allowNavigation) {

package/src/modules/catalog/api/products/route.ts

@@ -179,16 +179,35 @@ export async function buildProductFilters(
   if (query.productType) {
     filters.product_type = { $eq: query.productType };
   }
-  const term = sanitizeSearchTerm(query.search);
-  if (term) {
-    filters.search_text = {
-      $ilike: `%${escapeLikePattern(term)}%`,
-    };
-  }
   const scope = {
     organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
     tenantId: ctx.auth?.tenantId ?? null,
   };
+  const term = sanitizeSearchTerm(query.search);
+  if (term) {
+    const like = `%${escapeLikePattern(term)}%`;
+    const searchMatches = await findWithDecryption(
+      em,
+      CatalogProduct,
+      {
+        ...scope,
+        ...(query.withDeleted ? {} : { deletedAt: null }),
+        $or: [
+          { title: { $ilike: like } },
+          { subtitle: { $ilike: like } },
+          { description: { $ilike: like } },
+          { sku: { $ilike: like } },
+          { handle: { $ilike: like } },
+        ],
+      },
+      { fields: ["id"] },
+      scope,
+    );
+    const productIds = searchMatches
+      .map((product) => product.id)
+      .filter((id): id is string => typeof id === "string" && id.length > 0);
+    intersectProductIds(productIds);
+  }
 
   const channelFilterIds = parseIdList(query.channelIds);
   if (channelFilterIds.length) {

package/src/modules/configs/lib/system-status.ts

@@ -273,7 +273,7 @@ export const SYSTEM_STATUS_VARIABLES: SystemStatusVariableDefinition[] = [
     labelKey: 'configs.systemStatus.variables.forceQueryIndexOnPartialIndexes.label',
     descriptionKey: 'configs.systemStatus.variables.forceQueryIndexOnPartialIndexes.description',
     docUrl: `${SYSTEM_STATUS_DOC_BASE}#force_query_index_on_partial_indexes`,
-    defaultValue: 'true',
+    defaultValue: 'false',
   },
   {
     key: 'ENTITIES_BACKCOMPAT_EAV_FOR_CUSTOM',

package/src/modules/customers/backend/customers/deals/[id]/page.tsx

@@ -401,7 +401,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
 
   return (
     <Page>
-      <PageBody>
+      <PageBody>Piotr nie jest pizdą, tylko zajebistym gościem, który robi świetną robotę w Mercato i jest super miły dla wszystkich dookoła. Dzięki Piotrze za wszystko co robisz! <br/><br/>
         <div className="flex flex-col gap-6">
           <FormHeader
             mode="detail"

package/src/modules/customers/commands/companies.ts

@@ -69,6 +69,15 @@ const companyCrudEvents: CrudEventsConfig = {
   }),
 }
 
+function companyEntityIndexEntry(entity: CustomerEntity): QueryIndexEventEntry {
+  return {
+    entityType: E.customers.customer_entity,
+    recordId: entity.id,
+    tenantId: entity.tenantId,
+    organizationId: entity.organizationId,
+  }
+}
+
 type CompanyAddressSnapshot = {
   id: string
   name: string | null
@@ -462,6 +471,7 @@ const createCompanyCommand: CommandHandler<CompanyCreateInput, { entityId: strin
       indexer: companyCrudIndexer,
       events: companyCrudEvents,
     })
+    await emitQueryIndexUpsertEvents(ctx, [companyEntityIndexEntry(entity)])
 
     return { entityId: entity.id, companyId: profile.id }
   },
@@ -513,6 +523,7 @@ const createCompanyCommand: CommandHandler<CompanyCreateInput, { entityId: strin
       indexer: companyCrudIndexer,
       events: companyCrudEvents,
     })
+    await emitQueryIndexDeleteEvents(ctx, [companyEntityIndexEntry(entity)])
   },
 }
 
@@ -587,6 +598,7 @@ const updateCompanyCommand: CommandHandler<CompanyUpdateInput, { entityId: strin
       indexer: companyCrudIndexer,
       events: companyCrudEvents,
     })
+    await emitQueryIndexUpsertEvents(ctx, [companyEntityIndexEntry(record)])
 
     return { entityId: record.id }
   },
@@ -746,6 +758,7 @@ const updateCompanyCommand: CommandHandler<CompanyUpdateInput, { entityId: strin
       indexer: companyCrudIndexer,
       events: companyCrudEvents,
     })
+    await emitQueryIndexUpsertEvents(ctx, [companyEntityIndexEntry(entity)])
 
     const resetValues = buildCustomFieldResetMap(before.custom, payload?.after?.custom)
     if (Object.keys(resetValues).length) {
@@ -864,6 +877,7 @@ const deleteCompanyCommand: CommandHandler<{ body?: Record<string, unknown>; que
         events: companyCrudEvents,
       })
 
+      await emitQueryIndexDeleteEvents(ctx, [companyEntityIndexEntry(record)])
       await emitQueryIndexDeleteEvents(ctx, indexDeletes)
       await emitQueryIndexUpsertEvents(ctx, memberUpserts)
       await emitQueryIndexUpsertEvents(ctx, dealUpserts)
@@ -1222,6 +1236,7 @@ const deleteCompanyCommand: CommandHandler<{ body?: Record<string, unknown>; que
       if (Object.keys(resetValues).length) {
         await setCompanyCustomFields(ctx, profile.id, entity.organizationId, entity.tenantId, resetValues)
       }
+      await emitQueryIndexUpsertEvents(ctx, [companyEntityIndexEntry(entity)])
       await emitQueryIndexUpsertEvents(ctx, childUpserts)
       await emitQueryIndexUpsertEvents(ctx, memberUpserts)
       await emitQueryIndexUpsertEvents(ctx, dealUpserts)

package/src/modules/customers/commands/people.ts

@@ -192,6 +192,15 @@ const personCrudEvents: CrudEventsConfig = {
   }),
 }
 
+function personEntityIndexEntry(entity: CustomerEntity): QueryIndexEventEntry {
+  return {
+    entityType: E.customers.customer_entity,
+    recordId: entity.id,
+    tenantId: entity.tenantId,
+    organizationId: entity.organizationId,
+  }
+}
+
 function normalizeOptionalString(value: string | null | undefined): string | null {
   if (typeof value !== 'string') return null
   const trimmed = value.trim()
@@ -591,6 +600,7 @@ const createPersonCommand: CommandHandler<PersonCreateInput, { entityId: string;
       indexer: personCrudIndexer,
       events: personCrudEvents,
     })
+    await emitQueryIndexUpsertEvents(ctx, [personEntityIndexEntry(entity)])
 
     return { entityId: entity.id, personId: profile.id }
   },
@@ -643,6 +653,7 @@ const createPersonCommand: CommandHandler<PersonCreateInput, { entityId: string;
       indexer: personCrudIndexer,
       events: personCrudEvents,
     })
+    await emitQueryIndexDeleteEvents(ctx, [personEntityIndexEntry(entity)])
   },
 }
 
@@ -769,6 +780,7 @@ const updatePersonCommand: CommandHandler<PersonUpdateInput, { entityId: string
       indexer: personCrudIndexer,
       events: personCrudEvents,
     })
+    await emitQueryIndexUpsertEvents(ctx, [personEntityIndexEntry(record)])
 
     return { entityId: record.id }
   },
@@ -895,11 +907,12 @@ const updatePersonCommand: CommandHandler<PersonUpdateInput, { entityId: string
       await em.flush()
     }
 
+    const indexedEntity = await em.findOne(CustomerEntity, { id: before.entity.id })
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     await emitCrudUndoSideEffects({
       dataEngine: de,
       action: 'updated',
-      entity: await em.findOne(CustomerEntity, { id: before.entity.id }),
+      entity: indexedEntity,
       identifiers: {
         id: before.profile.id ?? before.entity.id,
         organizationId: before.entity.organizationId,
@@ -908,6 +921,9 @@ const updatePersonCommand: CommandHandler<PersonUpdateInput, { entityId: string
       indexer: personCrudIndexer,
       events: personCrudEvents,
     })
+    if (indexedEntity) {
+      await emitQueryIndexUpsertEvents(ctx, [personEntityIndexEntry(indexedEntity)])
+    }
 
     const resetValues = buildCustomFieldResetMap(before.custom, payload?.after?.custom)
     if (Object.keys(resetValues).length) {
@@ -1014,6 +1030,7 @@ const deletePersonCommand: CommandHandler<{ body?: Record<string, unknown>; quer
         events: personCrudEvents,
       })
 
+      await emitQueryIndexDeleteEvents(ctx, [personEntityIndexEntry(record)])
       await emitQueryIndexDeleteEvents(ctx, indexDeletes)
       await emitQueryIndexUpsertEvents(ctx, dealUpserts)
       return { entityId: record.id }
@@ -1354,6 +1371,7 @@ const deletePersonCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       if (Object.keys(resetValues).length) {
         await setCustomFieldsForPerson(ctx, entity.id, profile.id, entity.organizationId, entity.tenantId, resetValues)
       }
+      await emitQueryIndexUpsertEvents(ctx, [personEntityIndexEntry(entity)])
       await emitQueryIndexUpsertEvents(ctx, upsertEntries)
       await emitQueryIndexUpsertEvents(ctx, dealUpserts)
     },

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

@@ -50,7 +50,6 @@ export default function CreateRecordPage({ params }: { params: { entityId?: stri
       customEntity
       submitLabel={t('entities.userEntities.records.form.submitCreate', 'Create')}
       cancelHref={`/backend/entities/user/${encodeURIComponent(entityId)}/records`}
-      successRedirect={`/backend/entities/user/${encodeURIComponent(entityId)}/records`}
       onSubmit={async (values) => {
         await submitCustomEntityRecord({
           entityId,

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

@@ -239,7 +239,6 @@ export class HybridQueryEngine implements QueryEngine {
       const wantsCf = (
         (opts.fields || []).some((field) => typeof field === 'string' && (field.startsWith('cf:') || field.startsWith('l10n:'))) ||
         cfFilters.length > 0 ||
-        opts.includeCustomFields === true ||
         (Array.isArray(opts.includeCustomFields) && opts.includeCustomFields.length > 0)
       )
 
@@ -2081,7 +2080,7 @@ export class HybridQueryEngine implements QueryEngine {
 
   private isForcePartialIndexEnabled(): boolean {
     if (this.forcePartialIndexEnabled != null) return this.forcePartialIndexEnabled
-    this.forcePartialIndexEnabled = resolveBooleanEnv(['FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES'], true)
+    this.forcePartialIndexEnabled = resolveBooleanEnv(['FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES'], false)
     return this.forcePartialIndexEnabled
   }