@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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

@@ -40,6 +40,7 @@ import {
   getErrorConstraint,
   getErrorMessage,
 } from "./shared";
+import { makeCreateRedo } from "@open-mercato/shared/lib/commands/redo";
 import { toUnitLookupKey } from "../lib/unitCodes";
 import { resolveCanonicalUnitCode } from "../lib/unitResolution";
 
@@ -167,6 +168,24 @@ async function loadConversionSnapshot(
   };
 }
 
+function conversionSeedFromSnapshot(
+  snapshot: ProductUnitConversionSnapshot,
+): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    product: snapshot.productId,
+    unitCode: snapshot.unitCode,
+    toBaseFactor: snapshot.toBaseFactor,
+    sortOrder: snapshot.sortOrder,
+    isActive: snapshot.isActive,
+    metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  };
+}
+
 function applyConversionSnapshot(
   em: EntityManager,
   record: CatalogProductUnitConversion,
@@ -341,6 +360,19 @@ const createProductUnitConversionCommand: CommandHandler<
       conversion: record,
     });
   },
+  redo: makeCreateRedo<
+    CatalogProductUnitConversion,
+    ProductUnitConversionSnapshot,
+    ProductUnitConversionCreateInput,
+    { conversionId: string }
+  >({
+    entityClass: CatalogProductUnitConversion,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: conversionSeedFromSnapshot,
+    buildResult: (entity) => ({ conversionId: entity.id }),
+    events: conversionCrudEvents,
+    indexer: conversionCrudIndexer,
+  }),
 };
 
 const updateProductUnitConversionCommand: CommandHandler<

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

@@ -27,6 +27,7 @@ import {
   buildCustomFieldResetMap,
 } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
+import { resolveRedoSnapshot, restoreCreatedRow } from "@open-mercato/shared/lib/commands/redo";
 import { E } from "#generated/entities.ids.generated";
 import { slugifyTagLabel } from "@open-mercato/shared/lib/utils";
 import { parseObjectLike } from "@open-mercato/shared/lib/json/parseObjectLike";
@@ -1167,6 +1168,45 @@ async function loadProductSnapshot(
   };
 }
 
+function productSeedFromSnapshot(
+  snapshot: ProductSnapshot,
+): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    title: snapshot.title,
+    subtitle: snapshot.subtitle ?? null,
+    description: snapshot.description ?? null,
+    sku: snapshot.sku ?? null,
+    handle: snapshot.handle ?? null,
+    taxRateId: snapshot.taxRateId ?? null,
+    taxRate: snapshot.taxRate ?? null,
+    productType: snapshot.productType ?? "simple",
+    statusEntryId: snapshot.statusEntryId ?? null,
+    primaryCurrencyCode: snapshot.primaryCurrencyCode ?? null,
+    defaultUnit: snapshot.defaultUnit ?? null,
+    defaultSalesUnit: snapshot.defaultSalesUnit ?? null,
+    defaultSalesUnitQuantity: snapshot.defaultSalesUnitQuantity ?? "1",
+    uomRoundingScale: snapshot.uomRoundingScale,
+    uomRoundingMode: snapshot.uomRoundingMode,
+    unitPriceEnabled: snapshot.unitPriceEnabled,
+    unitPriceReferenceUnit: snapshot.unitPriceReferenceUnit ?? null,
+    unitPriceBaseQuantity: snapshot.unitPriceBaseQuantity ?? null,
+    defaultMediaId: snapshot.defaultMediaId ?? null,
+    defaultMediaUrl: snapshot.defaultMediaUrl ?? null,
+    weightValue: snapshot.weightValue ?? null,
+    weightUnit: snapshot.weightUnit ?? null,
+    dimensions: snapshot.dimensions ? cloneJson(snapshot.dimensions) : null,
+    metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
+    customFieldsetCode: snapshot.customFieldsetCode ?? null,
+    isConfigurable: snapshot.isConfigurable,
+    isActive: snapshot.isActive,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  };
+}
+
 function applyProductSnapshot(
   em: EntityManager,
   record: CatalogProduct,
@@ -1409,6 +1449,53 @@ const createProductCommand: CommandHandler<
       product: record,
     });
   },
