@open-mercato/core 0.9.1-develop.7498.1.08d233a6cc → 0.9.1-develop.7513.1.ae2715553f

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

@@ -337,5 +337,6 @@
   "ecommerce.validation.pathPrefixInvalid": "Path prefix may contain only lowercase letters, digits, dashes and slashes, for example /shop.",
   "ecommerce.validation.slugInvalid": "Slug may contain only lowercase letters, digits and single dashes between them.",
   "ecommerce.validation.urlInvalid": "Enter a valid http(s) URL or a path starting with /.",
-  "notifications.categories.ecommerce": "Ecommerce"
+  "notifications.categories.ecommerce": "Ecommerce",
+  "search.entityType.ecommerce.ecommerce_store": "Store"
 }

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

@@ -337,5 +337,6 @@
   "ecommerce.validation.pathPrefixInvalid": "El prefijo de ruta solo puede contener letras minúsculas, dígitos, guiones y barras, por ejemplo /shop.",
   "ecommerce.validation.slugInvalid": "El slug solo puede contener letras minúsculas, dígitos y guiones simples entre ellos.",
   "ecommerce.validation.urlInvalid": "Introduce una URL http(s) válida o una ruta que empiece por /.",
-  "notifications.categories.ecommerce": "Comercio electrónico"
+  "notifications.categories.ecommerce": "Comercio electrónico",
+  "search.entityType.ecommerce.ecommerce_store": "Tienda"
 }

package/src/modules/ecommerce/i18n/ko.json

@@ -337,5 +337,6 @@
   "ecommerce.validation.pathPrefixInvalid": "경로 접두사에는 영문 소문자, 숫자, 하이픈, 슬래시만 사용할 수 있습니다(예: /shop).",
   "ecommerce.validation.slugInvalid": "슬러그에는 영문 소문자, 숫자와 그 사이의 단일 하이픈만 사용할 수 있습니다.",
   "ecommerce.validation.urlInvalid": "유효한 http(s) URL 또는 /로 시작하는 경로를 입력하세요.",
-  "notifications.categories.ecommerce": "이커머스"
+  "notifications.categories.ecommerce": "이커머스",
+  "search.entityType.ecommerce.ecommerce_store": "스토어"
 }

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

@@ -337,5 +337,6 @@
   "ecommerce.validation.pathPrefixInvalid": "Prefiks ścieżki może zawierać tylko małe litery, cyfry, myślniki i ukośniki, np. /shop.",
   "ecommerce.validation.slugInvalid": "Slug może zawierać tylko małe litery, cyfry i pojedyncze myślniki między nimi.",
   "ecommerce.validation.urlInvalid": "Podaj prawidłowy adres URL http(s) lub ścieżkę zaczynającą się od /.",
-  "notifications.categories.ecommerce": "E-commerce"
+  "notifications.categories.ecommerce": "E-commerce",
+  "search.entityType.ecommerce.ecommerce_store": "Sklep"
 }

package/src/modules/ecommerce/search.ts

@@ -39,7 +39,6 @@ function buildStorePresenter(
     title,
     subtitle: subtitleParts.length ? subtitleParts.join(' · ') : undefined,
     icon: 'store',
-    badge,
   }
 }
 

package/src/modules/staff/backend/staff/time-tracking/entries/page.tsx

