@open-mercato/core 0.6.8-develop.7099.1.7ba2771d06 → 0.7.0

package/src/modules/eudr/backend/eudr/plots/[id]/page.tsx

@@ -93,6 +93,8 @@ export default function EditEudrPlotPage({ params }: { params?: { id?: string }
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [notFound, setNotFound] = React.useState(false)
+  const [geometryDraft, setGeometryDraft] = React.useState<string | null>(null)
+  const areaRequired = !isPolygonGeometry(geometryDraft ?? formatGeometry(record?.geometry))
 
   React.useEffect(() => {
     let cancelled = false
@@ -197,7 +199,10 @@ export default function EditEudrPlotPage({ params }: { params?: { id?: string }
         <GeometryInput
           id={id}
           value={typeof value === 'string' ? value : ''}
-          onChange={(nextValue) => setValue(nextValue)}
+          onChange={(nextValue) => {
+            setValue(nextValue)
+            setGeometryDraft(nextValue)
+          }}
           disabled={disabled}
           areaHa={typeof values?.areaHa === 'string' || typeof values?.areaHa === 'number' ? String(values.areaHa) : ''}
         />
@@ -208,6 +213,7 @@ export default function EditEudrPlotPage({ params }: { params?: { id?: string }
       layout: 'half',
       label: translate('eudr.plots.form.areaHa'),
       type: 'custom',
+      required: areaRequired,
       description: translate('eudr.plots.form.areaHaHelp'),
       component: ({ id, value, setValue, values, disabled }) => {
         const polygonGeometry = isPolygonGeometry(values?.geometry)
@@ -241,7 +247,7 @@ export default function EditEudrPlotPage({ params }: { params?: { id?: string }
         />
       ),
     },
-  ], [translate])
+  ], [translate, areaRequired])
 
   const groups = React.useMemo<CrudFormGroup[]>(() => [
     {

package/src/modules/eudr/backend/eudr/plots/create/page.meta.ts

@@ -7,6 +7,7 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Plots', labelKey: 'eudr.nav.plots', href: '/backend/eudr/plots' },
     { label: 'Create', labelKey: 'eudr.plots.create.title' },
   ],

package/src/modules/eudr/backend/eudr/plots/create/page.tsx

@@ -50,6 +50,8 @@ function isCompanySnapshot(value: unknown): value is CompanySnapshot {
 export default function CreateEudrPlotPage() {
   const translate = useT()
   const router = useRouter()
+  const [geometryDraft, setGeometryDraft] = React.useState('')
+  const areaRequired = !isPolygonGeometry(geometryDraft)
 
   const fields = React.useMemo<CrudField[]>(() => [
     {
@@ -113,7 +115,10 @@ export default function CreateEudrPlotPage() {
         <GeometryInput
           id={id}
           value={typeof value === 'string' ? value : ''}
-          onChange={(nextValue) => setValue(nextValue)}
+          onChange={(nextValue) => {
+            setValue(nextValue)
+            setGeometryDraft(nextValue)
+          }}
           disabled={disabled}
           areaHa={typeof values?.areaHa === 'string' || typeof values?.areaHa === 'number' ? String(values.areaHa) : ''}
         />
@@ -124,6 +129,7 @@ export default function CreateEudrPlotPage() {
       layout: 'half',
       label: translate('eudr.plots.form.areaHa'),
       type: 'custom',
+      required: areaRequired,
       description: translate('eudr.plots.form.areaHaHelp'),
       component: ({ id, value, setValue, values, disabled }) => {
         const polygonGeometry = isPolygonGeometry(values?.geometry)
@@ -158,7 +164,7 @@ export default function CreateEudrPlotPage() {
         />
       ),
     },
-  ], [translate])
+  ], [translate, areaRequired])
 
   const groups = React.useMemo<CrudFormGroup[]>(() => [
     {

package/src/modules/eudr/backend/eudr/plots/page.meta.ts

@@ -8,5 +8,8 @@ export const metadata = {
   pagePriority: 10,
   pageOrder: 20,
   icon: 'map',
-  breadcrumb: [{ label: 'Plots', labelKey: 'eudr.nav.plots' }],
+  breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
+    { label: 'Plots', labelKey: 'eudr.nav.plots' },
+  ],
 }

package/src/modules/eudr/backend/eudr/plots/page.tsx

@@ -44,7 +44,6 @@ type PlotListResponse = {
   items: PlotRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 type CompanyOptionResponse = {
@@ -103,7 +102,6 @@ export default function EudrPlotsPage() {
   const [pageSize, setPageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [filters, setFilters] = React.useState<FilterValues>({})
@@ -166,7 +164,6 @@ export default function EudrPlotsPage() {
         setRows(Array.isArray(payload.items) ? payload.items : [])
         setTotal(typeof payload.total === 'number' ? payload.total : 0)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch {
         if (!cancelled) flash(translate('eudr.plots.list.loadError'), 'error')
       } finally {
@@ -422,7 +419,6 @@ export default function EudrPlotsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

package/src/modules/eudr/backend/eudr/product-mappings/[id]/page.meta.ts

@@ -7,6 +7,8 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Product mappings', labelKey: 'eudr.nav.mappings', href: '/backend/eudr/product-mappings' },
+    { label: 'Edit product mapping', labelKey: 'eudr.productMappings.edit.title' },
   ],
 }

package/src/modules/eudr/backend/eudr/product-mappings/create/page.meta.ts

@@ -7,6 +7,7 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Product mappings', labelKey: 'eudr.nav.mappings', href: '/backend/eudr/product-mappings' },
     { label: 'Create', labelKey: 'eudr.productMappings.create.title' },
   ],

package/src/modules/eudr/backend/eudr/product-mappings/page.meta.ts

@@ -8,5 +8,8 @@ export const metadata = {
   pagePriority: 10,
   pageOrder: 10,
   icon: 'package',
-  breadcrumb: [{ label: 'Product mappings', labelKey: 'eudr.nav.mappings' }],
+  breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
+    { label: 'Product mappings', labelKey: 'eudr.nav.mappings' },
+  ],
 }

package/src/modules/eudr/backend/eudr/product-mappings/page.tsx

@@ -40,7 +40,6 @@ type ProductMappingsResponse = {
   items: ProductMappingRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDateTime(value: string | null | undefined, emptyLabel: string, locale: string): string {
@@ -72,7 +71,6 @@ export default function EudrProductMappingsPage() {
   const [pageSize, setPageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [filters, setFilters] = React.useState<FilterValues>({})
@@ -129,7 +127,6 @@ export default function EudrProductMappingsPage() {
         setRows(Array.isArray(payload.items) ? payload.items : [])
         setTotal(typeof payload.total === 'number' ? payload.total : 0)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch {
         if (!cancelled) flash(translate('eudr.productMappings.list.loadError'), 'error')
       } finally {
@@ -324,7 +321,6 @@ export default function EudrProductMappingsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

package/src/modules/eudr/backend/eudr/risk-assessments/[id]/page.meta.ts

@@ -7,6 +7,8 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Risk assessments', labelKey: 'eudr.nav.riskAssessments', href: '/backend/eudr/risk-assessments' },
+    { label: 'Edit risk assessment', labelKey: 'eudr.riskAssessments.edit.title' },
   ],
 }

package/src/modules/eudr/backend/eudr/risk-assessments/create/page.meta.ts

@@ -7,6 +7,7 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Risk assessments', labelKey: 'eudr.nav.riskAssessments', href: '/backend/eudr/risk-assessments' },
     { label: 'Create', labelKey: 'eudr.riskAssessments.create.title' },
   ],

package/src/modules/eudr/backend/eudr/risk-assessments/page.meta.ts

@@ -8,5 +8,8 @@ export const metadata = {
   pagePriority: 10,
   pageOrder: 40,
   icon: 'shield-alert',
-  breadcrumb: [{ label: 'Risk assessments', labelKey: 'eudr.nav.riskAssessments' }],
+  breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
+    { label: 'Risk assessments', labelKey: 'eudr.nav.riskAssessments' },
+  ],
 }

package/src/modules/eudr/backend/eudr/risk-assessments/page.tsx

@@ -47,7 +47,6 @@ type RiskAssessmentsResponse = {
   items: RiskAssessmentRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 type MutationContext = {
@@ -106,7 +105,6 @@ export default function EudrRiskAssessmentsPage() {
   const [pageSize, setPageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [sorting, setSorting] = React.useState<SortingState>([{ id: 'assessedAt', desc: true }])
   const [filters, setFilters] = React.useState<FilterValues>({})
   const [search, setSearch] = React.useState('')
@@ -160,7 +158,6 @@ export default function EudrRiskAssessmentsPage() {
         setRows(Array.isArray(payload.items) ? payload.items : [])
         setTotal(typeof payload.total === 'number' ? payload.total : 0)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch {
         if (!cancelled) flash(translate('eudr.riskAssessments.list.loadError'), 'error')
       } finally {
@@ -368,7 +365,6 @@ export default function EudrRiskAssessmentsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

package/src/modules/eudr/backend/eudr/statements/[id]/page.meta.ts

@@ -7,6 +7,8 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Statements', labelKey: 'eudr.nav.statements', href: '/backend/eudr/statements' },
+    { label: 'Edit statement', labelKey: 'eudr.statements.edit.title' },
   ],
 }

package/src/modules/eudr/backend/eudr/statements/[id]/page.tsx

@@ -29,6 +29,7 @@ import {
   type ReferencedStatementValue,
   translateEudrCrudError,
 } from '../../../../components/formConfig'
+import { canDeleteStatement } from '../../../../lib/statement-lifecycle'
 import { StatementLifecycleBar } from '../../../../components/StatementLifecycleBar'
 import { StatementReadinessChecklist } from '../../../../components/StatementReadinessChecklist'
 import { StatementRiskSection, type StatementLatestRisk } from '../../../../components/StatementRiskSection'
@@ -644,6 +645,7 @@ export default function EditEudrStatementPage({ params }: { params?: { id?: stri
           backHref="/backend/eudr/statements"
           cancelHref="/backend/eudr/statements"
           deleteRedirect="/backend/eudr/statements"
+          deleteVisible={canDeleteStatement(record.status)}
           submitLabel={translate('eudr.statements.form.submitUpdate')}
           fields={fields}
           groups={groups}

package/src/modules/eudr/backend/eudr/statements/create/page.meta.ts

@@ -7,6 +7,7 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Statements', labelKey: 'eudr.nav.statements', href: '/backend/eudr/statements' },
     { label: 'Create', labelKey: 'eudr.statements.create.title' },
   ],

package/src/modules/eudr/backend/eudr/statements/page.meta.ts

@@ -8,5 +8,8 @@ export const metadata = {
   pagePriority: 10,
   pageOrder: 30,
   icon: 'file-text',
-  breadcrumb: [{ label: 'Statements', labelKey: 'eudr.nav.statements' }],
+  breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
+    { label: 'Statements', labelKey: 'eudr.nav.statements' },
+  ],
 }

package/src/modules/eudr/backend/eudr/statements/page.tsx

@@ -6,7 +6,7 @@ import { useRouter } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
-import { RowActions } from '@open-mercato/ui/backend/RowActions'
+import { RowActions, type RowActionItem } from '@open-mercato/ui/backend/RowActions'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
@@ -22,7 +22,8 @@ import type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import type { EudrActivityType, EudrCommodity, EudrRiskConclusion, EudrRiskTier, EudrStatementStatus } from '../../../data/validators'
-import { commodityOptions, statementStatusOptions, statusBadgeVariant } from '../../../components/formConfig'
+import { commodityOptions, statementStatusOptions, statusBadgeVariant, translateEudrErrorMessage } from '../../../components/formConfig'
+import { canDeleteStatement } from '../../../lib/statement-lifecycle'
 import {
   riskConclusionBadgeVariant,
   riskTierBadgeVariant,
@@ -52,7 +53,6 @@ type StatementsResponse = {
   items: StatementRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDateTime(value: string | null | undefined, emptyLabel: string, locale: string): string {
@@ -79,7 +79,6 @@ export default function EudrStatementsPage() {
   const [pageSize, setPageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [filters, setFilters] = React.useState<FilterValues>({})
@@ -135,7 +134,6 @@ export default function EudrStatementsPage() {
         setRows(Array.isArray(payload.items) ? payload.items : [])
         setTotal(typeof payload.total === 'number' ? payload.total : 0)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch {
         if (!cancelled) flash(translate('eudr.statements.list.loadError'), 'error')
       } finally {
@@ -189,7 +187,11 @@ export default function EudrStatementsPage() {
       refreshRows()
     } catch (error) {
       if (surfaceRecordConflict(error, translate, { onRefresh: refreshRows })) return
-      flash(translate('eudr.statements.list.deleteError'), 'error')
+      flash(
+        translateEudrErrorMessage(error, translate, translate('eudr.statements.list.deleteError')),
+        'error',
+      )
+      refreshRows()
     }
   }, [confirm, mutationContextId, refreshRows, retryLastMutation, runMutation, translate])
 
@@ -312,30 +314,31 @@ export default function EudrStatementsPage() {
               </Link>
             </Button>
           )}
-          rowActions={(row) => (
-            <RowActions
-              items={[
-                {
-                  id: 'edit',
-                  label: translate('eudr.statements.list.actions.edit'),
-                  href: `/backend/eudr/statements/${row.id}`,
-                },
-                {
-                  id: 'duplicate',
-                  label: translate('eudr.statements.duplicateAction'),
-                  href: `/backend/eudr/statements/create?duplicateFrom=${encodeURIComponent(row.id)}`,
-                },
-                {
-                  id: 'delete',
-                  label: translate('eudr.statements.list.actions.delete'),
-                  destructive: true,
-                  onSelect: () => {
-                    void handleDelete(row)
-                  },
+          rowActions={(row) => {
+            const items: RowActionItem[] = [
+              {
+                id: 'edit',
+                label: translate('eudr.statements.list.actions.edit'),
+                href: `/backend/eudr/statements/${row.id}`,
+              },
+              {
+                id: 'duplicate',
+                label: translate('eudr.statements.duplicateAction'),
+                href: `/backend/eudr/statements/create?duplicateFrom=${encodeURIComponent(row.id)}`,
+              },
+            ]
+            if (canDeleteStatement(row.status)) {
+              items.push({
+                id: 'delete',
+                label: translate('eudr.statements.list.actions.delete'),
+                destructive: true,
+                onSelect: () => {
+                  void handleDelete(row)
                 },
-              ]}
-            />
-          )}
+              })
+            }
+            return <RowActions items={items} />
+          }}
           onRowClick={(row) => router.push(`/backend/eudr/statements/${row.id}`)}
           rowClickActionIds={['edit']}
           emptyState={(
@@ -357,7 +360,6 @@ export default function EudrStatementsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

package/src/modules/eudr/commands/statements.ts

@@ -43,9 +43,11 @@ import {
 } from '../data/validators'
 import {
   EUDR_AMEND_GUARDED_FIELDS,
+  canDeleteStatement,
   canTransition,
   evaluateSubmissionGate,
   isAmendWindowOpen,
+  isStatementReadOnly,
   type GateAssessmentView,
   type GateSubmissionView,
 } from '../lib/statement-lifecycle'
@@ -495,7 +497,7 @@ async function validateStatementUpdate(
   }
 
   const hasBaseChanges = hasStatementFieldChanges(record, parsed)
-  if (record.status === 'archived' && (hasBaseChanges || Object.keys(custom).length > 0)) {
+  if (isStatementReadOnly(record.status) && (hasBaseChanges || Object.keys(custom).length > 0)) {
     throw new CrudHttpError(400, { error: 'eudr.errors.archivedReadOnly' })
   }
 
@@ -580,6 +582,9 @@ const createStatementCommand: CommandHandler<ScopedStatementCreateInput, Stateme
     if (parsed.status !== undefined && parsed.status !== 'draft') {
       throw new CrudHttpError(400, { error: 'eudr.errors.invalidTransition' })
     }
+    if (parsed.referenceIssuedAt !== undefined) {
+      throw new CrudHttpError(400, { error: 'eudr.errors.referenceIssuedAtImmutable' })
+    }
 
     const entityManager = (ctx.container.resolve('em') as EntityManager).fork()
     let record!: EudrDueDiligenceStatement
@@ -841,7 +846,7 @@ const deleteStatementCommand: CommandHandler<{ body?: Record<string, unknown>; q
     if (!record) throw new CrudHttpError(404, { error: 'EUDR due diligence statement not found' })
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
-    if (record.status === 'archived') {
+    if (isStatementStatus(record.status) && !canDeleteStatement(record.status)) {
       throw new CrudHttpError(400, { error: 'eudr.errors.archivedReadOnly' })
     }
     if (record.status === 'available') {

package/src/modules/eudr/components/crudErrorI18n.ts

@@ -15,6 +15,37 @@ function translateEudrErrorToken(token: string, translate: Translator): string {
   return translated === trimmed ? token : translated
 }
 
+function readEudrErrorToken(err: unknown): string | null {
+  if (err == null || typeof err !== 'object') return null
+  const candidates = [
+    (err as { error?: unknown }).error,
+    (err as { message?: unknown }).message,
+  ]
+  for (const candidate of candidates) {
+    if (typeof candidate !== 'string') continue
+    const trimmed = candidate.trim()
+    if (EUDR_ERROR_KEY_PATTERN.test(trimmed)) return trimmed
+  }
+  return null
+}
+
+/**
+ * Resolves the user-facing message for a rejected EUDR mutation, preferring the
+ * server's `eudr.errors.*` token over the caller's generic copy so the reason
+ * survives to the user. Falls back to `fallbackMessage` when the rejection
+ * carries no known token (network errors, 5xx, unmapped tokens).
+ */
+export function translateEudrErrorMessage(
+  err: unknown,
+  translate: Translator,
+  fallbackMessage: string,
+): string {
+  const token = readEudrErrorToken(err)
+  if (!token) return fallbackMessage
+  const translated = translate(token)
+  return translated === token ? fallbackMessage : translated
+}
+
 export function translateEudrCrudError(err: unknown, translate: Translator): unknown {
   if (!(err instanceof Error)) return err
   const rawMessage = typeof err.message === 'string' ? err.message : ''

package/src/modules/eudr/components/formConfig.tsx

@@ -247,8 +247,16 @@ export function LookupSelectField<Snapshot extends Record<string, unknown>>({
     }
   }, [loadSelectedOption, selectedOption, selectedValue, translate])
 
+  // A snapshot is a denormalization captured when the user picks a record, so resolving the
+  // value an edit form was hydrated with must not re-emit it. Doing so overwrites the stored
+  // snapshot with a freshly fetched one, which makes an untouched CrudForm look dirty and
+  // raises the "You have unsaved changes" prompt on the way out.
+  const hydratedValueRef = React.useRef<string | null>(selectedValue)
+
   React.useEffect(() => {
     if (!onSnapshot || !selectedOption || selectedOption.unavailable) return
+    if (hydratedValueRef.current === selectedOption.value) return
+    hydratedValueRef.current = null
     onSnapshot(selectedOption.snapshot ?? null)
   }, [onSnapshot, selectedOption])
 
@@ -592,7 +600,7 @@ export function parseGeolocationInput(raw: string, translate: Translator): Recor
   return parsed
 }
 
-export { translateEudrCrudError } from './crudErrorI18n'
+export { translateEudrCrudError, translateEudrErrorMessage } from './crudErrorI18n'
 
 let referencedStatementRowKeySeq = 0
 

package/src/modules/eudr/data/validators.ts

@@ -46,11 +46,6 @@ export const GEOJSON_TYPES = ['Feature', 'FeatureCollection', 'Point', 'Polygon'
 
 const uuid = () => z.string().uuid()
 const geoJsonSizeLimit = 1_048_576
-// Two conventions for server-managed fields on these entities: fields listed below
-// are never advertised as create inputs, so a client sending a real value is rejected
-// (`rejectServerComputedFields` tolerates a null/undefined no-op echo). A field that
-// WAS advertised in the create schema — statements' `referenceIssuedAt` — is instead
-// dropped from the create schema, so it is stripped rather than rejected (#5508).
 const serverComputedSubmissionFields = ['completenessScore', 'missingFields'] as const
 const serverComputedPlotFields = ['validationWarnings', 'computedArea'] as const
 const serverComputedRiskAssessmentFields = ['countryRisks', 'overallTier', 'isSimplified', 'assessedByName'] as const
@@ -69,16 +64,12 @@ const orderSnapshotSchema = z.object({
   orderNumber: z.string().max(255).optional().nullable(),
 })
 
-// A whole-object POST echoes server-computed fields back with their no-op value
-// (a fresh draft's `submittedAt` is null), so tolerate a null/undefined echo and
-// reject only a meaningful attempt to set server-owned state (#5508).
 function rejectServerComputedFields(fields: readonly string[]): z.ZodType<unknown> {
   return z.unknown().superRefine((input, context) => {
     if (input === null || typeof input !== 'object' || Array.isArray(input)) return
     const record = input as Record<string, unknown>
     for (const field of fields) {
       if (!(field in record)) continue
-      if (record[field] === null || record[field] === undefined) continue
       context.addIssue({
         code: z.ZodIssueCode.custom,
         path: [field],
@@ -342,13 +333,7 @@ const statementBaseSchema = z.object({
   notes: z.string().max(5000).optional().nullable(),
 })
 
-// referenceIssuedAt is server-managed (only set at the submitted->available
-// transition) and is never a create input, so it is dropped from the create
-// schema. A whole-object POST that echoes it (null or a value) is accepted and
-// the field ignored, instead of a self-contradictory 400 (#5508).
-export const statementCreateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(
-  statementBaseSchema.omit({ referenceIssuedAt: true }),
-)
+export const statementCreateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(statementBaseSchema)
 
 export const statementUpdateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(
   z

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Änderungsfenster geschlossen",
   "eudr.lifecycle.amendWindowRemaining": "Verbleibendes Änderungsfenster: {hours} Std. {minutes} Min.",
   "eudr.lifecycle.confirmArchive": "Erklärung archivieren?",
-  "eudr.lifecycle.confirmArchiveBody": "Die Erklärung wird archiviert.",
+  "eudr.lifecycle.confirmArchiveBody": "Die Erklärung wird archiviert. Archivierte Erklärungen sind schreibgeschützt und können nicht bearbeitet, wiederhergestellt oder gelöscht werden.",
   "eudr.lifecycle.confirmMarkAvailable": "Erklärung als verfügbar markieren?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Referenzdetails sind erforderlich, bevor die Erklärung verfügbar wird.",
   "eudr.lifecycle.confirmReturnToDraft": "Erklärung in Entwurf zurücksetzen?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "EUDR-Minderungsmaßnahme aktualisieren",
   "eudr.nav.group": "Compliance",
   "eudr.nav.mappings": "Produktzuordnungen",
-  "eudr.nav.overview": "Übersicht",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "EUDR-Übersicht",
   "eudr.nav.plots": "Parzellen",
   "eudr.nav.riskAssessments": "Risikobewertungen",
   "eudr.nav.statements": "Erklärungen",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Amend window closed",
   "eudr.lifecycle.amendWindowRemaining": "Amend window remaining: {hours} h {minutes} min",
   "eudr.lifecycle.confirmArchive": "Archive statement?",
-  "eudr.lifecycle.confirmArchiveBody": "The statement will be archived.",
+  "eudr.lifecycle.confirmArchiveBody": "The statement will be archived. Archived statements are read-only and cannot be edited, restored, or deleted.",
   "eudr.lifecycle.confirmMarkAvailable": "Mark statement available?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Reference details are required before the statement becomes available.",
   "eudr.lifecycle.confirmReturnToDraft": "Return statement to draft?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "Update EUDR mitigation action",
   "eudr.nav.group": "Compliance",
   "eudr.nav.mappings": "Product mappings",
-  "eudr.nav.overview": "Overview",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "EUDR Overview",
   "eudr.nav.plots": "Plots",
   "eudr.nav.riskAssessments": "Risk assessments",
   "eudr.nav.statements": "Statements",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Ventana de modificación cerrada",
   "eudr.lifecycle.amendWindowRemaining": "Ventana de modificación restante: {hours} h {minutes} min",
   "eudr.lifecycle.confirmArchive": "¿Archivar declaración?",
-  "eudr.lifecycle.confirmArchiveBody": "La declaración se archivará.",
+  "eudr.lifecycle.confirmArchiveBody": "La declaración se archivará. Las declaraciones archivadas son de solo lectura y no se pueden editar, restaurar ni eliminar.",
   "eudr.lifecycle.confirmMarkAvailable": "¿Marcar declaración como disponible?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Los detalles de referencia son obligatorios antes de que la declaración esté disponible.",
   "eudr.lifecycle.confirmReturnToDraft": "¿Volver la declaración a borrador?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "Actualizar acción de mitigación EUDR",
   "eudr.nav.group": "Cumplimiento",
   "eudr.nav.mappings": "Asignaciones de producto",
-  "eudr.nav.overview": "Resumen",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "Resumen EUDR",
   "eudr.nav.plots": "Parcelas",
   "eudr.nav.riskAssessments": "Evaluaciones de riesgo",
   "eudr.nav.statements": "Declaraciones",