+  redo: async ({ ctx, logEntry }) => {
+    const after = resolveRedoSnapshot<ProductSnapshot>(logEntry);
+    if (!after) {
+      throw new CrudHttpError(400, {
+        error: "[internal] redo snapshot unavailable for product create",
+      });
+    }
+    const em = (ctx.container.resolve("em") as EntityManager).fork();
+    const record = await restoreCreatedRow(
+      em,
+      CatalogProduct,
+      after.id,
+      () => productSeedFromSnapshot(after),
+    );
+    applyProductSnapshot(em, record, after);
+    try {
+      await withAtomicFlush(
+        em,
+        [
+          () => em.flush(),
+          () => restoreOffersFromSnapshot(em, record, after.offers),
+          () => syncCategoryAssignments(em, record, after.categoryIds),
+          () => syncProductTags(em, record, after.tags),
+        ],
+        { transaction: true },
+      );
+    } catch (error) {
+      await rethrowProductUniqueConstraint(error);
+    }
+    const dataEngine = ctx.container.resolve("dataEngine") as DataEngine;
+    if (after.custom && Object.keys(after.custom).length) {
+      await setCustomFieldsIfAny({
+        dataEngine,
+        entityId: E.catalog.catalog_product,
+        recordId: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+        values: after.custom,
+      });
+    }
+    await emitProductCrudChange({
+      dataEngine,
+      action: "created",
+      product: record,
+    });
+    return { productId: record.id };
+  },
 };
 
 const updateProductCommand: CommandHandler<

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

@@ -7,6 +7,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import { resolveRedoSnapshot, restoreCreatedRow } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import {
@@ -144,6 +145,31 @@ async function loadVariantSnapshot(
   }
 }
 
+function variantSeedFromSnapshot(snapshot: VariantSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    product: snapshot.productId,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    name: snapshot.name ?? null,
+    sku: snapshot.sku ?? null,
+    barcode: snapshot.barcode ?? null,
+    statusEntryId: snapshot.statusEntryId ?? null,
+    isDefault: snapshot.isDefault,
+    isActive: snapshot.isActive,
+    weightValue: snapshot.weightValue ?? null,
+    weightUnit: snapshot.weightUnit ?? null,
+    taxRateId: snapshot.taxRateId ?? null,
+    taxRate: snapshot.taxRate ?? null,
+    dimensions: snapshot.dimensions ? cloneJson(snapshot.dimensions) : null,
+    metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
+    optionValues: snapshot.optionValues ? cloneJson(snapshot.optionValues) : null,
+    customFieldsetCode: snapshot.customFieldsetCode ?? null,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  }
+}
+
 function applyVariantSnapshot(record: CatalogProductVariant, snapshot: VariantSnapshot): void {
   record.organizationId = snapshot.organizationId
   record.tenantId = snapshot.tenantId
@@ -693,6 +719,66 @@ const createVariantCommand: CommandHandler<VariantCreateInput, { variantId: stri
       })
     }
   },