@@ -353,7 +353,7 @@ export default function TimeTrackingEntriesPage() {
         }
       }
       const [selfRes, projectsRes, tagsRes, peopleRes] = await Promise.all([
-        safeCall<{ member?: { id?: string } | null }>('/api/staff/team-members/self'),
+        safeCall<{ member?: { id?: string; displayName?: string } | null }>('/api/staff/team-members/self'),
         safeCall<{ items?: Array<Record<string, unknown>> }>('/api/staff/timesheets/time-projects?page=1&pageSize=100'),
         safeCall<{ items?: Array<Record<string, unknown>> }>('/api/staff/timesheets/tags?page=1&pageSize=100'),
         safeCall<{ items?: Array<Record<string, unknown>> }>('/api/staff/team-members?page=1&pageSize=100'),
@@ -399,19 +399,25 @@ export default function TimeTrackingEntriesPage() {
       )
 
       const people = peopleRes?.ok && Array.isArray(peopleRes.result?.items) ? peopleRes.result.items : []
-      setPeopleOptions(
-        people
-          .map((row: Record<string, unknown>) => {
-            const id = typeof row.id === 'string' ? row.id : null
-            const label = typeof row.display_name === 'string'
-              ? row.display_name
-              : typeof row.displayName === 'string'
-                ? row.displayName
-                : null
-            return id && label ? { value: id, label } : null
-          })
-          .filter((option): option is { value: string; label: string } => option !== null),
-      )
+      const personOptions = people
+        .map((row: Record<string, unknown>) => {
+          const id = typeof row.id === 'string' ? row.id : null
+          const label = typeof row.display_name === 'string'
+            ? row.display_name
+            : typeof row.displayName === 'string'
+              ? row.displayName
+              : null
+          return id && label ? { value: id, label } : null
+        })
+        .filter((option): option is { value: string; label: string } => option !== null)
+      // The team list is closed to a caller without team-member access, yet the
+      // self filter is seeded for everyone — name it from the self lookup so its
+      // chip never falls back to the raw member id.
+      const selfName = selfRes?.ok ? selfRes.result?.member?.displayName : undefined
+      if (selfId && selfName && !personOptions.some((option) => option.value === selfId)) {
+        personOptions.push({ value: selfId, label: selfName })
+      }
+      setPeopleOptions(personOptions)
     })()
     return () => { cancelled = true }
   }, [scopeVersion])

package/src/modules/wms/api/interceptors.ts

@@ -1,4 +1,5 @@
 import type { ApiInterceptor } from '@open-mercato/shared/lib/crud/api-interceptor'
