@open-mercato/core 0.6.6-develop.6403.1.b57089b6fe → 0.6.6-develop.6406.1.a0bd770daf

package/src/modules/catalog/widgets/injection/product-seo/state.ts

@@ -1,9 +1,26 @@
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+
 export type ProductSeoValidationPayload = {
   ok: boolean
   issues: string[]
   message?: string
 }
 
+// The `onBeforeSave` validation hook (widget.ts) is a plain side-effect handler
+// with no React context, so it cannot call `useT`. The widget component (which
+// does have `useT`) publishes its translator here on mount; the hook reads it to
+// localize the save-block message (#3299). Undefined until the widget mounts —
+// callers fall back to English via `evaluateProductSeo`'s default translator.
+let productSeoTranslator: TranslateFn | null = null
+
+export function setProductSeoTranslator(t: TranslateFn | null) {
+  productSeoTranslator = t
+}
+
+export function getProductSeoTranslator(): TranslateFn | undefined {
+  return productSeoTranslator ?? undefined
+}
+
 type Listener = (payload: ProductSeoValidationPayload) => void
 
 const listeners = new Set<Listener>()

package/src/modules/catalog/widgets/injection/product-seo/validation.ts

@@ -1,3 +1,5 @@
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+
 export type ProductSeoEvaluation = {
   ok: boolean
   issues: string[]
@@ -5,42 +7,63 @@ export type ProductSeoEvaluation = {
   message?: string
 }
 
-const MESSAGE_PREFIX = 'SEO helper: '
+// English-fallback translator: keeps this pure module usable (and unit-testable)
+// when no real `t` is threaded in — every string still ships its English default,
+// interpolating `{{param}}` placeholders the same way the real translator does.
+const englishFallback: TranslateFn = (_key, fallbackOrParams, params) => {
+  const template = typeof fallbackOrParams === 'string' ? fallbackOrParams : ''
+  const resolvedParams = typeof fallbackOrParams === 'string' ? params : fallbackOrParams
+  if (!resolvedParams) return template
+  return template.replace(/\{\{(\w+)\}\}|\{(\w+)\}/g, (match, doubleKey, singleKey) => {
+    const key = doubleKey ?? singleKey
+    const value = resolvedParams[key]
+    return value === undefined ? match : String(value)
+  })
+}
+
+const K = 'catalog.products.create.seoWidget.validation'
 
-export function buildSeoBlockMessage(issues: string[]): string {
-  if (issues.length === 1) return `${MESSAGE_PREFIX}${issues[0]}`
-  if (issues.length <= 3) return `${MESSAGE_PREFIX}${issues.join(' ')}`
-  return `${MESSAGE_PREFIX}${issues.length} issues found. ${issues.slice(0, 2).join(' ')}`
+export function buildSeoBlockMessage(issues: string[], t: TranslateFn = englishFallback): string {
+  if (issues.length <= 3) {
+    return t(`${K}.block.list`, 'SEO helper: {{issues}}', { issues: issues.join(' ') })
+  }
+  return t(`${K}.block.summary`, 'SEO helper: {{count}} issues found. {{issues}}', {
+    count: issues.length,
+    issues: issues.slice(0, 2).join(' '),
+  })
 }
 
-export function evaluateProductSeo(data: Record<string, unknown> | null | undefined): ProductSeoEvaluation {
+export function evaluateProductSeo(
+  data: Record<string, unknown> | null | undefined,
+  t: TranslateFn = englishFallback,
+): ProductSeoEvaluation {
   const issues: string[] = []
   const fieldErrors: Record<string, string> = {}
 
   const title = (data?.title as unknown) || (data?.name as unknown)
   if (typeof title === 'string' && title.length > 0) {
     if (title.length < 10) {
-      issues.push('Title is too short (min 10 characters).')
-      fieldErrors.title = 'Title is too short for good SEO (min 10 characters).'
+      issues.push(t(`${K}.issue.titleTooShort`, 'Title is too short (min 10 characters).'))
+      fieldErrors.title = t(`${K}.fieldError.titleTooShort`, 'Title is too short for good SEO (min 10 characters).')
     } else if (title.length > 60) {
-      issues.push('Title is too long (max 60 characters recommended).')
-      fieldErrors.title = 'Title is too long for optimal SEO (max 60 characters).'
+      issues.push(t(`${K}.issue.titleTooLong`, 'Title is too long (max 60 characters recommended).'))
+      fieldErrors.title = t(`${K}.fieldError.titleTooLong`, 'Title is too long for optimal SEO (max 60 characters).')
     }
   }
 
   const description = data?.description
   if (typeof description === 'string') {
     if (description.trim().length === 0) {
-      issues.push('Add a product description for better SEO.')
-      fieldErrors.description = 'Provide a description to help search engines understand this product.'
+      issues.push(t(`${K}.issue.descriptionMissing`, 'Add a product description for better SEO.'))
+      fieldErrors.description = t(`${K}.fieldError.descriptionMissing`, 'Provide a description to help search engines understand this product.')
     } else if (description.length < 50) {
-      issues.push('Description is too short (min 50 characters).')
-      fieldErrors.description = 'Description is too short for good SEO (min 50 characters).'
+      issues.push(t(`${K}.issue.descriptionTooShort`, 'Description is too short (min 50 characters).'))
+      fieldErrors.description = t(`${K}.fieldError.descriptionTooShort`, 'Description is too short for good SEO (min 50 characters).')
     }
   }
 
   if (issues.length) {
-    return { ok: false, issues, fieldErrors, message: buildSeoBlockMessage(issues) }
+    return { ok: false, issues, fieldErrors, message: buildSeoBlockMessage(issues, t) }
   }
 
   return { ok: true, issues: [], fieldErrors: {} }

package/src/modules/catalog/widgets/injection/product-seo/widget.client.tsx

@@ -1,7 +1,7 @@
 "use client"
 import * as React from 'react'
 import type { InjectionWidgetComponentProps } from '@open-mercato/shared/modules/widgets/injection'
-import { subscribeProductSeoValidation } from './state'
+import { subscribeProductSeoValidation, setProductSeoTranslator } from './state'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitives/status-badge'
 import { Alert } from '@open-mercato/ui/primitives/alert'
@@ -36,6 +36,12 @@ function computeIssueKeys(title: string, description: string): IssueKey[] {
 
 export default function ProductSeoWidget({ data }: InjectionWidgetComponentProps<unknown, SeoData>) {
   const t = useT()
+  // Expose the translator to the module's `onBeforeSave` hook (which has no React
+  // context) so the save-block message is localized (#3299).
+  React.useEffect(() => {
+    setProductSeoTranslator(t)
+    return () => setProductSeoTranslator(null)
+  }, [t])
   const title = (data?.title || data?.name || '') ?? ''
   const description = data?.description ?? ''
   const baselineIssueKeys = React.useMemo(() => computeIssueKeys(title, description), [title, description])

package/src/modules/catalog/widgets/injection/product-seo/widget.ts

@@ -1,6 +1,6 @@
 import type { InjectionWidgetModule } from '@open-mercato/shared/modules/widgets/injection'
 import ProductSeoWidget from './widget.client'
-import { publishProductSeoValidation } from './state'
+import { publishProductSeoValidation, getProductSeoTranslator } from './state'
 import { evaluateProductSeo } from './validation'
 
 const widget: InjectionWidgetModule<any, any> = {
@@ -16,7 +16,7 @@ const widget: InjectionWidgetModule<any, any> = {
   Widget: ProductSeoWidget,
   eventHandlers: {
     onBeforeSave: async (data) => {
-      const evaluation = evaluateProductSeo(data as Record<string, unknown>)
+      const evaluation = evaluateProductSeo(data as Record<string, unknown>, getProductSeoTranslator())
 
       if (!evaluation.ok) {
         publishProductSeoValidation({ ok: false, issues: evaluation.issues, message: evaluation.message })

package/src/modules/customers/api/pipeline-stages/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CustomerPipelineStage, CustomerDictionaryEntry } from '../../data/entities'
@@ -56,15 +57,16 @@ async function buildContext(
 
 export async function GET(req: Request) {
   try {
-    const { ctx, organizationId, tenantId, translate } = await buildContext(req)
-    if (!organizationId || !tenantId) {
+    const { ctx, tenantId, translate } = await buildContext(req)
+    if (!tenantId) {
       return NextResponse.json({ error: translate('customers.errors.context_required', 'Organization and tenant context required') }, { status: 400 })
     }
+    const orgFilter = resolveOrganizationScopeFilter(ctx.organizationScope, ctx.auth)
     const url = new URL(req.url)
     const pipelineId = url.searchParams.get('pipelineId')
 
     const em = (ctx.container.resolve('em') as EntityManager)
-    const where: Record<string, unknown> = { organizationId, tenantId }
+    const where: Record<string, unknown> = { tenantId, ...orgFilter.where }
     if (pipelineId) where.pipelineId = pipelineId
 
     const stages = await em.find(CustomerPipelineStage, where, { orderBy: { order: 'ASC' } })
@@ -72,8 +74,8 @@ export async function GET(req: Request) {
     const stageLabels = stages.map((s) => s.label.trim().toLowerCase())
     const dictEntries = stageLabels.length
       ? await em.find(CustomerDictionaryEntry, {
-          organizationId,
           tenantId,
+          ...orgFilter.where,
           kind: 'pipeline_stage',
           normalizedValue: { $in: stageLabels },
         })

package/src/modules/customers/api/pipelines/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandRuntimeContext, CommandBus } from '@open-mercato/shared/lib/commands'
 import { CustomerPipeline } from '../../data/entities'
@@ -56,15 +57,16 @@ async function buildContext(
 
 export async function GET(req: Request) {
   try {
-    const { ctx, organizationId, tenantId, translate } = await buildContext(req)
-    if (!organizationId || !tenantId) {
+    const { ctx, tenantId, translate } = await buildContext(req)
+    if (!tenantId) {
       return NextResponse.json({ error: translate('customers.errors.context_required', 'Organization and tenant context required') }, { status: 400 })
     }
+    const orgFilter = resolveOrganizationScopeFilter(ctx.organizationScope, ctx.auth)
     const url = new URL(req.url)
     const isDefaultParam = url.searchParams.get('isDefault')
 
     const em = (ctx.container.resolve('em') as EntityManager)
-    const where: Record<string, unknown> = { organizationId, tenantId }
+    const where: Record<string, unknown> = { tenantId, ...orgFilter.where }
     if (isDefaultParam === 'true') where.isDefault = true
     if (isDefaultParam === 'false') where.isDefault = false
 

package/src/modules/staff/api/team-members/assignable/route.ts

@@ -6,6 +6,7 @@ import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { createPagedListResponseSchema as createSharedPagedListResponseSchema } from '@open-mercato/shared/lib/openapi/crud'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { User } from '@open-mercato/core/modules/auth/data/entities'
 import {
   resolveAuthActorId,
@@ -57,7 +58,7 @@ export const metadata = {
 async function canAccessAssignableStaff(
   rbac: RbacService | undefined,
   userId: string,
-  scope: { tenantId: string; organizationId: string },
+  scope: { tenantId: string; organizationId: string | null },
 ): Promise<boolean> {
   if (!rbac) return false
   if (
@@ -72,18 +73,13 @@ export async function GET(request: Request) {
   const { translate } = await resolveTranslations()
   try {
     const query = querySchema.parse(Object.fromEntries(new URL(request.url).searchParams))
-    const { container, em, auth, selectedOrganizationId } = await resolveCustomersRequestContext(request)
+    const { container, em, auth, scope: organizationScope } = await resolveCustomersRequestContext(request)
 
-    if (!selectedOrganizationId) {
-      throw new CrudHttpError(
-        400,
-        { error: translate('customers.errors.organization_required', 'Organization context is required') },
-      )
-    }
+    const orgFilter = resolveOrganizationScopeFilter(organizationScope, auth)
 
     const actorId = resolveAuthActorId(auth)
     const rbacService = container.resolve('rbacService') as RbacService | undefined
-    const scope = { tenantId: auth.tenantId, organizationId: selectedOrganizationId }
+    const scope = { tenantId: auth.tenantId, organizationId: orgFilter.rbacOrganizationId }
     const hasAccess = await canAccessAssignableStaff(rbacService, actorId, scope)
     if (!hasAccess) {
       throw new CrudHttpError(
@@ -104,7 +100,7 @@ export async function GET(request: Request) {
       StaffTeamMember,
       {
         tenantId: auth.tenantId,
-        organizationId: selectedOrganizationId,
+        ...orgFilter.where,
         deletedAt: null,
         isActive: true,
       },
@@ -136,7 +132,7 @@ export async function GET(request: Request) {
               id: { $in: userIds },
               deletedAt: null,
               tenantId: auth.tenantId,
-              organizationId: selectedOrganizationId,
+              ...orgFilter.where,
             },
             undefined,
             scope,
@@ -150,7 +146,7 @@ export async function GET(request: Request) {
               id: { $in: teamIds },
               deletedAt: null,
               tenantId: auth.tenantId,
-              organizationId: selectedOrganizationId,
+              ...orgFilter.where,
             },
             undefined,
             scope,