+  redo: async ({ ctx, logEntry }) => {
+    const after = resolveRedoSnapshot<VariantSnapshot>(logEntry)
+    if (!after) throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for variant create' })
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const record = await restoreCreatedRow(
+      em,
+      CatalogProductVariant,
+      after.id,
+      () => variantSeedFromSnapshot(after),
+    )
+    applyVariantSnapshot(record, after)
+    let previousDefaultVariantId: string | null = null
+    try {
+      await withAtomicFlush(
+        em,
+        [
+          () => em.flush(),
+          async () => {
+            if (record.isDefault) {
+              previousDefaultVariantId = await enforceSingleDefaultVariant(em, record)
+              await em.flush()
+            }
+          },
+          () => aggregateVariantMediaToProduct(em, record),
+        ],
+        { transaction: true }
+      )
+    } catch (error) {
+      await rethrowVariantUniqueConstraint(error)
+    }
+    if (after.custom && Object.keys(after.custom).length) {
+      await setCustomFieldsIfAny({
+        dataEngine: ctx.container.resolve('dataEngine'),
+        entityId: E.catalog.catalog_product_variant,
+        recordId: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+        values: after.custom,
+      })
+    }
+    await emitCatalogQueryIndexEvent(ctx, {
+      entityType: E.catalog.catalog_product_variant,
+      recordId: record.id,
+      organizationId: record.organizationId,
+      tenantId: record.tenantId,
+      action: 'created',
+    })
+    await emitCrudSideEffects({
+      dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+      action: 'created',
+      entity: record,
+      identifiers: {
+        id: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+      },
+      events: variantCrudEvents,
+    })
+    return { variantId: record.id, previousDefaultVariantId }
+  },
 }
 
 const updateVariantCommand: CommandHandler<VariantUpdateInput, { variantId: string; previousDefaultVariantId?: string | null }> = {
@@ -726,48 +812,48 @@ const updateVariantCommand: CommandHandler<VariantUpdateInput, { variantId: stri
       ? await resolveVariantTaxRate(em, product, parsed.taxRateId ?? null, parsed.taxRate)
       : null
 
-    if (parsed.name !== undefined) record.name = parsed.name ?? null
-    if (parsed.sku !== undefined) record.sku = parsed.sku ?? null
-    if (parsed.barcode !== undefined) record.barcode = parsed.barcode ?? null
-    if (parsed.statusEntryId !== undefined) record.statusEntryId = parsed.statusEntryId ?? null
-    if (parsed.isDefault !== undefined) record.isDefault = parsed.isDefault
-    if (parsed.isActive !== undefined) record.isActive = parsed.isActive
-    if (Object.prototype.hasOwnProperty.call(parsed, 'weightValue')) {
-      record.weightValue = toNumericString(parsed.weightValue)
-    }
-    if (parsed.weightUnit !== undefined) record.weightUnit = parsed.weightUnit ?? null
-    if (parsed.dimensions !== undefined) {
-      record.dimensions = parsed.dimensions ? cloneJson(parsed.dimensions) : null
-    }
-    let metadataSplit: MetadataSplitResult | null = null
-    if (parsed.metadata !== undefined) {
-      metadataSplit = splitOptionValuesFromMetadata(parsed.metadata)
-      record.metadata = metadataSplit.metadata
-    }
-    if (parsed.optionValues !== undefined) {
-      record.optionValues = parsed.optionValues ? cloneJson(parsed.optionValues) : null
-    } else if (metadataSplit?.hadOptionValues) {
-      record.optionValues = metadataSplit.optionValues ? cloneJson(metadataSplit.optionValues) : null
-    }
-    if (taxRateProvided) {
-      record.taxRateId = resolvedTaxRate?.taxRateId ?? null
-      record.taxRate = resolvedTaxRate?.taxRate ?? null
-    }
-    if (parsed.customFieldsetCode !== undefined) {
-      record.customFieldsetCode = parsed.customFieldsetCode ?? null
-    }
-
     let previousDefaultVariantId: string | null = null
     try {
       await withAtomicFlush(
         em,
         [
+          () => {
+            if (parsed.name !== undefined) record.name = parsed.name ?? null
+            if (parsed.sku !== undefined) record.sku = parsed.sku ?? null
+            if (parsed.barcode !== undefined) record.barcode = parsed.barcode ?? null
+            if (parsed.statusEntryId !== undefined) record.statusEntryId = parsed.statusEntryId ?? null
+            if (parsed.isDefault !== undefined) record.isDefault = parsed.isDefault
+            if (parsed.isActive !== undefined) record.isActive = parsed.isActive
+            if (Object.prototype.hasOwnProperty.call(parsed, 'weightValue')) {
+              record.weightValue = toNumericString(parsed.weightValue)
+            }
+            if (parsed.weightUnit !== undefined) record.weightUnit = parsed.weightUnit ?? null
+            if (parsed.dimensions !== undefined) {
+              record.dimensions = parsed.dimensions ? cloneJson(parsed.dimensions) : null
+            }
+            let metadataSplit: MetadataSplitResult | null = null
+            if (parsed.metadata !== undefined) {
+              metadataSplit = splitOptionValuesFromMetadata(parsed.metadata)
+              record.metadata = metadataSplit.metadata
+            }
+            if (parsed.optionValues !== undefined) {
+              record.optionValues = parsed.optionValues ? cloneJson(parsed.optionValues) : null
+            } else if (metadataSplit?.hadOptionValues) {
+              record.optionValues = metadataSplit.optionValues ? cloneJson(metadataSplit.optionValues) : null
+            }
+            if (taxRateProvided) {
+              record.taxRateId = resolvedTaxRate?.taxRateId ?? null
+              record.taxRate = resolvedTaxRate?.taxRate ?? null
+            }
+            if (parsed.customFieldsetCode !== undefined) {
+              record.customFieldsetCode = parsed.customFieldsetCode ?? null
+            }
+          },
           async () => {
             if (parsed.isDefault === true) {
               previousDefaultVariantId = await enforceSingleDefaultVariant(em, record)
             }
           },
-          () => em.flush(),
           () => aggregateVariantMediaToProduct(em, record),
         ],
         { transaction: true }

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

@@ -17,7 +17,8 @@ import {
   DialogTitle,
 } from '@open-mercato/ui/primitives/dialog'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -211,11 +212,17 @@ export function PriceKindSettings() {
         dialog.mode === 'edit'
           ? JSON.stringify({ id: dialog.entry.id, ...payload })
           : JSON.stringify(payload)
-      const call = await apiCall(path, {
+      const savePriceKind = () => apiCall(path, {
         method,
         headers: { 'content-type': 'application/json' },
         body,
       })
+      const optimisticLockHeader = buildOptimisticLockHeader(
+        dialog.mode === 'edit' ? dialog.entry.updatedAt : null,
+      )
+      const call = Object.keys(optimisticLockHeader).length > 0
+        ? await withScopedApiRequestHeaders(optimisticLockHeader, savePriceKind)
+        : await savePriceKind()
       if (!call.ok) {
         await raiseCrudError(call.response, t('catalog.priceKinds.errors.save', 'Failed to save price kind.'))
       }
@@ -229,8 +236,9 @@ export function PriceKindSettings() {
       await loadItems()
     } catch (err) {
       console.error('catalog.price-kinds.save failed', err)
-      const message =
-        err instanceof Error ? err.message : t('catalog.priceKinds.errors.save', 'Failed to save price kind.')
+      const message = extractOptimisticLockConflict(err)
+        ? t('ui.forms.flash.recordModified', 'This record was modified by someone else. Refresh and try again.')
+        : err instanceof Error ? err.message : t('catalog.priceKinds.errors.save', 'Failed to save price kind.')
       setError(message)
     } finally {
       setSubmitting(false)
@@ -246,11 +254,15 @@ export function PriceKindSettings() {
       })
       if (!confirmed) return
       try {
-        const call = await apiCall('/api/catalog/price-kinds', {
+        const deletePriceKind = () => apiCall('/api/catalog/price-kinds', {
           method: 'DELETE',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ id: entry.id }),
         })
+        const optimisticLockHeader = buildOptimisticLockHeader(entry.updatedAt)
+        const call = Object.keys(optimisticLockHeader).length > 0
+          ? await withScopedApiRequestHeaders(optimisticLockHeader, deletePriceKind)
+          : await deletePriceKind()
         if (!call.ok) {
           await raiseCrudError(call.response, t('catalog.priceKinds.errors.delete', 'Failed to delete price kind.'))
         }
@@ -258,8 +270,9 @@ export function PriceKindSettings() {
         await loadItems()
       } catch (err) {
         console.error('catalog.price-kinds.delete failed', err)
-        const message =
-          err instanceof Error ? err.message : t('catalog.priceKinds.errors.delete', 'Failed to delete price kind.')
+        const message = extractOptimisticLockConflict(err)
+          ? t('ui.forms.flash.recordModified', 'This record was modified by someone else. Refresh and try again.')
+          : err instanceof Error ? err.message : t('catalog.priceKinds.errors.delete', 'Failed to delete price kind.')
         flash(message, 'error')
       }
     },
@@ -508,6 +521,7 @@ export function PriceKindSettings() {
                   fetchOptions={currencyOptionsLoader}
                   labels={currencyLabels}
                   allowInlineCreate={false}
+                  sortOptions="none"
                 />
               </div>
               <div className="flex flex-col gap-2">

package/src/modules/catalog/components/categories/CategoriesDataTable.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef } from '@tanstack/react-table'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import type { FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -170,6 +171,7 @@ export default function CategoriesDataTable() {
     })
     if (!confirmed) return
     try {
+      // optimistic-lock-exempt: delete-only mutation — no field-level lost-update
       await apiCallOrThrow(
         `/api/catalog/categories?id=${encodeURIComponent(category.id)}`,
         { method: 'DELETE' },
@@ -197,6 +199,13 @@ export default function CategoriesDataTable() {
         ) : undefined}
         columns={columns}
         data={rows}
+        emptyState={(
+          <ListEmptyState
+            entityName={t('catalog.categories.list.title', 'Categories')}
+            createHref={canManage ? '/backend/catalog/categories/create' : undefined}
+            createLabel={canManage ? t('catalog.categories.list.actions.create', 'Create') : undefined}
+          />
+        )}
         searchValue={search}
         searchPlaceholder={t('catalog.categories.list.searchPlaceholder', 'Search categories')}
         onSearchChange={(value) => { setSearch(value); setPage(1) }}

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

@@ -68,6 +68,7 @@ export function ProductMediaManager({
           fd.set('entityId', entityId)
           fd.set('recordId', draftRecordId)
           fd.set('file', file)
+          // optimistic-lock-exempt: media attach/detach/reorder
           const call = await apiCall<{ ok?: boolean; item?: ProductMediaItem; error?: string }>(
             '/api/attachments',
             { method: 'POST', body: fd },
@@ -111,6 +112,7 @@ export function ProductMediaManager({
   const handleRemove = React.useCallback(
     async (attachmentId: string) => {
       setError(null)
+      // optimistic-lock-exempt: media attach/detach/reorder
       const call = await apiCall<{ ok?: boolean; error?: string }>(
         `/api/attachments?id=${encodeURIComponent(attachmentId)}`,
         { method: 'DELETE' },

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

@@ -4,11 +4,13 @@ import * as React from 'react'
 import Link from 'next/link'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { DataTable, type DataTableExportFormat } from '@open-mercato/ui/backend/DataTable'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { deleteCrud, buildCrudExportUrl } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { useCustomFieldDefs } from '@open-mercato/ui/backend/utils/customFieldDefs'
 import { applyCustomFieldVisibility } from '@open-mercato/ui/backend/utils/customFieldColumns'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
@@ -619,9 +621,12 @@ export default function ProductsDataTable({
     })
     if (!confirmed) return
     try {
-      await deleteCrud('catalog/products', row.id, {
-        errorMessage: t('catalog.products.list.error.delete', 'Failed to delete product'),
-      })
+      const headers = buildOptimisticLockHeader(typeof row.updated_at === 'string' ? row.updated_at : null)
+      await withScopedApiRequestHeaders(headers, () => (
+        deleteCrud('catalog/products', row.id, {
+          errorMessage: t('catalog.products.list.error.delete', 'Failed to delete product'),
+        })
+      ))
       flash(t('catalog.products.flash.deleted', 'Product deleted'), 'success')
       setReloadToken((token) => token + 1)
     } catch (error) {
@@ -674,6 +679,13 @@ export default function ProductsDataTable({
         )}
         columns={columns}
         data={rows}
+        emptyState={(
+          <ListEmptyState
+            entityName={t('catalog.products.page.title', 'Products & services')}
+            createHref="/backend/catalog/products/create"
+            createLabel={t('catalog.products.actions.create', 'Create')}
+          />
+        )}
         searchValue={search}
         onSearchChange={handleSearchChange}
         filters={filters}

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

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { flushSync } from 'react-dom'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Input } from '@open-mercato/ui/primitives/input'
@@ -282,16 +283,43 @@ export function VariantPricesSection({
   embedded = false,
 }: VariantPricesSectionProps) {
   const t = useT()
+  const pricesRef = React.useRef(values.prices)
+
+  React.useEffect(() => {
+    pricesRef.current = values.prices
+  }, [values.prices])
 
   const updatePrice = React.useCallback(
     (priceKindId: string, patch: Partial<VariantPriceDraft>) => {
-      const prev = values.prices?.[priceKindId] ?? { priceKindId, amount: '', displayMode: 'excluding-tax' }
-      setValue('prices', { ...values.prices, [priceKindId]: { ...prev, ...patch, priceKindId } })
+      const currentPrices = pricesRef.current ?? {}
+      const prev = currentPrices[priceKindId] ?? { priceKindId, amount: '', displayMode: 'excluding-tax' }
+      const nextPrices = { ...currentPrices, [priceKindId]: { ...prev, ...patch, priceKindId } }
+      pricesRef.current = nextPrices
+      flushSync(() => setValue('prices', nextPrices))
     },
-    [setValue, values.prices],
+    [setValue],
   )
 
   const containerClass = embedded ? 'space-y-4' : 'space-y-4 rounded-lg border p-4'
+  const selectedTaxRate = values.taxRateId
+    ? taxRates.find((rate) => rate.id === values.taxRateId) ?? null
+    : null
+  const fallbackSelectedTaxRate =
+    values.taxRateId && !selectedTaxRate
+      ? {
+          id: values.taxRateId,
+          name: values.taxRateId,
+          code: null,
+          rate: null,
+          isDefault: false,
+        }
+      : null
+  const displayedSelectedTaxRate = selectedTaxRate ?? fallbackSelectedTaxRate
+  const displayedTaxRates = fallbackSelectedTaxRate
+    ? [fallbackSelectedTaxRate, ...taxRates]
+    : taxRates
+  const taxRateOptionsKey = displayedTaxRates.map((rate) => `${rate.id}:${formatTaxRateLabel(rate)}`).join('\0')
+  const taxRateSelectKey = `variant-tax-rate:${values.taxRateId ?? ''}:${taxRateOptionsKey}`
 
   return (
     <div className={containerClass}>
@@ -305,14 +333,19 @@ export function VariantPricesSection({
           </div>
           <div className="flex items-center gap-2">
             <Select
+              key={taxRateSelectKey}
               value={values.taxRateId || undefined}
-              onValueChange={(value) => setValue('taxRateId', value || null)}
+              onValueChange={(value) => {
+                if (value) setValue('taxRateId', value)
+              }}
             >
               <SelectTrigger>
-                <SelectValue placeholder={t('catalog.variants.form.pricesTaxNone', 'No tax override')} />
+                <SelectValue placeholder={t('catalog.variants.form.pricesTaxNone', 'No tax override')}>
+                  {displayedSelectedTaxRate ? formatTaxRateLabel(displayedSelectedTaxRate) : undefined}
+                </SelectValue>
               </SelectTrigger>
               <SelectContent>
-                {taxRates.map((rate) => (
+                {displayedTaxRates.map((rate) => (
                   <SelectItem key={rate.id} value={rate.id}>
                     {formatTaxRateLabel(rate)}
                   </SelectItem>
@@ -324,14 +357,19 @@ export function VariantPricesSection({
       ) : (
         <div className="flex justify-end">
           <Select
+            key={taxRateSelectKey}
             value={values.taxRateId || undefined}
-            onValueChange={(value) => setValue('taxRateId', value || null)}
+            onValueChange={(value) => {
+              if (value) setValue('taxRateId', value)
+            }}
           >
             <SelectTrigger>
-              <SelectValue placeholder={t('catalog.variants.form.pricesTaxNone', 'No tax override')} />
+              <SelectValue placeholder={t('catalog.variants.form.pricesTaxNone', 'No tax override')}>
+                {displayedSelectedTaxRate ? formatTaxRateLabel(displayedSelectedTaxRate) : undefined}
+              </SelectValue>
             </SelectTrigger>
             <SelectContent>
-              {taxRates.map((rate) => (
+              {displayedTaxRates.map((rate) => (
                 <SelectItem key={rate.id} value={rate.id}>
                   {formatTaxRateLabel(rate)}
                 </SelectItem>
@@ -359,6 +397,7 @@ export function VariantPricesSection({
                 <Input
                   className="mt-3"
                   value={draft?.amount ?? ''}
+                  onInput={(event) => updatePrice(kind.id, { amount: event.currentTarget.value })}
                   onChange={(event) => updatePrice(kind.id, { amount: event.target.value })}
                   placeholder="0.00"
                 />