+import { E } from '#generated/entities.ids.generated'
 import {
   decodeCatalogInventoryProfileIntent,
   WMS_CATALOG_PROFILE_HEADER,
@@ -35,6 +36,12 @@ export const interceptors: ApiInterceptor[] = [
       if (!rawHeader) return { ok: true }
 
       const intent = decodeCatalogInventoryProfileIntent(rawHeader)
+      // CrudForm scopes `onBeforeSave` request headers around the whole
+      // `onSubmit` callback, so a page whose submit handler also creates
+      // other records (e.g. the product-create wizard implicitly creating
+      // its default variant) can leak this header onto those unrelated
+      // requests. Only honor an intent the product form itself computed.
+      if (intent?.sourceEntityId !== E.catalog.catalog_product) return { ok: true }
       return {
         ok: true,
         metadata: { intent, target: 'product' },
@@ -74,6 +81,8 @@ export const interceptors: ApiInterceptor[] = [
       if (!rawHeader) return { ok: true }
 
       const intent = decodeCatalogInventoryProfileIntent(rawHeader)
+      // See the product interceptor's `before` for why this check exists.
+      if (intent?.sourceEntityId !== E.catalog.catalog_product_variant) return { ok: true }
       return {
         ok: true,
         metadata: { intent, target: 'variant' },

package/src/modules/wms/commands/configuration.ts

@@ -1532,6 +1532,28 @@ function restoreInventoryProfileFromSnapshot(em: EntityManager, before: ProductI
   record.deletedAt = null
 }
 
+type InventoryProfileEventSource = {
+  id: string
+  catalogProductId: string
+  catalogVariantId?: string | null
+  tenantId: string
+  organizationId: string
+}
+
+function emitInventoryProfileEvent(
+  eventId: 'wms.inventory_profile.created' | 'wms.inventory_profile.updated' | 'wms.inventory_profile.deleted',
+  profile: InventoryProfileEventSource,
+): void {
+  void emitWmsEvent(eventId, {
+    id: profile.id,
+    profileId: profile.id,
+    catalogProductId: profile.catalogProductId,
+    catalogVariantId: profile.catalogVariantId ?? null,
+    tenantId: profile.tenantId,
+    organizationId: profile.organizationId,
+  }).catch(() => undefined)
+}
+
 const createProductInventoryProfileCommand: CommandHandler<ProductInventoryProfileCreateInput, { profileId: string }> = {
   id: 'wms.inventoryProfiles.create',
   async execute(rawInput, ctx) {
@@ -1555,14 +1577,7 @@ const createProductInventoryProfileCommand: CommandHandler<ProductInventoryProfi
       metadata: toJsonValue(parsed.metadata),
     })
     await em.persist(profile).flush()
-    void emitWmsEvent('wms.inventory_profile.created', {
-      id: profile.id,
-      profileId: profile.id,
-      catalogProductId: profile.catalogProductId,
-      catalogVariantId: profile.catalogVariantId ?? null,
-      tenantId: profile.tenantId,
-      organizationId: profile.organizationId,
-    }).catch(() => undefined)
+    emitInventoryProfileEvent('wms.inventory_profile.created', profile)
     return { profileId: profile.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -1591,6 +1606,7 @@ const createProductInventoryProfileCommand: CommandHandler<ProductInventoryProfi
     ensureOrganizationScope(ctx, record.organizationId)
     record.deletedAt = new Date()
     await em.flush()
+    emitInventoryProfileEvent('wms.inventory_profile.deleted', record)
   },
 }
 
@@ -1629,14 +1645,7 @@ const updateProductInventoryProfileCommand: CommandHandler<ProductInventoryProfi
     if (parsed.safetyStock !== undefined) profile.safetyStock = toNumericString(parsed.safetyStock)
     if (parsed.metadata !== undefined) profile.metadata = toJsonValue(parsed.metadata)
     await em.flush()
-    void emitWmsEvent('wms.inventory_profile.updated', {
-      id: profile.id,
-      profileId: profile.id,
-      catalogProductId: profile.catalogProductId,
-      catalogVariantId: profile.catalogVariantId ?? null,
-      tenantId: profile.tenantId,
-      organizationId: profile.organizationId,
-    }).catch(() => undefined)
+    emitInventoryProfileEvent('wms.inventory_profile.updated', profile)
     return { profileId: profile.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -1686,6 +1695,7 @@ const updateProductInventoryProfileCommand: CommandHandler<ProductInventoryProfi
       restoreInventoryProfileFromSnapshot(em, before, record)
     }
     await em.flush()
+    emitInventoryProfileEvent('wms.inventory_profile.updated', before)
   },
 }
 
@@ -1703,6 +1713,7 @@ const deleteProductInventoryProfileCommand: CommandHandler<{ id?: string }, { pr
     const profile = await loadProfile(em, ctx, profileId)
     profile.deletedAt = new Date()
     await em.flush()
+    emitInventoryProfileEvent('wms.inventory_profile.deleted', profile)
     return { profileId: profile.id }
   },
   buildLog: async ({ input, result, ctx, snapshots }) => {
@@ -1747,6 +1758,7 @@ const deleteProductInventoryProfileCommand: CommandHandler<{ id?: string }, { pr
       restoreInventoryProfileFromSnapshot(em, before, record)
     }
     await em.flush()
+    emitInventoryProfileEvent('wms.inventory_profile.created', before)
   },
 }
 

package/src/modules/wms/events.ts

@@ -9,6 +9,7 @@ const events = [
   { id: 'wms.location.updated', label: 'Warehouse Location Updated', entity: 'location', category: 'crud' },
   { id: 'wms.inventory_profile.created', label: 'Inventory Profile Created', entity: 'inventory_profile', category: 'crud' },
   { id: 'wms.inventory_profile.updated', label: 'Inventory Profile Updated', entity: 'inventory_profile', category: 'crud' },
+  { id: 'wms.inventory_profile.deleted', label: 'Inventory Profile Deleted', entity: 'inventory_profile', category: 'crud' },
   { id: 'wms.inventory_balance.created', label: 'Inventory Balance Created', entity: 'inventory_balance', category: 'crud' },
   { id: 'wms.inventory_balance.updated', label: 'Inventory Balance Updated', entity: 'inventory_balance', category: 'crud' },
   { id: 'wms.inventory_balance.deleted', label: 'Inventory Balance Deleted', entity: 'inventory_balance', category: 'crud' },

package/src/modules/wms/lib/catalogInventoryProfileIntent.ts

@@ -3,6 +3,15 @@ import { z } from 'zod'
 const inventoryStrategySchema = z.enum(['fifo', 'lifo', 'fefo'])
 
 export const catalogInventoryProfileIntentSchema = z.object({
+  // Identifies which host CrudForm (product vs. variant) computed this intent.
+  // CrudForm scopes `onBeforeSave` request headers around the whole `onSubmit`
+  // callback, not around a single HTTP call, so a page whose submit handler
+  // creates secondary records (e.g. the product-create wizard implicitly
+  // creating its default variant) can leak this header onto those unrelated
+  // requests. Each interceptor only acts when this matches its own target
+  // entity, so a leaked intent is ignored rather than creating a profile the
+  // user never asked for on that other entity.
+  sourceEntityId: z.string(),
   manageInventory: z.boolean(),
   defaultUom: z.string().trim().max(32).nullable().optional(),
   defaultStrategy: inventoryStrategySchema.optional(),

package/src/modules/wms/widgets/injection/catalog-inventory-profile/widget.ts

@@ -1,4 +1,4 @@
-import type { InjectionFieldWidget } from '@open-mercato/shared/modules/widgets/injection'
+import type { InjectionContext, InjectionFieldWidget } from '@open-mercato/shared/modules/widgets/injection'
 import {
   encodeCatalogInventoryProfileIntent,
   WMS_CATALOG_PROFILE_HEADER,
@@ -29,8 +29,9 @@ function readNumber(value: unknown): number | undefined {
   return undefined
 }
 
-function buildIntent(data: RecordLike): CatalogInventoryProfileIntent {
+function buildIntent(data: RecordLike, sourceEntityId: string): CatalogInventoryProfileIntent {
   return {
+    sourceEntityId,
     manageInventory: readBoolean(data['wms.manageInventory']),
     defaultUom: readString(data['wms.defaultUom']).trim() || null,
     defaultStrategy: (() => {
@@ -47,6 +48,10 @@ function buildIntent(data: RecordLike): CatalogInventoryProfileIntent {
   }
 }
 
+function hasLoadedInventoryProfile(data: RecordLike): boolean {
+  return Boolean(asRecord(asRecord(data._wms)?.inventoryProfile))
+}
+
 function buildDisplayState(data: RecordLike): RecordLike {
   const wms = asRecord(data._wms)
   const inventoryProfile = asRecord(wms?.inventoryProfile)
@@ -170,12 +175,16 @@ const widget: InjectionFieldWidget = {
       if (!source) return data
       return buildDisplayState(source) as typeof data
     },
-    async onBeforeSave(data) {
+    async onBeforeSave(data, context: InjectionContext) {
       const source = asRecord(data)
       if (!source) return { ok: true }
 
-      const intent = buildIntent(source)
+      const sourceEntityId = readString(context?.entityId)
+      const intent = buildIntent(source, sourceEntityId)
       if (!intent.manageInventory) {
+        if (source['wms.manageInventory'] !== false || !hasLoadedInventoryProfile(source)) {
+          return { ok: true }
+        }
         return {
           ok: true,
           requestHeaders: {