@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.9.0

package/src/modules/catalog/api/products/bulk-create/route.ts

@@ -0,0 +1,133 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
+import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import type { ProgressService } from '../../../../progress/lib/progressService'
+import { productsBulkCreateSchema } from '../../../data/validators'
+import { DEFAULT_CHECKPOINT_INTERVAL } from '../../../lib/bulkCreateCheckpoint'
+import { runBulkCreateMutationGuards } from '../../../lib/bulkCreateMutationGuards'
+import {
+  CATALOG_PRODUCT_BULK_CREATE_QUEUE,
+  getCatalogQueue,
+} from '../../../lib/bulkCreateProducts'
+
+const MAX_REPORTED_ISSUES = 20
+
+const responseSchema = z.object({
+  ok: z.boolean(),
+  progressJobId: z.string().uuid().nullable(),
+  message: z.string(),
+  // Additive: existing consumers that only read `ok`/`progressJobId`/`message` are unaffected.
+  // A batch of up to several thousand structurally rich rows is impossible to debug from a bare
+  // "Invalid payload", so the first failing paths are reported back.
+  errors: z
+    .array(z.object({ path: z.string(), message: z.string() }))
+    .optional(),
+})
+
+export const metadata = {
+  POST: { requireAuth: true, requireFeatures: ['catalog.products.manage'] },
+}
+
+export const openApi = {
+  tags: ['Catalog'],
+  summary: 'Start bulk creating catalog products',
+}
+
+export async function POST(req: Request) {
+  const auth = await getAuthFromRequest(req)
+  if (!auth?.tenantId) {
+    return NextResponse.json(responseSchema.parse({
+      ok: false,
+      progressJobId: null,
+      message: 'Unauthorized',
+    }), { status: 401 })
+  }
+
+  const parsed = productsBulkCreateSchema.safeParse(await readJsonSafe(req))
+  if (!parsed.success) {
+    return NextResponse.json(responseSchema.parse({
+      ok: false,
+      progressJobId: null,
+      message: 'Invalid payload',
+      errors: parsed.error.issues.slice(0, MAX_REPORTED_ISSUES).map((issue) => ({
+        path: issue.path.join('.'),
+        message: issue.message,
+      })),
+    }), { status: 400 })
+  }
+
+  const items = parsed.data.items
+  const container = await createRequestContainer()
+  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
+  if (scope.selectionRejected) {
+    return NextResponse.json(responseSchema.parse({
+      ok: false,
+      progressJobId: null,
+      message: 'Your selected organization is no longer available. Please re-select an organization and try again.',
+    }), { status: 422 })
+  }
+  const organizationId = scope.selectedId
+  if (!organizationId) {
+    return NextResponse.json(responseSchema.parse({
+      ok: false,
+      progressJobId: null,
+      message: 'Organization context is required',
+    }), { status: 400 })
+  }
+
+  const guardDecision = await runBulkCreateMutationGuards({
+    container,
+    auth,
+    request: req,
+    tenantId: auth.tenantId,
+    organizationId,
+    userId: auth.sub ?? '',
+    resourceKind: 'catalog.product',
+    itemCount: items.length,
+  })
+  if (!guardDecision.ok) {
+    return NextResponse.json(guardDecision.body, { status: guardDecision.status })
+  }
+
+  const progressService = container.resolve('progressService') as ProgressService
+
+  const progressJob = await progressService.createJob(
+    {
+      jobType: 'catalog.products.bulk_create',
+      name: 'Bulk create products',
+      description: `${items.length} catalog products queued for creation`,
+      totalCount: items.length,
+      cancellable: true,
+      meta: {
+        source: 'catalog.bulk-create',
+        checkpointInterval: DEFAULT_CHECKPOINT_INTERVAL,
+        lastCompletedRowIndex: -1,
+      },
+    },
+    {
+      tenantId: auth.tenantId,
+      organizationId,
+      userId: auth.sub,
+    },
+  )
+
+  const queue = getCatalogQueue(CATALOG_PRODUCT_BULK_CREATE_QUEUE)
+  await queue.enqueue({
+    progressJobId: progressJob.id,
+    items,
+    scope: {
+      organizationId,
+      tenantId: auth.tenantId,
+      userId: auth.sub,
+    },
+  })
+
+  return NextResponse.json(responseSchema.parse({
+    ok: true,
+    progressJobId: progressJob.id,
+    message: 'Bulk create started.',
+  }), { status: 202 })
+}

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

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import type { EntityManager } from "@mikro-orm/postgresql";
+import { raw } from "@mikro-orm/postgresql";
 import { makeCrudRoute } from "@open-mercato/shared/lib/crud/factory";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
 import {
@@ -28,7 +29,6 @@ import { splitCustomFieldPayload } from "@open-mercato/shared/lib/crud/custom-fi
 import { E } from "#generated/entities.ids.generated";
 import * as F from "#generated/entities/catalog_product";
 import { parseBooleanFlag, sanitizeSearchTerm } from "../helpers";
-import { escapeLikePattern } from "@open-mercato/shared/lib/db/escapeLikePattern";
 import type { CrudCtx } from "@open-mercato/shared/lib/crud/factory";
 import { buildScopedWhere } from "@open-mercato/shared/lib/api/crud";
 import {
@@ -48,6 +48,12 @@ import {
   defaultOkResponseSchema,
 } from "../openapi";
 import { findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { warnOnEncryptedLikeFilter } from "@open-mercato/shared/lib/encryption/likeFilterWarning";
+import { buildAccentInsensitiveContainsPatternSql } from "@open-mercato/shared/lib/db/accentInsensitiveSearch";
+import {
+  PRODUCT_SEARCH_COLUMNS,
+  PRODUCT_SEARCH_EXPRESSION_SQL,
+} from "../../lib/productSearch";
 import { canonicalizeUnitCode, toUnitLookupKey } from "../../lib/unitCodes";
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -186,6 +192,16 @@ export async function buildProductFilters(
     organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
     tenantId: ctx.auth?.tenantId ?? null,
   };
+  const scopeWhere = buildScopedWhere(
+    {},
+    {
+      organizationId: scope.organizationId,
+      organizationIds: ctx.organizationIds ?? undefined,
+      tenantId: scope.tenantId,
+      orgField: ctx.organizationIds === null ? null : undefined,
+      softDeleteField: null,
+    },
+  );
   const term = sanitizeSearchTerm(query.search);
   const channelFilterIds = parseIdList(query.channelIds);
   const categoryFilterIds = parseIdList(query.categoryIds);
@@ -205,24 +221,34 @@ export async function buildProductFilters(
   // => empty result" behavior.
   const searchTask = async (): Promise<string[] | null> => {
     if (!term) return null;
-    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,
-    );
+    // The predicate hides behind a raw() symbol key, which the filter walker in
+    // findWithDecryption cannot see (Object.entries skips symbols), so the
+    // encrypted-ILIKE diagnostic is raised here with the field list instead.
+    // Without it, a tenant that encrypts one of these columns at rest gets an
+    // empty result indistinguishable from a genuine no-match (#5051). It runs
+    // alongside the query rather than before it: it is a development-only
+    // diagnostic and must not add a round trip to the request path.
+    const [searchMatches] = await Promise.all([
+      findWithDecryption(
+        em,
+        CatalogProduct,
+        {
+          ...scopeWhere,
+          ...(query.withDeleted ? {} : { deletedAt: null }),
+          [raw(PRODUCT_SEARCH_EXPRESSION_SQL)]: {
+            $ilike: raw(buildAccentInsensitiveContainsPatternSql(), [term]),
+          },
+        },
+        { fields: ["id"] },
+        scope,
+      ),
+      warnOnEncryptedLikeFilter({
+        em,
+        entityName: CatalogProduct,
+        likeFields: [...PRODUCT_SEARCH_COLUMNS],
+        tenantId: scope.tenantId,
+      }),
+    ]);
     return searchMatches
       .map((product) => product.id)
       .filter((id): id is string => typeof id === "string" && id.length > 0);
@@ -236,7 +262,7 @@ export async function buildProductFilters(
       {
         channelId: { $in: channelFilterIds },
         deletedAt: null,
-        ...scope,
+        ...scopeWhere,
       },
       { fields: ["id", "product"] },
       scope,
@@ -255,7 +281,7 @@ export async function buildProductFilters(
     const assignments = await findWithDecryption(
       em,
       CatalogProductCategoryAssignment,
-      { category: { $in: categoryFilterIds }, ...scope },
+      { category: { $in: categoryFilterIds }, ...scopeWhere },
       { fields: ["id", "product"] },
       scope,
     );
@@ -273,7 +299,7 @@ export async function buildProductFilters(
     const assignments = await findWithDecryption(
       em,
       CatalogProductTagAssignment,
-      { tag: { $in: tagFilterIds }, ...scope },
+      { tag: { $in: tagFilterIds }, ...scopeWhere },
       { fields: ["id", "product"] },
       scope,
     );
@@ -945,7 +971,10 @@ const crud = makeCrudRoute({
           ? { ...base, customFields: custom }
           : base;
       },
-      response: () => ({ ok: true }),
+      response: ({ result }) => ({
+        ok: true,
+        updatedAt: result?.updatedAt ?? null,
+      }),
     },
     delete: {
       commandId: "catalog.products.delete",
@@ -1057,7 +1086,9 @@ export const openApi = createCatalogCrudOpenApi({
   },
   update: {
     schema: productUpdateSchema,
-    responseSchema: defaultOkResponseSchema,
+    responseSchema: defaultOkResponseSchema.extend({
+      updatedAt: z.string().nullable().optional(),
+    }),
     description: "Updates an existing product by id.",
   },
   del: {

package/src/modules/catalog/backend/catalog/products/[id]/page.tsx

@@ -1385,23 +1385,15 @@ export default function EditCatalogProductPage({
           );
         }
       }
-      await updateCrud("catalog/products", payload);
-      // The update route only returns `{ ok: true }`, so re-fetch the record to pick
-      // up the server-bumped updatedAt and refresh the optimistic-lock token — without
-      // this, a second consecutive save reuses the stale pre-edit updatedAt and the
-      // lock guard falsely reports a conflict (#5985).
-      const refreshedProductRes = await apiCall<ProductResponse>(
-        `/api/catalog/products?id=${encodeURIComponent(productId)}&page=1&pageSize=1&withDeleted=false`,
-      );
-      const refreshedRecord = Array.isArray(refreshedProductRes.result?.items)
-        ? refreshedProductRes.result?.items?.[0]
-        : undefined;
+      const updateResult = await updateCrud("catalog/products", payload);
+      // The update route echoes the server-bumped updatedAt, so refresh the
+      // optimistic-lock token from it — without this, a second consecutive save
+      // reuses the stale pre-edit updatedAt and the lock guard falsely reports a
+      // conflict (#5985).
       const refreshedUpdatedAt =
-        typeof refreshedRecord?.updatedAt === "string"
-          ? refreshedRecord.updatedAt
-          : typeof refreshedRecord?.updated_at === "string"
-            ? refreshedRecord.updated_at
-            : null;
+        typeof updateResult.result?.updatedAt === "string"
+          ? updateResult.result.updatedAt
+          : null;
       // Merge the just-submitted `values` back into `initialValues` too, not only
       // `updatedAt` — CrudForm re-syncs its visible fields from `initialValues`
       // whenever that prop's identity changes, so leaving the other fields at
@@ -1589,6 +1581,7 @@ export default function EditCatalogProductPage({
           }}
           initialValues={initialValues ?? undefined}
           isLoading={loading}
+          disableInitialFocus
           loadingMessage={t("catalog.products.edit.loading", "Loading product")}
           submitLabel={t("catalog.products.edit.save", "Save changes")}
           cancelHref="/backend/catalog/products"

package/src/modules/catalog/backend/catalog/products/create/page.tsx

@@ -87,6 +87,7 @@ import {
 import { ProductUomSection } from "@open-mercato/core/modules/catalog/components/products/ProductUomSection";
 import { ProductComplianceSection } from "@open-mercato/core/modules/catalog/components/products/ProductComplianceSection";
 import { canonicalizeUnitCode } from "@open-mercato/core/modules/catalog/lib/unitCodes";
+import { validateCatalogPriceAmountInput } from "@open-mercato/core/modules/catalog/lib/priceValidation";
 import {
   UNIT_PRICE_REFERENCE_UNITS,
   toTrimmedOrNull,
@@ -632,19 +633,23 @@ export default function CreateCatalogProductPage() {
               for (const priceKind of priceKinds) {
                 const value = variant.prices?.[priceKind.id]?.amount?.trim();
                 if (!value) continue;
-                const numeric = Number(value);
-                if (
-                  Number.isNaN(numeric) ||
-                  !Number.isFinite(numeric) ||
-                  numeric < 0
-                ) {
+                const amountValidation = validateCatalogPriceAmountInput(
+                  Number(value),
+                );
+                if (!amountValidation.ok) {
                   throw createCrudFormError(
-                    t(
-                      "catalog.products.create.errors.priceNonNegative",
-                      "Prices must be zero or greater.",
-                    ),
+                    amountValidation.reason === "negative"
+                      ? t(
+                          "catalog.products.create.errors.priceNonNegative",
+                          "Prices must be zero or greater.",
+                        )
+                      : t(
+                          "catalog.variants.form.errors.invalidPrice",
+                          "Provide a valid non-negative price.",
+                        ),
                   );
                 }
+                const numeric = amountValidation.numeric;
                 const currencyCode =
                   typeof priceKind.currencyCode === "string" &&
                   priceKind.currencyCode.trim().length
@@ -1786,6 +1791,7 @@ function ProductBuilder({
                               }
                               placeholder="0.00"
                               min={0}
+                              step="any"
                             />
                           </div>
                         </td>

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

@@ -188,6 +188,7 @@ const createCategoryCommand: CommandHandler<CategoryCreateInput, { categoryId: s
       [
         () => em.flush(),
         async () => {
+          if (ctx.bulkImport?.skipDerivedRebuild) return
           await rebuildCategoryHierarchyForOrganization(em, record.organizationId, record.tenantId)
         },
       ],

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

@@ -1372,12 +1372,16 @@ function applyProductSnapshot(
 }
 
 /**
- * Output contract for the product commands, consumed by the workflows context
- * ledger through `commandRegistry.outputSchemaOf`. All three commands return
- * the product id and nothing else — create and update from `record.id`, delete
- * from the resolved input id.
+ * Output contracts for the product commands, consumed by the workflows context
+ * ledger through `commandRegistry.outputSchemaOf`. Create and delete return the
+ * product id and nothing else — create from `record.id`, delete from the
+ * resolved input id. Update also returns the persisted `updatedAt`, so callers
+ * can carry the optimistic-lock version forward without re-fetching the product.
  */
 const productIdOutputSchema = z.object({ productId: z.string().uuid() });
+const productUpdateOutputSchema = productIdOutputSchema.extend({
+  updatedAt: z.string(),
+});
 
 const createProductCommand: CommandHandler<
   ProductCreateInput,
@@ -1656,10 +1660,10 @@ const createProductCommand: CommandHandler<
 
 const updateProductCommand: CommandHandler<
   ProductUpdateInput,
-  { productId: string }
+  { productId: string; updatedAt: string }
 > = {
   id: "catalog.products.update",
-  outputSchema: productIdOutputSchema,
+  outputSchema: productUpdateOutputSchema,
   async prepare(input, ctx) {
     const id = requireId(input, "Product id is required");
     const em = ctx.container.resolve("em") as EntityManager;
@@ -2021,7 +2025,7 @@ const updateProductCommand: CommandHandler<
       action: "updated",
       product: record,
     });
-    return { productId: record.id };
+    return { productId: record.id, updatedAt: record.updatedAt.toISOString() };
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve("em") as EntityManager).fork();

package/src/modules/catalog/components/PriceKindSettings.tsx

@@ -25,8 +25,8 @@ 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 { DictionaryEntrySelect } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
-import { useCurrencyDictionary } from '@open-mercato/core/modules/customers/components/detail/hooks/useCurrencyDictionary'
 import type { DictionaryOption } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
+import { loadCurrencyOptions } from '../lib/currencyOptions'
 import type { CatalogPriceDisplayMode } from '../data/types'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -124,25 +124,11 @@ export function PriceKindSettings() {
   const [form, setForm] = React.useState<PriceKindFormState>(DEFAULT_FORM)
   const [submitting, setSubmitting] = React.useState(false)
   const [error, setError] = React.useState<string | null>(null)
-  const { data: currencyDictionary, refetch: refetchCurrencyDictionary } = useCurrencyDictionary()
-
-  const currencyOptionsLoader = React.useCallback(async (): Promise<DictionaryOption[]> => {
-    if (currencyDictionary && Array.isArray(currencyDictionary.entries)) {
-      return currencyDictionary.entries.map((entry) => ({
-        value: entry.value,
-        label: entry.label,
-        color: entry.color ?? null,
-        icon: entry.icon ?? null,
-      }))
-    }
-    const payload = await refetchCurrencyDictionary()
-    return payload.entries.map((entry) => ({
-      value: entry.value,
-      label: entry.label,
-      color: entry.color ?? null,
-      icon: entry.icon ?? null,
-    }))
-  }, [currencyDictionary, refetchCurrencyDictionary])
+  const currencyOptionsLoader = React.useCallback(
+    (): Promise<DictionaryOption[]> =>
+      loadCurrencyOptions(t('catalog.priceKinds.form.currency.loadError', 'Unable to load currencies.')),
+    [t],
+  )
 
   const loadItems = React.useCallback(async () => {
     setLoading(true)

package/src/modules/catalog/components/prices/PriceScopeSelectors.tsx

@@ -45,7 +45,7 @@ async function resolveOne(
   mapItem: (item: RemoteItem) => ComboboxOption | null,
 ): Promise<string> {
   const options = await loadOptions(path, { [idParam]: id, pageSize: '1' }, mapItem)
-  return options[0]?.label ?? id
+  return options.find((option) => option.value === id)?.label ?? id
 }
 
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
@@ -211,7 +211,7 @@ export function PricePriceKindSelect({
       allowCustomValues={false}
       placeholder={t('catalog.prices.select.priceKind.placeholder', 'Select a price kind…')}
       loadSuggestions={(query) => loadOptions('/api/catalog/price-kinds', buildLookupParams(query, '20'), mapItem)}
-      resolveLabel={(id) => resolveOne('/api/catalog/price-kinds', 'id', id, mapItem)}
+      resolveLabel={(id) => resolveOne('/api/catalog/price-kinds', 'ids', id, mapItem)}
     />
   )
 }

package/src/modules/catalog/components/products/ProductUomSection.tsx

@@ -22,6 +22,7 @@ import type {
   ProductUnitConversionDraft,
 } from "./productForm";
 import { createProductUnitConversionDraft } from "./productForm";
+import { translateCatalogUnitLabel } from "../../lib/unitLabels";
 import { REFERENCE_UNIT_CODES } from "@open-mercato/shared/lib/units/unitCodes";
 import { toTrimmedOrNull } from "./productFormUtils";
 import { useUnitPriceDisplayEnabled } from "./hooks/useUnitPriceDisplayEnabled";
@@ -73,10 +74,12 @@ function toSortValue(value: string): number {
   return Number.isFinite(numeric) ? numeric : Number.MAX_SAFE_INTEGER;
 }
 
-function formatPreviewNumber(value: number): string {
+function formatPreviewNumber(value: number, locale?: string): string {
   if (!Number.isFinite(value)) return "0";
-  const rounded = Math.round(value * 1_000_000) / 1_000_000;
-  return Number.isInteger(rounded) ? String(rounded) : rounded.toString();
+  return new Intl.NumberFormat(locale, {
+    maximumFractionDigits: 6,
+    useGrouping: false,
+  }).format(value);
 }
 
 function normalizeConversions(value: unknown): ProductUnitConversionDraft[] {
@@ -90,7 +93,7 @@ function normalizeConversions(value: unknown): ProductUnitConversionDraft[] {
         unitCode: toTrimmedOrNull(row.unitCode) ?? "",
         // Stays raw while editing (issue #5828) — re-serializing on every render would drop
         // an in-progress decimal separator the instant it's typed.
-        toBaseFactor: toTrimmedOrNull(row.toBaseFactor) ?? "",
+        toBaseFactor: row.toBaseFactor ?? "",
         sortOrder: toTrimmedOrNull(row.sortOrder) ?? "",
         isActive: row.isActive !== false,
       } satisfies ProductUnitConversionDraft;
@@ -109,7 +112,9 @@ function normalizeConversions(value: unknown): ProductUnitConversionDraft[] {
 }
 
 function buildUnitOptions(
-  entries: UnitDictionaryEntry[] | undefined,
+  entries: UnitDictionaryEntry[],
+  t: ReturnType<typeof useT>,
+  locale: string,
 ): UnitOption[] {
   const list = Array.isArray(entries) ? entries : [];
   const options = list
@@ -118,11 +123,11 @@ function buildUnitOptions(
       if (!value) return null;
       return {
         value,
-        label: toTrimmedOrNull(entry.label) ?? value,
+        label: translateCatalogUnitLabel(value, toTrimmedOrNull(entry.label) ?? value, t),
       } satisfies UnitOption;
     })
     .filter((entry): entry is UnitOption => Boolean(entry));
-  return options.sort((left, right) => left.label.localeCompare(right.label));
+  return options.sort((left, right) => left.label.localeCompare(right.label, locale));
 }
 
 export function ProductUomSection({
@@ -134,7 +139,11 @@ export function ProductUomSection({
   const t = useT();
   const locale = useLocale();
   const { enabled: unitPriceDisplayEnabled } = useUnitPriceDisplayEnabled();
-  const [unitOptions, setUnitOptions] = React.useState<UnitOption[]>([]);
+  const [unitEntries, setUnitEntries] = React.useState<UnitDictionaryEntry[]>([]);
+  const unitOptions = React.useMemo(
+    () => buildUnitOptions(unitEntries, t, locale),
+    [unitEntries, t, locale],
+  );
   const [loadingUnits, setLoadingUnits] = React.useState(false);
   const [errorLoadingUnits, setErrorLoadingUnits] = React.useState(false);
   const conversions = React.useMemo(
@@ -154,10 +163,10 @@ export function ProductUomSection({
           { fallback: { entries: [] } },
         );
         if (cancelled) return;
-        setUnitOptions(buildUnitOptions(response.result?.entries));
+        setUnitEntries(response.result?.entries ?? []);
       } catch {
         if (!cancelled) {
-          setUnitOptions([]);
+          setUnitEntries([]);
           setErrorLoadingUnits(true);
         }
       } finally {
@@ -235,12 +244,12 @@ export function ProductUomSection({
   const defaultUnit = toTrimmedOrNull(values.defaultUnit) ?? "";
   const defaultSalesUnit = toTrimmedOrNull(values.defaultSalesUnit) ?? "";
   const defaultSalesQuantity =
-    toTrimmedOrNull(values.defaultSalesUnitQuantity) ?? "1";
+    values.defaultSalesUnitQuantity ?? "1";
   const unitPriceEnabled = Boolean(values.unitPriceEnabled);
   const unitPriceReferenceUnit =
     toTrimmedOrNull(values.unitPriceReferenceUnit) ?? "";
   const unitPriceBaseQuantity =
-    toTrimmedOrNull(values.unitPriceBaseQuantity) ?? "";
+    values.unitPriceBaseQuantity ?? "";
 
   const baseUnitLabel = findUnitLabel(defaultUnit) ?? defaultUnit;
   const salesUnitLabel =
@@ -269,23 +278,6 @@ export function ProductUomSection({
       : null;
   const unitPriceBaseQuantityNumber = toPositiveNumber(unitPriceBaseQuantity, locale);
 
-  const validConversions = conversions.filter(
-    (entry) =>
-      toTrimmedOrNull(entry.unitCode) && toTrimmedOrNull(entry.toBaseFactor),
-  );
-  const conversionPreviewItems = validConversions
-    .slice(0, 3)
-    .map((entry) => {
-      const label = findUnitLabel(entry.unitCode) ?? entry.unitCode;
-      const baseLabel = findUnitLabel(defaultUnit) ?? defaultUnit;
-      const factor = toTrimmedOrNull(entry.toBaseFactor) ?? "1";
-      return `1 ${label} = ${factor} ${baseLabel || t("catalog.products.uom.baseUnit", "base unit")}`;
-    });
-  const conversionPreview =
-    validConversions.length > 3
-      ? `${conversionPreviewItems.join(" • ")} (+${validConversions.length - 3})`
-      : conversionPreviewItems.join(" • ");
-
   return (
     <div
       className={
@@ -399,10 +391,11 @@ export function ProductUomSection({
                     "catalog.products.uom.defaultSalesQuantityPreviewWithNormalization",
                     "Default line: {{quantity}} {{salesUnit}} (= {{normalized}} {{baseUnit}}).",
                     {
-                      quantity: formatPreviewNumber(defaultSalesQuantityNumber),
+                      quantity: formatPreviewNumber(defaultSalesQuantityNumber, locale),
                       salesUnit: salesUnitLabel,
                       normalized: formatPreviewNumber(
                         defaultSalesQuantityNormalized,
+                        locale,
                       ),
                       baseUnit: baseUnitLabel,
                     },
@@ -411,7 +404,7 @@ export function ProductUomSection({
                     "catalog.products.uom.defaultSalesQuantityPreview",
                     "Default line: {{quantity}} {{salesUnit}}.",
                     {
-                      quantity: formatPreviewNumber(defaultSalesQuantityNumber),
+                      quantity: formatPreviewNumber(defaultSalesQuantityNumber, locale),
                       salesUnit: salesUnitLabel,
                     },
                   )}
@@ -546,7 +539,7 @@ export function ProductUomSection({
                   "catalog.products.unitPrice.hintWithPreview",
                   "Show calculated price per {{quantity}} {{unit}}. For most products use 1 (for example: 1 kg, 1 l, 1 m²).",
                   {
-                    quantity: formatPreviewNumber(unitPriceBaseQuantityNumber),
+                    quantity: formatPreviewNumber(unitPriceBaseQuantityNumber, locale),
                     unit: unitPriceReferenceUnit,
                   },
                 )
@@ -593,7 +586,7 @@ export function ProductUomSection({
                       "1 {{fromUnit}} = {{factor}} {{baseUnit}}",
                       {
                         fromUnit: findUnitLabel(entry.unitCode) ?? entry.unitCode,
-                        factor: formatPreviewNumber(conversionFactor),
+                        factor: formatPreviewNumber(conversionFactor, locale),
                         baseUnit:
                           findUnitLabel(defaultUnit) ??
                           defaultUnit ??
@@ -731,10 +724,6 @@ export function ProductUomSection({
             )}
           </p>
         ) : null}
-
-        {conversionPreview ? (
-          <p className="text-xs text-muted-foreground">{conversionPreview}</p>
-        ) : null}
       </div>
     </div>
   );