@open-mercato/core 0.6.8-develop.7101.1.bd9356828a → 0.7.1-develop.7102.1.b41f7e3e51

package/src/modules/customer_accounts/lib/portalUrl.ts

@@ -0,0 +1,112 @@
+// Resolve the browser-visible origin on the server so the admin portal-address
+// hints are already correct in the first server-rendered paint. Deriving the
+// origin from `window.location.origin` during render made the server HTML and
+// the hydrated client output disagree, which React reported as a hydration
+// error and repaired with a visible flicker of the portal address (#5457).
+//
+// `resolvePortalRequestOrigin` is deliberately named apart from the shared
+// `resolveRequestOrigin` in `@open-mercato/shared/lib/url`: that one takes a
+// `Request` and reads the protocol off `req.url`, which a server component does
+// not have — it only has `headers()`. This one also validates the untrusted host
+// header before the value reaches rendered text or a link href, and infers the
+// protocol when the proxy stays quiet, so the two are not interchangeable.
+
+export type RequestHeaderReader = {
+  get(name: string): string | null | undefined
+}
+
+const FORWARDED_HOST_HEADER = 'x-forwarded-host'
+const HOST_HEADER = 'host'
+const FORWARDED_PROTO_HEADER = 'x-forwarded-proto'
+
+// Host headers are client-controlled, so only a plain `host[:port]` or bracketed
+// IPv6 literal is accepted before it reaches rendered text and link hrefs.
+const HOST_PATTERN = /^(?:[a-z0-9.-]+|\[[0-9a-f:.]+\])(?::\d{1,5})?$/i
+const PROTOCOL_PATTERN = /^https?$/i
+// Bracketed, because HOST_PATTERN only accepts a colon-bearing host in that form.
+const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]'])
+
+export const PORTAL_ORG_SLUG_PLACEHOLDER = '[org-slug]'
+
+function firstHeaderValue(raw: string | null | undefined): string | null {
+  if (typeof raw !== 'string') return null
+  // Proxy chains append values, so the client-facing hop is the first entry.
+  const value = raw.split(',')[0]?.trim() ?? ''
+  return value.length > 0 ? value : null
+}
+
+function readHost(headers: RequestHeaderReader): string | null {
+  const forwarded = firstHeaderValue(headers.get(FORWARDED_HOST_HEADER))
+  const host = forwarded ?? firstHeaderValue(headers.get(HOST_HEADER))
+  if (!host) return null
+  return HOST_PATTERN.test(host) ? host.toLowerCase() : null
+}
+
+function readProtocol(headers: RequestHeaderReader, host: string): string {
+  const forwarded = firstHeaderValue(headers.get(FORWARDED_PROTO_HEADER))
+  if (forwarded && PROTOCOL_PATTERN.test(forwarded)) return forwarded.toLowerCase()
+  // An operator who configured APP_URL has named the canonical origin explicitly;
+  // when it points at this very host, trust it over any inference below. Without
+  // this, a plain-HTTP deployment behind a proxy that omits x-forwarded-proto
+  // would render https:// links that do not work.
+  const configured = configuredOrigin()
+  if (configured) {
+    try {
+      const parsed = new URL(configured)
+      if (parsed.host.toLowerCase() === host) return parsed.protocol.replace(':', '')
+    } catch {
+      // configuredOrigin() already parsed this successfully; ignore defensively.
+    }
+  }
+  // Otherwise a terminating proxy that omits the header is serving a public
+  // hostname over TLS far more often than not; only loopback hosts default to http.
+  const hostname = host.replace(/:\d{1,5}$/, '')
+  return LOOPBACK_HOSTS.has(hostname) ? 'http' : 'https'
+}
+
+function configuredOrigin(): string {
+  const candidates = [process.env.APP_URL, process.env.NEXT_PUBLIC_APP_URL]
+  for (const candidate of candidates) {
+    const value = candidate?.trim()
+    if (!value) continue
+    try {
+      const parsed = new URL(value)
+      if (PROTOCOL_PATTERN.test(parsed.protocol.replace(':', ''))) return parsed.origin
+    } catch {
+      // A malformed APP_URL must not break the page — fall through to the next candidate.
+    }
+  }
+  return ''
+}
+
+/**
+ * Resolve the origin the current request was made to, mirroring the value
+ * `window.location.origin` reports in the browser. Falls back to the configured
+ * app URL, then to an empty string so callers render a root-relative path that
+ * is identical on the server and the client.
+ *
+ * Named apart from `resolveRequestOrigin` in `@open-mercato/shared/lib/url` —
+ * see the note at the top of this file for why the two cannot be merged.
+ */
+export function resolvePortalRequestOrigin(headers: RequestHeaderReader | null | undefined): string {
+  if (headers && typeof headers.get === 'function') {
+    const host = readHost(headers)
+    if (host) return `${readProtocol(headers, host)}://${host}`
+  }
+  return configuredOrigin()
+}
+
+function normalizeOrigin(origin: string | null | undefined): string {
+  if (typeof origin !== 'string') return ''
+  return origin.trim().replace(/\/+$/, '')
+}
+
+/** Display pattern for a tenant portal address, e.g. `https://app.example.com/[org-slug]/portal`. */
+export function buildPortalUrlPattern(origin: string | null | undefined): string {
+  return `${normalizeOrigin(origin)}/${PORTAL_ORG_SLUG_PLACEHOLDER}/portal`
+}
+
+/** Portal entry point used by the "Open Portal" action on admin pages. */
+export function buildPortalRootUrl(origin: string | null | undefined): string {
+  return `${normalizeOrigin(origin)}/portal`
+}

