@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/directory/di.ts

@@ -1,18 +1,6 @@
-import { asClass, asFunction } from 'awilix'
-import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AppContainer } from '@open-mercato/shared/lib/di/container'
-import { DefaultOrganizationScopeService } from './services/organizationScopeService'
-import { DefaultOrganizationHierarchyService } from './services/organizationHierarchyService'
-
-type OrganizationScopeRbac = ConstructorParameters<typeof DefaultOrganizationScopeService>[1]
 
 export function register(container: AppContainer) {
-  container.register({
-    organizationHierarchyService: asClass(DefaultOrganizationHierarchyService).scoped(),
-    organizationScopeService: asFunction((cradle: { em: EntityManager; rbacService: OrganizationScopeRbac }) =>
-      new DefaultOrganizationScopeService(cradle.em, cradle.rbacService, container),
-    )
-      .scoped()
-      .proxy(),
-  })
+  // Directory module has no services yet; placeholder for future overrides
 }
+

package/src/modules/directory/utils/organizationScope.ts

@@ -5,7 +5,6 @@ import { Organization } from '@open-mercato/core/modules/directory/data/entities
 import { isAllOrganizationsSelection } from '@open-mercato/core/modules/directory/constants'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import type { OrganizationScope } from '@open-mercato/shared/lib/auth/principal-service'
 import { getCurrentCacheTenant, runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'
 import { parseSelectedOrganizationCookie, parseSelectedTenantCookie } from './scopeCookies'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -14,7 +13,19 @@ const logger = createLogger('directory').child({ component: 'org-scope-cache' })
 
 export { parseSelectedOrganizationCookie, parseSelectedTenantCookie }
 
-export type { OrganizationScope }
+export type OrganizationScope = {
+  selectedId: string | null
+  filterIds: string[] | null
+  allowedIds: string[] | null
+  tenantId: string | null
+  // True when the caller explicitly selected a concrete organization (cookie /
+  // selectedId param) that could not be honored — it does not exist for the
+  // tenant or is not accessible. Reads degrade gracefully (filterIds/selectedId
+  // fall back to the caller's accessible orgs), but writes MUST fail loudly on
+  // this so a record never lands under an org the caller did not intend. Absent
+  // (undefined) means the selection — if any — was honored.
+  selectionRejected?: boolean
+}
 
 // Phase 4 — short-TTL cache for resolveOrganizationScopeForRequest.
 // OrganizationScope is a pure function of (userId, tenantId, selectedOrgId,
@@ -238,8 +249,8 @@ export async function resolveOrganizationScope({
   tenantId: tenantIdOverride,
 }: {
   em: EntityManager
-  rbac: Pick<RbacService, 'loadAcl'>
-  auth: AuthContext | null | undefined
+  rbac: RbacService
+  auth: AuthContext
   selectedId?: string | null
   tenantId?: string | null
 }): Promise<OrganizationScope> {

package/src/modules/entities/api/records.ts

@@ -148,7 +148,6 @@ const listRecordsResponseSchema = z.object({
   page: z.number(),
   pageSize: z.number(),
   totalPages: z.number(),
-  totalIsCapped: z.boolean().optional(),
 })
 
 export async function GET(req: Request) {
@@ -329,7 +328,6 @@ export async function GET(req: Request) {
       page: res.page || page,
       pageSize: effectivePageSize,
       totalPages: Math.ceil(total / (effectivePageSize || 1)),
-      ...(res.meta?.listCountCapWarning ? { totalIsCapped: true } : {}),
     }
 
     if (requestedExport) {

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -36,7 +36,6 @@ type RecordsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function toCsvUrl(base: string, params: URLSearchParams) {
@@ -88,7 +87,6 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
   const [rawData, setRawData] = React.useState<any[]>([])
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [loading, setLoading] = React.useState(false)
   const scopeVersion = useOrganizationScopeVersion()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
@@ -172,7 +170,6 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
           setRawData(j.items || [])
           setTotal(j.total)
           setTotalPages(j.totalPages)
-          setTotalIsCapped(j?.totalIsCapped === true)
         }
       } catch (e) {
         if (!cancelled) {
@@ -470,7 +467,7 @@ export RECORD_ID="<record uuid>"`}</code></pre>
             onSearchChange={(v) => { setSearch(v); setPage(1) }}
             onFiltersApply={(vals) => { setFilterValues(vals); setPage(1) }}
             onFiltersClear={() => { setFilterValues({}); setPage(1) }}
-            pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+            pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
             isLoading={loading}
           />
         </RelationDisplaysProvider>

package/src/modules/eudr/api/plots/route.ts

@@ -159,10 +159,6 @@ const crud = makeCrudRoute({
       name: 'name',
       area_ha: 'area_ha',
       areaHa: 'area_ha',
-      origin_country: 'origin_country',
-      originCountry: 'origin_country',
-      plot_type: 'plot_type',
-      plotType: 'plot_type',
     },
     buildFilters,
     transformItem: transformPlotItem,

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/evidence-submissions/page.tsx

@@ -54,7 +54,6 @@ type EvidenceSubmissionsResponse = {
   items: EvidenceSubmissionRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDateTime(value: string | null | undefined, emptyLabel: string, locale: string): string {
@@ -93,7 +92,6 @@ export default function EudrEvidenceSubmissionsPage() {
   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>({})
@@ -149,7 +147,6 @@ export default function EudrEvidenceSubmissionsPage() {
         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.evidenceSubmissions.list.loadError'), 'error')
       } finally {
@@ -364,7 +361,6 @@ export default function EudrEvidenceSubmissionsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

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/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) => {