@open-mercato/core 0.10.1-develop.7841.1.af87ac614d → 0.10.1-develop.7847.1.7d83dc5794

package/src/modules/auth/backend/users/page.tsx

@@ -21,6 +21,7 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
+import { ErrorMessage } from '@open-mercato/ui/backend/detail'
 
 type Row = {
   id: string
@@ -348,7 +349,7 @@ export default function UsersListPage() {
     return p.toString()
   }, [filterValues.name, page, search, organizationId, normalizedRoleIds])
 
-  const { data: usersData, isLoading } = useQuery({
+  const { data: usersData, isLoading, isPending, isFetching, isError, errorUpdatedAt, refetch } = useQuery({
     queryKey: ['users', params, scopeVersion],
     queryFn: async () => {
       const call = await apiCall<{ items: Row[]; total: number; totalPages: number; totalIsCapped?: boolean; isSuperAdmin?: boolean }>(
@@ -361,6 +362,7 @@ export default function UsersListPage() {
     },
   })
 
+  const hasLoadError = isError || (isPending && errorUpdatedAt > 0)
   const rows = usersData?.items || []
   const total = usersData?.total || 0
   const totalPages = usersData?.totalPages || 1
@@ -459,7 +461,17 @@ export default function UsersListPage() {
             ]} />
           )}
           pagination={{ page, pageSize: 50, total, totalPages, totalIsCapped, onPageChange: setPage }}
-          isLoading={isLoading}
+          isLoading={isLoading && !hasLoadError}
+          error={hasLoadError ? (
+            <ErrorMessage
+              label={t('auth.users.list.error.load', 'Failed to load users')}
+              action={(
+                <Button type="button" variant="outline" disabled={isFetching} onClick={() => { void refetch() }}>
+                  {t('auth.users.list.actions.retry', 'Retry')}
+                </Button>
+              )}
+            />
+          ) : null}
         />
       </PageBody>
       {ConfirmDialogElement}

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

@@ -710,6 +710,7 @@
   "auth.users.form.loading": "Benutzerdaten werden geladen...",
   "auth.users.form.title.create": "Benutzer erstellen",
   "auth.users.form.title.edit": "Benutzer bearbeiten",
+  "auth.users.list.actions.retry": "Erneut versuchen",
   "auth.users.list.columns.email": "E-Mail",
   "auth.users.list.columns.name": "Anzeigename",
   "auth.users.list.columns.organization": "Organisation",

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

@@ -710,6 +710,7 @@
   "auth.users.form.loading": "Loading user data...",
   "auth.users.form.title.create": "Create User",
   "auth.users.form.title.edit": "Edit User",
+  "auth.users.list.actions.retry": "Retry",
   "auth.users.list.columns.email": "Email",
   "auth.users.list.columns.name": "Display name",
   "auth.users.list.columns.organization": "Organization",

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

@@ -710,6 +710,7 @@
   "auth.users.form.loading": "Cargando datos del usuario...",
   "auth.users.form.title.create": "Crear usuario",
   "auth.users.form.title.edit": "Editar usuario",
+  "auth.users.list.actions.retry": "Reintentar",
   "auth.users.list.columns.email": "Correo electrónico",
   "auth.users.list.columns.name": "Nombre visible",
   "auth.users.list.columns.organization": "Organización",

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

@@ -710,6 +710,7 @@
   "auth.users.form.loading": "사용자 데이터를 불러오는 중...",
   "auth.users.form.title.create": "사용자 생성",
   "auth.users.form.title.edit": "사용자 편집",
+  "auth.users.list.actions.retry": "다시 시도",
   "auth.users.list.columns.email": "이메일",
   "auth.users.list.columns.name": "표시 이름",
   "auth.users.list.columns.organization": "조직",

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

@@ -710,6 +710,7 @@
   "auth.users.form.loading": "Ładowanie danych użytkownika...",
   "auth.users.form.title.create": "Utwórz użytkownika",
   "auth.users.form.title.edit": "Edytuj użytkownika",
+  "auth.users.list.actions.retry": "Spróbuj ponownie",
   "auth.users.list.columns.email": "Email",
   "auth.users.list.columns.name": "Nazwa wyświetlana",
   "auth.users.list.columns.organization": "Organizacja",

package/src/modules/catalog/commands/products.ts

@@ -688,6 +688,7 @@ function ensureSchemaName(
 
 async function assignOptionSchemaTemplate(
   em: EntityManager,
+  lookupEm: EntityManager,
   product: CatalogProduct,
   schema: CatalogProductOptionSchema,
   preferredName?: string | null,
@@ -703,7 +704,7 @@ async function assignOptionSchemaTemplate(
   });
   let template = product.optionSchemaTemplate ?? null;
   if (!template) {
-    template = await em.findOne(CatalogOptionSchemaTemplate, {
+    template = await lookupEm.findOne(CatalogOptionSchemaTemplate, {
       organizationId: product.organizationId,
       tenantId: product.tenantId,
       code: templateCode,
@@ -1606,6 +1607,7 @@ const createProductCommand: CommandHandler<
       record.optionSchemaTemplate = optionSchemaTemplate;
     } else if (optionSchemaDefinition) {
       optionSchemaTemplate = await assignOptionSchemaTemplate(
+        em,
         em,
         record,
         optionSchemaDefinition,
@@ -2029,6 +2031,7 @@ const updateProductCommand: CommandHandler<
     if (optionSchemaDefinition) {
       await assignOptionSchemaTemplate(
         em,
+        lookupEm,
         record,
         optionSchemaDefinition,
         optionSchemaDefinition.name ?? parsed.title ?? record.title,

package/src/modules/directory/api/organization-branding/route.ts

@@ -17,7 +17,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { Organization } from '@open-mercato/core/modules/directory/data/entities'
 import { organizationUpdateSchema } from '@open-mercato/core/modules/directory/data/validators'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { resolveSingleOrganizationIdOrDeny } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
+import { isExplicitlyEmptyOrganizationScope } from '@open-mercato/shared/lib/auth/organizationScope'
 import '@open-mercato/core/modules/directory/commands/organizations'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
@@ -82,15 +82,12 @@ async function resolveCurrentOrganization(req: Request) {
 
   const container = await createRequestContainer()
   const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
-  let organizationId: string | null
-  try {
-    organizationId = resolveSingleOrganizationIdOrDeny(scope, auth)
-  } catch (error) {
-    if (isCrudHttpError(error)) {
-      return { response: NextResponse.json(error.body, { status: error.status }) }
+  if (isExplicitlyEmptyOrganizationScope(scope)) {
+    return {
+      response: NextResponse.json({ error: translate('api.errors.forbidden', 'Forbidden') }, { status: 403 }),
     }
-    throw error
   }
+  const organizationId = scope.selectedId
   const tenantId = scope.tenantId ?? auth.tenantId ?? null
   if (!organizationId || !tenantId) {
     return {

package/src/modules/directory/backend/directory/branding/page.tsx

@@ -15,7 +15,8 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { SwitchField } from '@open-mercato/ui/primitives/switch-field'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { useOrganizationScopeDetail, useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { getCurrentOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/organizationEvents'
 
 type BrandingPayload = {
   organizationId: string
@@ -42,6 +43,7 @@ export default function OrganizationBrandingPage() {
   const t = useT()
   const queryClient = useQueryClient()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
+  const scopeVersion = useOrganizationScopeVersion()
   const [logoUrl, setLogoUrl] = React.useState('')
   const [logoPreserveAspectRatio, setLogoPreserveAspectRatio] = React.useState(false)
   const [selectedFile, setSelectedFile] = React.useState<File | null>(null)
@@ -67,7 +69,8 @@ export default function OrganizationBrandingPage() {
     setLogoUrl(data?.logoUrl ?? '')
     setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false)
     setSelectedFile(null)
-  }, [data?.logoPreserveAspectRatio, data?.logoUrl, organizationId, tenantId])
+    if (fileInputRef.current) fileInputRef.current.value = ''
+  }, [scopeVersion, organizationId, tenantId, data?.organizationId, data?.logoPreserveAspectRatio, data?.logoUrl])
 
   React.useEffect(() => {
     if (!selectedFile || typeof URL === 'undefined') {
@@ -111,7 +114,13 @@ export default function OrganizationBrandingPage() {
     try {
       await runMutation({
         operation: async () => {
+          if (getCurrentOrganizationScopeVersion() !== scopeVersion) {
+            throw new Error('[internal] Organization scope changed during branding save')
+          }
           const uploadedLogoUrl = shouldUpload ? await uploadLogo(data.organizationId) : null
+          if (getCurrentOrganizationScopeVersion() !== scopeVersion) {
+            throw new Error('[internal] Organization scope changed during branding save')
+          }
           const resolvedLogoUrl = uploadedLogoUrl ?? nextLogoUrl ?? logoUrl.trim()
           const response = await withScopedApiRequestHeaders(
             buildOptimisticLockHeader(data.updatedAt),
@@ -142,12 +151,15 @@ export default function OrganizationBrandingPage() {
           hasUpload: shouldUpload,
         },
       })
+      if (getCurrentOrganizationScopeVersion() !== scopeVersion) return
       await queryClient.invalidateQueries({ queryKey: ['directory-organization-branding'] })
+      if (getCurrentOrganizationScopeVersion() !== scopeVersion) return
       window.dispatchEvent(new Event('om:refresh-sidebar'))
       setSelectedFile(null)
       if (fileInputRef.current) fileInputRef.current.value = ''
       flash(t('directory.branding.flash.saved', 'Organization branding updated'), 'success')
     } catch (err: unknown) {
+      if (getCurrentOrganizationScopeVersion() !== scopeVersion) return
       if (surfaceRecordConflict(err, t)) return
       const fallback = t('directory.branding.errors.save', 'Failed to update organization branding')
       const message = err instanceof Error ? err.message : fallback
@@ -155,7 +167,7 @@ export default function OrganizationBrandingPage() {
     } finally {
       setSaving(false)
     }
-  }, [data, logoPreserveAspectRatio, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])
+  }, [data, logoPreserveAspectRatio, logoUrl, queryClient, runMutation, scopeVersion, selectedFile, t, uploadLogo])
 
   const handleSubmit = React.useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()

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

@@ -277,7 +277,8 @@ const CUSTOMER_FIELDS = ['id', 'display_name']
 /**
  * Decorate list items with `vendor_name` when they carry a `vendor_id` column
  * referencing `customers.customer_entity` by UUID only (no ORM cross-module
- * relations). Mutates `payload.items` in place.
+ * relations). No-op when the optional `customers` module is not enabled.
+ * Mutates `payload.items` in place.
  */
 export async function attachVendorLabelsToListItems(
   payload: AnyListPayload,
@@ -285,11 +286,13 @@ export async function attachVendorLabelsToListItems(
 ): Promise<void> {
   const items = Array.isArray(payload?.items) ? payload.items : []
   if (items.length === 0) return
+  const customerEntityId = E.customers?.customer_entity
+  if (!customerEntityId) return
   const ids = uniqueIdsFromKeys(items, ['vendor_id'])
   if (ids.length === 0) return
   const map = (await batchLoadById(
     ctx,
-    E.customers.customer_entity,
+    customerEntityId,
     ids,
     CUSTOMER_FIELDS,
     'vendor',

package/src/modules/wms/index.ts

@@ -9,7 +9,7 @@ export const metadata: ModuleInfo = {
   author: 'Open Mercato Team',
   license: 'MIT',
   ejectable: true,
-  requires: ['catalog', 'sales', 'feature_toggles'],
+  requires: ['catalog', 'customers', 'sales', 'feature_toggles'],
 }
 
 export { features } from './acl'