package/src/modules/customers/backend/customers/companies/page.tsx

@@ -829,8 +829,8 @@ export default function CustomersCompaniesPage() {
         header: def.label || def.key,
         enableSorting: true,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,

package/src/modules/customers/backend/customers/deals/page.tsx

@@ -687,8 +687,8 @@ export default function CustomersDealsPage() {
         accessorKey: `cf_${def.key}`,
         header: def.label || def.key,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,

package/src/modules/customers/backend/customers/people/page.tsx

@@ -856,8 +856,8 @@ export default function CustomersPeoplePage() {
         header: def.label || def.key,
         enableSorting: true,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,

package/src/modules/customers/components/detail/AssignRoleDialog.tsx

@@ -640,13 +640,18 @@ export function AssignRoleDialog({
           </div>
         </div>
 
-        <DialogFooter className="shrink-0 border-t border-border/70 px-6 py-4 sm:justify-between">
-          <p className="text-xs text-muted-foreground">
-            {t(
-              'customers.roles.dialog.footerNote',
-              'One person per role · can be changed at any time',
-            )}
-          </p>
+        <DialogFooter
+          bordered={false}
+          className="shrink-0 border-t border-border/70 px-6 py-4"
+          leading={
+            <p className="text-xs text-muted-foreground sm:max-w-2xs">
+              {t(
+                'customers.roles.dialog.footerNote',
+                'One person per role · can be changed at any time',
+              )}
+            </p>
+          }
+        >
           <div className="flex items-center gap-2">
             <Button type="button" variant="outline" onClick={onClose}>
               {t('customers.roles.cancelAdd', 'Cancel')}

package/src/modules/eudr/backend/eudr/evidence-submissions/[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: 'Evidence submissions', labelKey: 'eudr.nav.submissions', href: '/backend/eudr/evidence-submissions' },
+    { label: 'Edit evidence submission', labelKey: 'eudr.evidenceSubmissions.edit.title' },
   ],
 }

package/src/modules/eudr/backend/eudr/evidence-submissions/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: 'Evidence submissions', labelKey: 'eudr.nav.submissions', href: '/backend/eudr/evidence-submissions' },
     { label: 'Create', labelKey: 'eudr.evidenceSubmissions.create.title' },
   ],

package/src/modules/eudr/backend/eudr/evidence-submissions/page.meta.ts

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

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

@@ -1,12 +1,12 @@
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['eudr.statements.view'],
-  pageTitle: 'Overview',
+  pageTitle: 'EUDR Overview',
   pageTitleKey: 'eudr.nav.overview',
   pageGroup: 'Compliance',
   pageGroupKey: 'eudr.nav.group',
   pagePriority: 10,
   pageOrder: 5,
   icon: 'gauge',
-  breadcrumb: [{ label: 'Overview', labelKey: 'eudr.nav.overview' }],
+  breadcrumb: [{ label: 'EUDR Overview', labelKey: 'eudr.nav.overview' }],
 }

package/src/modules/eudr/backend/eudr/plots/[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: 'Plots', labelKey: 'eudr.nav.plots', href: '/backend/eudr/plots' },
+    { label: 'Edit plot', labelKey: 'eudr.plots.edit.title' },
   ],
 }

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/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/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/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,
@@ -189,7 +190,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 +317,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={(

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' })
   }
 
@@ -841,7 +843,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/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",