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

package/src/modules/resources/commands/tag-assignments.ts

@@ -124,6 +124,61 @@ const assignResourceTagCommand: CommandHandler<ResourcesResourceTagAssignmentInp
       organizationId: before.organizationId,
     })
   },
+  redo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload<ResourceTagAssignmentUndoPayload>(logEntry)
+    const before = payload?.before
+    if (!before) {
+      throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for tag assignment' })
+    }
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const tag = await em.findOne(ResourcesResourceTag, {
+      id: before.tagId,
+      tenantId: before.tenantId,
+      organizationId: before.organizationId,
+    })
+    if (!tag) throw new CrudHttpError(404, { error: 'Tag not found.' })
+    const resource = await findOneWithDecryption(
+      em,
+      ResourcesResource,
+      { id: before.resourceId, tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
+      undefined,
+      { tenantId: before.tenantId, organizationId: before.organizationId },
+    )
+    if (!resource) throw new CrudHttpError(404, { error: 'Resource not found.' })
+    let assignment = await em.findOne(ResourcesResourceTagAssignment, {
+      tag,
+      resource,
+      tenantId: before.tenantId,
+      organizationId: before.organizationId,
+    })
+    if (!assignment) {
+      assignment = em.create(ResourcesResourceTagAssignment, {
+        tag,
+        resource,
+        tenantId: before.tenantId,
+        organizationId: before.organizationId,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      })
+      em.persist(assignment)
+      await em.flush()
+    }
+
+    const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine,
+      action: 'updated',
+      entity: assignment,
+      identifiers: {
+        id: assignment.id,
+        tenantId: assignment.tenantId,
+        organizationId: assignment.organizationId,
+      },
+      events: resourcesResourceTagAssignmentCrudEvents,
+    })
+
+    return { assignmentId: assignment.id }
+  },
 }
 
 const unassignResourceTagCommand: CommandHandler<ResourcesResourceTagAssignmentInput, { assignmentId: string | null }> = {

package/src/modules/resources/components/ResourceCrudForm.tsx

@@ -52,8 +52,10 @@ export type ResourcesResourceFormConfig = {
 
 export function useResourcesResourceFormConfig(options: {
   tagsSection?: ResourceTagsSectionConfig
+  selectedResourceTypeId?: string | null
+  selectedCapacityUnit?: { value: string; label: string; color?: string | null; icon?: string | null } | null
 } = {}): ResourcesResourceFormConfig {
-  const { tagsSection } = options
+  const { selectedCapacityUnit, selectedResourceTypeId, tagsSection } = options
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
   const [resourceTypes, setResourceTypes] = React.useState<ResourceTypeRow[]>([])
@@ -80,6 +82,37 @@ export function useResourcesResourceFormConfig(options: {
     return () => { cancelled = true }
   }, [scopeVersion])
 
+  React.useEffect(() => {
+    const selectedId = typeof selectedResourceTypeId === 'string' && selectedResourceTypeId.trim().length
+      ? selectedResourceTypeId.trim()
+      : null
+    if (!selectedId) return
+    if (resourceTypes.some((type) => type.id === selectedId)) return
+    const selectedResourceTypeLookupId = selectedId
+    let cancelled = false
+    async function loadSelectedResourceType() {
+      try {
+        const call = await apiCall<ResourceTypesResponse>(
+          `/api/resources/resource-types?ids=${encodeURIComponent(selectedResourceTypeLookupId)}&pageSize=1`,
+        )
+        const entry = Array.isArray(call.result?.items) ? call.result.items[0] : null
+        const entryId = typeof entry?.id === 'string' ? entry.id : null
+        const entryName = typeof entry?.name === 'string' ? entry.name : null
+        if (!entryId || !entryName) return
+        if (!cancelled) {
+          setResourceTypes((prev) => {
+            if (prev.some((type) => type.id === entryId)) return prev
+            return [{ id: entryId, name: entryName }, ...prev]
+          })
+        }
+      } catch {
+        if (!cancelled) setResourceTypes((prev) => prev)
+      }
+    }
+    loadSelectedResourceType()
+    return () => { cancelled = true }
+  }, [resourceTypes, selectedResourceTypeId])
+
   React.useEffect(() => {
     let cancelled = false
     async function loadCapacityUnitDictionary() {
@@ -131,66 +164,75 @@ export function useResourcesResourceFormConfig(options: {
         id: 'description',
         label: t('resources.resources.form.fields.description', 'Description'),
         type: 'richtext',
-        editor: 'html',
+        editor: 'uiw',
       },
       {
         id: 'resourceTypeId',
         label: t('resources.resources.form.fields.type', 'Resource type'),
         type: 'custom',
-        component: ({ value, setValue, setFormValue, disabled }) => (
-          <div className="flex items-center gap-2">
-            <Select
-              value={typeof value === 'string' && value ? value : undefined}
-              onValueChange={(next) => {
-                const value = next || ''
-                setValue(value)
-                if (setFormValue) {
-                  setFormValue('customFieldsetCode', resolveFieldsetCode(value || null))
-                }
-              }}
-              disabled={disabled}
-            >
-              <SelectTrigger data-crud-focus-target="">
-                <SelectValue placeholder={t('ui.forms.select.emptyOption', '—')} />
-              </SelectTrigger>
-              <SelectContent>
-                {resourceTypes.map((type) => (
-                  <SelectItem key={type.id} value={type.id}>
-                    {type.name}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-            <Button
-              asChild
-              type="button"
-              variant="ghost"
-              size="icon"
-              className="shrink-0"
-              title={t('resources.resources.form.fields.type.manage', 'Manage resource types')}
-              aria-label={t('resources.resources.form.fields.type.manage', 'Manage resource types')}
-              disabled={disabled}
-            >
-              <Link href="/backend/resources/resource-types">
-                <Settings className="h-4 w-4" aria-hidden />
-              </Link>
-            </Button>
-            <Button
-              asChild
-              type="button"
-              variant="ghost"
-              size="icon"
-              className="shrink-0"
-              title={t('resources.resources.form.fields.type.add', 'Add resource type')}
-              aria-label={t('resources.resources.form.fields.type.add', 'Add resource type')}
-              disabled={disabled}
-            >
-              <Link href="/backend/resources/resource-types/create">
-                <Plus className="h-4 w-4" aria-hidden />
-              </Link>
-            </Button>
-          </div>
-        ),
+        component: ({ value, setValue, setFormValue, disabled }) => {
+          const selectedValue = typeof value === 'string' ? value : ''
+          const selectedOption = resourceTypes.find((type) => type.id === selectedValue)
+          const optionsKey = resourceTypes.map((type) => `${type.id}:${type.name}`).join('\0')
+
+          return (
+            <div className="flex items-center gap-2">
+              <Select
+                key={`resource-type:${selectedValue}:${optionsKey}`}
+                value={selectedValue}
+                onValueChange={(next) => {
+                  const value = next || ''
+                  setValue(value)
+                  if (setFormValue) {
+                    setFormValue('customFieldsetCode', resolveFieldsetCode(value || null))
+                  }
+                }}
+                disabled={disabled}
+              >
+                <SelectTrigger data-crud-focus-target="">
+                  <SelectValue placeholder={t('ui.forms.select.emptyOption', '—')}>
+                    {selectedOption?.name}
+                  </SelectValue>
+                </SelectTrigger>
+                <SelectContent>
+                  {resourceTypes.map((type) => (
+                    <SelectItem key={type.id} value={type.id}>
+                      {type.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <Button
+                asChild
+                type="button"
+                variant="ghost"
+                size="icon"
+                className="shrink-0"
+                title={t('resources.resources.form.fields.type.manage', 'Manage resource types')}
+                aria-label={t('resources.resources.form.fields.type.manage', 'Manage resource types')}
+                disabled={disabled}
+              >
+                <Link href="/backend/resources/resource-types">
+                  <Settings className="h-4 w-4" aria-hidden />
+                </Link>
+              </Button>
+              <Button
+                asChild
+                type="button"
+                variant="ghost"
+                size="icon"
+                className="shrink-0"
+                title={t('resources.resources.form.fields.type.add', 'Add resource type')}
+                aria-label={t('resources.resources.form.fields.type.add', 'Add resource type')}
+                disabled={disabled}
+              >
+                <Link href="/backend/resources/resource-types/create">
+                  <Plus className="h-4 w-4" aria-hidden />
+                </Link>
+              </Button>
+            </div>
+          )
+        },
       },
       {
         id: 'capacity',
@@ -219,6 +261,7 @@ export function useResourcesResourceFormConfig(options: {
               value={typeof value === 'string' ? value : null}
               onChange={(next) => setValue(next ?? '')}
               selectClassName="w-full"
+              seedOptions={selectedCapacityUnit ? [selectedCapacityUnit] : undefined}
             />
           )
         },
@@ -257,6 +300,7 @@ export function useResourcesResourceFormConfig(options: {
     capacityUnitDictionaryId,
     resolveFieldsetCode,
     resourceTypes,
+    selectedCapacityUnit,
     t,
   ])
 
@@ -316,6 +360,7 @@ export type ResourcesResourceFormProps = {
   embedded?: boolean
   successRedirect?: string
   initialValues?: Record<string, unknown>
+  optimisticLockUpdatedAt?: string | null
   onSubmit: (values: Record<string, unknown>) => Promise<void>
   onDelete?: () => Promise<void>
   isLoading?: boolean
@@ -332,6 +377,7 @@ export function ResourcesResourceForm(props: ResourcesResourceFormProps) {
     embedded = false,
     successRedirect,
     initialValues,
+    optimisticLockUpdatedAt,
     onSubmit,
     onDelete,
     isLoading,
@@ -368,6 +414,7 @@ export function ResourcesResourceForm(props: ResourcesResourceFormProps) {
       fields={formConfig.fields}
       groups={groups}
       initialValues={initialValues}
+      optimisticLockUpdatedAt={optimisticLockUpdatedAt}
       entityId={E.resources.resources_resource}
       customFieldsetBindings={{ [E.resources.resources_resource]: { valueKey: 'customFieldsetCode' } }}
       onSubmit={onSubmit}

package/src/modules/resources/components/ResourceTypeCrudForm.tsx

@@ -13,6 +13,7 @@ export type ResourceTypeFormValues = {
   name: string
   description?: string
   appearance?: { icon?: string | null; color?: string | null }
+  updatedAt?: string | null
 } & Record<string, unknown>
 
 type ResourceTypeCrudFormProps = {
@@ -78,7 +79,7 @@ export function ResourceTypeCrudForm({
 
   const fields = React.useMemo<CrudField[]>(() => [
     { id: 'name', label: t('resources.resourceTypes.form.name', 'Name'), type: 'text', required: true },
-    { id: 'description', label: t('resources.resourceTypes.form.description', 'Description'), type: 'richtext', editor: 'html' },
+    { id: 'description', label: t('resources.resourceTypes.form.description', 'Description'), type: 'richtext', editor: 'uiw' },
     {
       id: 'appearance',
       label: t('resources.resourceTypes.form.appearance.label', 'Appearance'),
@@ -118,6 +119,7 @@ export function ResourceTypeCrudForm({
       groups={groups}
       entityId={E.resources.resources_resource_type}
       initialValues={initialValues}
+      optimisticLockUpdatedAt={mode === 'edit' ? initialValues.updatedAt : undefined}
       isLoading={isLoading}
       onSubmit={onSubmit}
       onDelete={mode === 'edit' ? onDelete : undefined}

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

@@ -191,6 +191,7 @@
   "resources.errors.unauthorized": "Nicht autorisiert",
   "resources.nav.group": "Ressourcenplanung",
   "resources.resourceTypes.actions.add": "Ressourcentyp hinzufügen",
+  "resources.resourceTypes.actions.backToList": "Zurück zu Ressourcentypen",
   "resources.resourceTypes.actions.delete": "Löschen",
   "resources.resourceTypes.actions.deleteConfirm": "Ressourcentyp \"{{name}}\" löschen?",
   "resources.resourceTypes.actions.edit": "Bearbeiten",

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

@@ -191,6 +191,7 @@
   "resources.errors.unauthorized": "Unauthorized",
   "resources.nav.group": "Resource planning",
   "resources.resourceTypes.actions.add": "Add resource type",
+  "resources.resourceTypes.actions.backToList": "Back to resource types",
   "resources.resourceTypes.actions.delete": "Delete",
   "resources.resourceTypes.actions.deleteConfirm": "Delete resource type \"{{name}}\"?",
   "resources.resourceTypes.actions.edit": "Edit",

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

@@ -191,6 +191,7 @@
   "resources.errors.unauthorized": "No autorizado",
   "resources.nav.group": "Planificación de recursos",
   "resources.resourceTypes.actions.add": "Agregar tipo de recurso",
+  "resources.resourceTypes.actions.backToList": "Volver a tipos de recursos",
   "resources.resourceTypes.actions.delete": "Eliminar",
   "resources.resourceTypes.actions.deleteConfirm": "Eliminar el tipo de recurso \"{{name}}\"?",
   "resources.resourceTypes.actions.edit": "Editar",

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

@@ -191,6 +191,7 @@
   "resources.errors.unauthorized": "Brak autoryzacji",
   "resources.nav.group": "Planowanie zasobów",
   "resources.resourceTypes.actions.add": "Dodaj typ zasobu",
+  "resources.resourceTypes.actions.backToList": "Powrót do typów zasobów",
   "resources.resourceTypes.actions.delete": "Usuń",
   "resources.resourceTypes.actions.deleteConfirm": "Usunąć typ zasobu \"{{name}}\"?",
   "resources.resourceTypes.actions.edit": "Edytuj",

package/src/modules/sales/api/documents/factory.ts

@@ -202,6 +202,12 @@ const mapUpdateResponse = (entity: any) => {
     paymentMethodId: entity?.paymentMethodId ?? null,
     paymentMethodCode: entity?.paymentMethodCode ?? null,
     paymentMethodSnapshot: normalizeJsonRecord(entity?.paymentMethodSnapshot),
+    // Return the fresh version so the client can refresh its optimistic-lock
+    // token after a successful inline save — otherwise a second save on the same
+    // page sends the now-stale updatedAt and falsely 409s (#2055 QA).
+    updatedAt: entity?.updatedAt
+      ? (entity.updatedAt instanceof Date ? entity.updatedAt.toISOString() : entity.updatedAt)
+      : null,
   }
 }
 
@@ -492,7 +498,13 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
           const organizationId =
             typeof item?.organizationId === 'string' ? item.organizationId : ctx?.selectedOrganizationId ?? ctx?.auth?.orgId ?? null
           if (orderId && tenantId && organizationId) {
-            const em = ctx?.container?.resolve?.('em') as import('@mikro-orm/postgresql').EntityManager | undefined
+            const requestEm = ctx?.container?.resolve?.('em') as import('@mikro-orm/postgresql').EntityManager | undefined
+            // Display-only totals recalculation: run on a forked EntityManager so
+            // the order/line/adjustment entities loaded here never enter the
+            // request's Unit of Work. This guarantees a GET can never flush an
+            // UPDATE (and thus never advance `updated_at`), which would otherwise
+            // surface as a spurious optimistic-lock 409 in another tab.
+            const em = requestEm?.fork()
             if (em) {
               const totals = await recalculateOrderTotalsForDisplay(
                 em,

package/src/modules/sales/api/shipping-methods/route.ts

@@ -22,6 +22,7 @@ const listSchema = z
     pageSize: z.coerce.number().min(1).max(100).default(50),
     search: z.string().optional(),
     currency: z.string().optional(),
+    id: z.string().uuid().optional(),
     isActive: z.string().optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
@@ -69,6 +70,9 @@ function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown
   if (query.currency && query.currency.trim().length > 0) {
     filters.currency_code = query.currency.trim().toUpperCase()
   }
+  if (query.id) {
+    filters.id = { $eq: query.id }
+  }
   const isActive = parseBooleanToken(query.isActive)
   if (isActive !== null) filters.is_active = isActive
   return filters

package/src/modules/sales/api/tax-rates/route.ts

@@ -20,6 +20,7 @@ const listSchema = z
     country: z.string().optional(),
     region: z.string().optional(),
     channelId: z.string().uuid().optional(),
+    id: z.string().uuid().optional(),
     isCompound: z.string().optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
@@ -86,6 +87,9 @@ function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown
   if (query.channelId) {
     filters.channel_id = query.channelId
   }
+  if (query.id) {
+    filters.id = { $eq: query.id }
+  }
   const isCompound = parseBooleanToken(query.isCompound)
   if (isCompound !== null) filters.is_compound = isCompound
   return filters

package/src/modules/sales/backend/sales/channels/[channelId]/edit/page.tsx

@@ -181,6 +181,7 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
               { id: 'custom', title: t('entities.customFields.title', 'Custom Attributes'), column: 2, kind: 'customFields' },
             ]}
             initialValues={initialValues ?? undefined}
+            optimisticLockUpdatedAt={typeof initialValues?.updatedAt === 'string' ? initialValues.updatedAt : null}
             isLoading={loading}
             loadingMessage={t('sales.channels.form.loading', 'Loading channel…')}
             submitLabel={t('sales.channels.form.updateSubmit', 'Save changes')}
@@ -225,6 +226,11 @@ function mapChannelToFormValues(item: Record<string, unknown>): ChannelFormValue
         ? item.status_entry_id
         : null,
     isActive: item.isActive === true || item.is_active === true,
+    updatedAt: typeof item.updatedAt === 'string'
+      ? item.updatedAt
+      : typeof item.updated_at === 'string'
+        ? item.updated_at
+        : null,
   }
   return { ...values, ...extractCustomFieldEntries(item) }
 }

package/src/modules/sales/backend/sales/channels/offers/page.tsx

@@ -10,7 +10,9 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -280,12 +282,16 @@ export default function SalesChannelOffersListPage() {
 
   const handleDelete = React.useCallback(async (row: OfferRow) => {
     try {
-      await deleteCrud('catalog/offers', row.id, {
-        errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
-      })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud('catalog/offers', row.id, {
+          errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
+        }),
+      )
       flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')
       handleRefresh()
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) { handleRefresh(); return }
       console.error('sales.channels.offers.delete', err)
     }
   }, [handleRefresh, t])

package/src/modules/sales/backend/sales/channels/page.tsx

@@ -10,8 +10,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
@@ -138,12 +139,26 @@ export default function SalesChannelsPage() {
 
   const handleDelete = React.useCallback(async (row: ChannelRow) => {
     try {
-      await deleteCrud('sales/channels', row.id, {
-        errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
-      })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud('sales/channels', row.id, {
+          errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
+        }),
+      )
       flash(t('sales.channels.table.messages.deleted', 'Channel deleted.'), 'success')
       handleRefresh()
     } catch (err) {
+      if (extractOptimisticLockConflict(err)) {
+        // Someone edited the channel after this list loaded — refuse the
+        // stale delete, surface the conflict, and reload so the row reflects
+        // the latest server state (QA #2055 channel edit/delete broken state).
+        flash(
+          t('ui.forms.flash.recordModified', 'This record was modified by someone else. Refresh and try again.'),
+          'error',
+        )
+        handleRefresh()
+        return
+      }
       console.error('sales.channels.delete', err)
     }
   }, [handleRefresh, t])