@open-mercato/core 0.6.4-develop.4363.1.2f376570ae → 0.6.4-develop.4368.1.2f7e9a7002

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

@@ -40,6 +40,7 @@
   "catalog.categories.flash.updated": "Category updated",
   "catalog.categories.form.action.create": "Create",
   "catalog.categories.form.action.save": "Save",
+  "catalog.categories.form.actions.backToList": "Back to categories",
   "catalog.categories.form.createTitle": "Create category",
   "catalog.categories.form.editTitle": "Edit category",
   "catalog.categories.form.errors.delete": "Failed to delete category",
@@ -559,6 +560,7 @@
   "catalog.stats.tags": "Tags",
   "catalog.stats.title": "Catalog overview",
   "catalog.variants.errors.skuExists": "SKU already in use.",
+  "catalog.variants.form.actions.backToProduct": "Back to product variants",
   "catalog.variants.form.barcodeLabel": "Barcode",
   "catalog.variants.form.barcodePlaceholder": "EAN, UPC, etc.",
   "catalog.variants.form.createAction": "Create variant",

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

@@ -40,6 +40,7 @@
   "catalog.categories.flash.updated": "Categoría actualizada",
   "catalog.categories.form.action.create": "Crear",
   "catalog.categories.form.action.save": "Guardar",
+  "catalog.categories.form.actions.backToList": "Volver a categorías",
   "catalog.categories.form.createTitle": "Crear categoría",
   "catalog.categories.form.editTitle": "Editar categoría",
   "catalog.categories.form.errors.delete": "No se pudo eliminar la categoría",
@@ -559,6 +560,7 @@
   "catalog.stats.tags": "Etiquetas",
   "catalog.stats.title": "Resumen del catálogo",
   "catalog.variants.errors.skuExists": "El SKU ya está en uso.",
+  "catalog.variants.form.actions.backToProduct": "Volver a variantes del producto",
   "catalog.variants.form.barcodeLabel": "Código de barras",
   "catalog.variants.form.barcodePlaceholder": "EAN, UPC, etc.",
   "catalog.variants.form.createAction": "Crear variante",

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

@@ -40,6 +40,7 @@
   "catalog.categories.flash.updated": "Kategoria zaktualizowana",
   "catalog.categories.form.action.create": "Utwórz",
   "catalog.categories.form.action.save": "Zapisz",
+  "catalog.categories.form.actions.backToList": "Powrót do kategorii",
   "catalog.categories.form.createTitle": "Utwórz kategorię",
   "catalog.categories.form.editTitle": "Edytuj kategorię",
   "catalog.categories.form.errors.delete": "Nie udało się usunąć kategorii",
@@ -559,6 +560,7 @@
   "catalog.stats.tags": "Tagi",
   "catalog.stats.title": "Przegląd katalogu",
   "catalog.variants.errors.skuExists": "SKU jest już używany.",
+  "catalog.variants.form.actions.backToProduct": "Powrót do wariantów produktu",
   "catalog.variants.form.barcodeLabel": "Kod kreskowy",
   "catalog.variants.form.barcodePlaceholder": "EAN, UPC itp.",
   "catalog.variants.form.createAction": "Utwórz wariant",

package/src/modules/directory/backend/directory/organizations/[id]/edit/page.tsx

@@ -16,6 +16,7 @@ import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { deleteCrud, updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 
 type TreeResponse = {
   items: OrganizationTreeNode[]
@@ -48,6 +49,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
   const [tenantId, setTenantId] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [parentTree, setParentTree] = React.useState<OrganizationTreeNode[]>([])
   const [childSummary, setChildSummary] = React.useState<OrganizationTreeOption[]>([])
   const [originalChildIds, setOriginalChildIds] = React.useState<string[]>([])
@@ -107,13 +109,23 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
     async function load() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
-        const { ok, result } = await apiCall<OrganizationResponse>(
+        const { ok, status, result } = await apiCall<OrganizationResponse>(
           `/api/directory/organizations?view=manage&ids=${currentOrgId}&status=all&includeInactive=true&page=1&pageSize=1`,
         )
-        if (!ok) throw new Error(t('directory.organizations.form.errors.load', 'Failed to load organization'))
+        if (!ok) {
+          if (status === 404) {
+            if (!cancelled) setIsNotFound(true)
+            return
+          }
+          throw new Error(t('directory.organizations.form.errors.load', 'Failed to load organization'))
+        }
         const record = Array.isArray(result?.items) ? result.items?.[0] : undefined
-        if (!record) throw new Error(t('directory.organizations.form.errors.notFound', 'Organization not found'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const resolvedTenantId = record.tenantId || null
         setTenantId(resolvedTenantId)
         const baseTree = await loadParentTree(resolvedTenantId, record.descendantIds ?? [])
@@ -263,11 +275,25 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
     )
   }
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('directory.organizations.form.errors.notFound', 'Organization not found')}
+            backHref="/backend/directory/organizations"
+            backLabel={t('directory.organizations.form.actions.backToList', 'Back to organizations')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error && !loading && !initialValues) {
     return (
       <Page>
         <PageBody>
-          <div className="rounded border border-destructive/40 bg-destructive/10 px-4 py-3 text-sm text-destructive">{error}</div>
+          <ErrorMessage label={error} />
         </PageBody>
       </Page>
     )

package/src/modules/directory/backend/directory/tenants/[id]/edit/page.tsx

@@ -7,6 +7,7 @@ import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customF
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 
@@ -21,6 +22,7 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
   const [initial, setInitial] = React.useState<TenantFormValues | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const t = useT()
   const fields = React.useMemo<CrudField[]>(() => [
     { id: 'name', label: t('directory.tenants.form.fields.name', 'Name'), type: 'text', required: true },
@@ -37,6 +39,7 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
       if (!tenantId) return
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const data = await readApiResultOrThrow<{ items?: Record<string, unknown>[] }>(
           `/api/directory/tenants?id=${encodeURIComponent(tenantId)}`,
@@ -45,7 +48,10 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
         )
         const rows = Array.isArray(data?.items) ? data.items : []
         const row = rows[0]
-        if (!row) throw new Error(t('directory.tenants.form.errors.notFound', 'Tenant not found'))
+        if (!row) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const cfValues = extractCustomFieldEntries(row as Record<string, unknown>)
         const values: TenantFormValues = {
           id: String(row.id),
@@ -56,8 +62,12 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
         if (!cancelled) setInitial(values)
       } catch (err) {
         if (!cancelled) {
-          const message = err instanceof Error ? err.message : t('directory.tenants.form.errors.load', 'Failed to load tenant')
-          setError(message)
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = err instanceof Error ? err.message : t('directory.tenants.form.errors.load', 'Failed to load tenant')
+            setError(message)
+          }
         }
       } finally {
         if (!cancelled) setLoading(false)
@@ -69,13 +79,25 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
 
   if (!tenantId) return null
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('directory.tenants.form.errors.notFound', 'Tenant not found')}
+            backHref="/backend/directory/tenants"
+            backLabel={t('directory.tenants.form.actions.backToList', 'Back to tenants')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error && !loading && !initial) {
     return (
       <Page>
         <PageBody>
-          <div className="rounded border border-destructive/40 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-            {error}
-          </div>
+          <ErrorMessage label={error} />
         </PageBody>
       </Page>
     )

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

@@ -19,6 +19,7 @@
   "directory.organizations.flash.updated": "Organisation aktualisiert",
   "directory.organizations.form.action.create": "Erstellen",
   "directory.organizations.form.action.save": "Speichern",
+  "directory.organizations.form.actions.backToList": "Zurück zu Organisationen",
   "directory.organizations.form.children.empty": "Keine direkten Unterorganisationen zugewiesen.",
   "directory.organizations.form.errors.load": "Organisation konnte nicht geladen werden",
   "directory.organizations.form.errors.missingId": "Organisationskennung fehlt.",
@@ -55,6 +56,7 @@
   "directory.organizations.list.filters.status": "Status",
   "directory.organizations.list.searchPlaceholder": "Organisationen durchsuchen",
   "directory.organizations.list.title": "Organisationen",
+  "directory.tenants.form.actions.backToList": "Zurück zu Mandanten",
   "directory.tenants.form.errors.delete": "Mandant konnte nicht gelöscht werden",
   "directory.tenants.form.errors.load": "Mandant konnte nicht geladen werden",
   "directory.tenants.form.errors.notFound": "Mandant nicht gefunden",

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

@@ -19,6 +19,7 @@
   "directory.organizations.flash.updated": "Organization updated",
   "directory.organizations.form.action.create": "Create",
   "directory.organizations.form.action.save": "Save",
+  "directory.organizations.form.actions.backToList": "Back to organizations",
   "directory.organizations.form.children.empty": "No direct children assigned.",
   "directory.organizations.form.errors.load": "Failed to load organization",
   "directory.organizations.form.errors.missingId": "Organization identifier is missing.",
@@ -55,6 +56,7 @@
   "directory.organizations.list.filters.status": "Status",
   "directory.organizations.list.searchPlaceholder": "Search organizations",
   "directory.organizations.list.title": "Organizations",
+  "directory.tenants.form.actions.backToList": "Back to tenants",
   "directory.tenants.form.errors.delete": "Failed to delete tenant",
   "directory.tenants.form.errors.load": "Failed to load tenant",
   "directory.tenants.form.errors.notFound": "Tenant not found",

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

@@ -19,6 +19,7 @@
   "directory.organizations.flash.updated": "Organización actualizada",
   "directory.organizations.form.action.create": "Crear",
   "directory.organizations.form.action.save": "Guardar",
+  "directory.organizations.form.actions.backToList": "Volver a organizaciones",
   "directory.organizations.form.children.empty": "Sin hijos asignados.",
   "directory.organizations.form.errors.load": "No se pudo cargar la organización",
   "directory.organizations.form.errors.missingId": "Falta el identificador de la organización.",
@@ -55,6 +56,7 @@
   "directory.organizations.list.filters.status": "Estado",
   "directory.organizations.list.searchPlaceholder": "Buscar organizaciones",
   "directory.organizations.list.title": "Organizaciones",
+  "directory.tenants.form.actions.backToList": "Volver a inquilinos",
   "directory.tenants.form.errors.delete": "No se pudo eliminar el inquilino",
   "directory.tenants.form.errors.load": "No se pudo cargar el inquilino",
   "directory.tenants.form.errors.notFound": "Inquilino no encontrado",

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

@@ -19,6 +19,7 @@
   "directory.organizations.flash.updated": "Organizacja zaktualizowana",
   "directory.organizations.form.action.create": "Utwórz",
   "directory.organizations.form.action.save": "Zapisz",
+  "directory.organizations.form.actions.backToList": "Powrót do organizacji",
   "directory.organizations.form.children.empty": "Brak przypisanych organizacji podrzędnych.",
   "directory.organizations.form.errors.load": "Nie udało się wczytać organizacji",
   "directory.organizations.form.errors.missingId": "Brakuje identyfikatora organizacji.",
@@ -55,6 +56,7 @@
   "directory.organizations.list.filters.status": "Status",
   "directory.organizations.list.searchPlaceholder": "Szukaj organizacji",
   "directory.organizations.list.title": "Organizacje",
+  "directory.tenants.form.actions.backToList": "Powrót do najemców",
   "directory.tenants.form.errors.delete": "Nie udało się usunąć najemcy",
   "directory.tenants.form.errors.load": "Nie udało się wczytać najemcy",
   "directory.tenants.form.errors.notFound": "Nie znaleziono najemcy",

package/src/modules/planner/backend/planner/availability-rulesets/[id]/page.tsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import { useRouter } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
@@ -40,6 +41,8 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
   const translate = useT()
   const router = useRouter()
   const [initialValues, setInitialValues] = React.useState<AvailabilityRuleSetFormValues | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [activeTab, setActiveTab] = React.useState<'details' | 'availability'>('details')
 
   React.useEffect(() => {
@@ -47,6 +50,10 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
     const rulesetIdValue = rulesetId
     let cancelled = false
     async function loadRuleSet() {
+      if (!cancelled) {
+        setError(null)
+        setIsNotFound(false)
+      }
       try {
         const params = new URLSearchParams({ page: '1', pageSize: '1', ids: rulesetIdValue })
         const payload = await readApiResultOrThrow<RuleSetResponse>(
@@ -55,7 +62,10 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
           { errorMessage: translate('planner.availabilityRuleSets.form.errors.load', 'Failed to load schedule.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(translate('planner.availabilityRuleSets.form.errors.notFound', 'Schedule not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const customFields = extractCustomFieldEntries(record)
         if (!cancelled) {
           setInitialValues({
@@ -66,9 +76,15 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
             ...customFields,
           })
         }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : translate('planner.availabilityRuleSets.form.errors.load', 'Failed to load schedule.')
-        flash(message, 'error')
+      } catch (err) {
+        if (!cancelled) {
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = err instanceof Error ? err.message : translate('planner.availabilityRuleSets.form.errors.load', 'Failed to load schedule.')
+            setError(message)
+          }
+        }
       }
     }
     loadRuleSet()
@@ -150,6 +166,30 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
 
   const resolvedInitialValues = initialValues ?? {}
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={translate('planner.availabilityRuleSets.form.errors.notFound', 'Schedule not found.')}
+            backHref="/backend/planner/availability-rulesets"
+            backLabel={translate('planner.availabilityRuleSets.actions.backToList', 'Back to schedules')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (error && !initialValues) {
+    return (
+      <Page>
+        <PageBody>
+          <ErrorMessage label={error} />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>

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

@@ -100,6 +100,7 @@
   "planner.availability.errors.updateDateSpecific": "Datumsspezifische Verfügbarkeit konnte nicht gespeichert werden.",
   "planner.availability.errors.updateWeekly": "Wöchentliche Verfügbarkeit konnte nicht gespeichert werden.",
   "planner.availabilityRuleSets.actions.add": "Neuer Zeitplan",
+  "planner.availabilityRuleSets.actions.backToList": "Zurück zu Zeitplänen",
   "planner.availabilityRuleSets.actions.delete": "Löschen",
   "planner.availabilityRuleSets.actions.deleteConfirm": "Zeitplan \"{{name}}\" löschen?",
   "planner.availabilityRuleSets.actions.edit": "Bearbeiten",

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

@@ -100,6 +100,7 @@
   "planner.availability.errors.updateDateSpecific": "Failed to save date-specific availability.",
   "planner.availability.errors.updateWeekly": "Failed to save weekly availability.",
   "planner.availabilityRuleSets.actions.add": "New schedule",
+  "planner.availabilityRuleSets.actions.backToList": "Back to schedules",
   "planner.availabilityRuleSets.actions.delete": "Delete",
   "planner.availabilityRuleSets.actions.deleteConfirm": "Delete schedule \"{{name}}\"?",
   "planner.availabilityRuleSets.actions.edit": "Edit",

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

@@ -100,6 +100,7 @@
   "planner.availability.errors.updateDateSpecific": "No se pudo guardar la disponibilidad por fecha.",
   "planner.availability.errors.updateWeekly": "No se pudo guardar la disponibilidad semanal.",
   "planner.availabilityRuleSets.actions.add": "Nuevo horario",
+  "planner.availabilityRuleSets.actions.backToList": "Volver a horarios",
   "planner.availabilityRuleSets.actions.delete": "Eliminar",
   "planner.availabilityRuleSets.actions.deleteConfirm": "¿Eliminar el horario \"{{name}}\"?",
   "planner.availabilityRuleSets.actions.edit": "Editar",

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

@@ -100,6 +100,7 @@
   "planner.availability.errors.updateDateSpecific": "Nie udało się zapisać dostępności dla dat.",
   "planner.availability.errors.updateWeekly": "Nie udało się zapisać tygodniowej dostępności.",
   "planner.availabilityRuleSets.actions.add": "Nowy harmonogram",
+  "planner.availabilityRuleSets.actions.backToList": "Powrót do harmonogramów",
   "planner.availabilityRuleSets.actions.delete": "Usuń",
   "planner.availabilityRuleSets.actions.deleteConfirm": "Usunąć harmonogram \"{{name}}\"?",
   "planner.availabilityRuleSets.actions.edit": "Edytuj",

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

@@ -4,6 +4,7 @@ import * as React from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
@@ -28,6 +29,7 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
   const [initialValues, setInitialValues] = React.useState<ChannelFormValues | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [activeTab, setActiveTab] = React.useState<'settings' | 'offers'>('settings')
 
   React.useEffect(() => {
@@ -45,6 +47,7 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
     async function loadChannel() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const payload = await readApiResultOrThrow<ChannelApiResponse>(
           `/api/sales/channels?id=${encodeURIComponent(channelId)}&pageSize=1`,
@@ -53,14 +56,21 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
         )
         const item = Array.isArray(payload.items) ? payload.items[0] : null
         if (!item) {
-          throw new Error(t('sales.channels.form.errors.notFound', 'Channel not found.'))
+          if (!cancelled) setIsNotFound(true)
+          return
         }
         if (!cancelled) {
           setInitialValues(mapChannelToFormValues(item))
         }
       } catch (err) {
         console.error('sales.channels.load', err)
-        if (!cancelled) setError(t('sales.channels.form.errors.load', 'Failed to load channel.'))
+        if (!cancelled) {
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            setError(t('sales.channels.form.errors.load', 'Failed to load channel.'))
+          }
+        }
       } finally {
         if (!cancelled) setLoading(false)
       }
@@ -116,14 +126,33 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
     </div>
   ), [tabButton, t])
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('sales.channels.form.errors.notFound', 'Channel not found.')}
+            backHref="/backend/sales/channels"
+            backLabel={t('sales.channels.actions.backToList', 'Back to channels')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (error && !loading && !initialValues) {
+    return (
+      <Page>
+        <PageBody>
+          <ErrorMessage label={error} />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>
-        {error ? (
-          <div className="mb-4 rounded border border-destructive/40 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-            {error}
-          </div>
-        ) : null}
         {activeTab === 'settings' ? (
           <CrudForm<ChannelFormValues>
             title={t('sales.channels.form.editTitle', 'Edit channel')}

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

@@ -52,6 +52,7 @@
   "sales.audit.tax-rates.create": "Create tax rate",
   "sales.audit.tax-rates.delete": "Delete tax rate",
   "sales.audit.tax-rates.update": "Update tax rate",
+  "sales.channels.actions.backToList": "Zurück zu Kanälen",
   "sales.channels.actions.create": "Kanal hinzufügen",
   "sales.channels.create": "Vertriebskanal erstellen",
   "sales.channels.form.address1": "Adresszeile 1",

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

@@ -52,6 +52,7 @@
   "sales.audit.tax-rates.create": "Create tax rate",
   "sales.audit.tax-rates.delete": "Delete tax rate",
   "sales.audit.tax-rates.update": "Update tax rate",
+  "sales.channels.actions.backToList": "Back to channels",
   "sales.channels.actions.create": "Add channel",
   "sales.channels.create": "Create sales channel",
   "sales.channels.form.address1": "Address line 1",

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

@@ -52,6 +52,7 @@
   "sales.audit.tax-rates.create": "Create tax rate",
   "sales.audit.tax-rates.delete": "Delete tax rate",
   "sales.audit.tax-rates.update": "Update tax rate",
+  "sales.channels.actions.backToList": "Volver a canales",
   "sales.channels.actions.create": "Añadir canal",
   "sales.channels.create": "Crear canal de ventas",
   "sales.channels.form.address1": "Línea de dirección 1",

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

@@ -52,6 +52,7 @@
   "sales.audit.tax-rates.create": "Create tax rate",
   "sales.audit.tax-rates.delete": "Delete tax rate",
   "sales.audit.tax-rates.update": "Update tax rate",
+  "sales.channels.actions.backToList": "Powrót do kanałów",
   "sales.channels.actions.create": "Dodaj kanał",
   "sales.channels.create": "Utwórz kanał sprzedaży",
   "sales.channels.form.address1": "Adres linia 1",

package/src/modules/staff/backend/staff/leave-requests/[id]/page.tsx

@@ -6,7 +6,7 @@ import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Textarea } from '@open-mercato/ui/primitives/textarea'
-import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { SendObjectMessageDialog } from '@open-mercato/ui/backend/messages'
 import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
@@ -21,12 +21,13 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
   const router = useRouter()
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [record, setRecord] = React.useState<NormalizedLeaveRequest | null>(null)
   const [decisionComment, setDecisionComment] = React.useState('')
 
   React.useEffect(() => {
     if (!id) {
-      setError(t('staff.leaveRequests.errors.notFound', 'Leave request not found.'))
+      setIsNotFound(true)
       setIsLoading(false)
       return
     }
@@ -35,6 +36,7 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
     async function load() {
       setIsLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const params = new URLSearchParams({ page: '1', pageSize: '1', ids: requestId })
         const payload = await readApiResultOrThrow<LeaveRequestsResponse>(
@@ -43,7 +45,13 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
           { errorMessage: t('staff.leaveRequests.errors.load', 'Failed to load leave request.') },
         )
         const entry = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!entry) throw new Error(t('staff.leaveRequests.errors.notFound', 'Leave request not found.'))
+        if (!entry) {
+          if (!cancelled) {
+            setIsNotFound(true)
+            setRecord(null)
+          }
+          return
+        }
         if (!cancelled) {
           const normalized = normalizeLeaveRequest(entry)
           setRecord(normalized)
@@ -51,9 +59,14 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
         }
       } catch (err) {
         if (!cancelled) {
-          const message = err instanceof Error ? err.message : t('staff.leaveRequests.errors.load', 'Failed to load leave request.')
-          setError(message)
-          setRecord(null)
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+            setRecord(null)
+          } else {
+            const message = err instanceof Error ? err.message : t('staff.leaveRequests.errors.load', 'Failed to load leave request.')
+            setError(message)
+            setRecord(null)
+          }
         }
       } finally {
         if (!cancelled) setIsLoading(false)
@@ -115,6 +128,20 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
     )
   }
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.leaveRequests.errors.notFound', 'Leave request not found.')}
+            backHref="/backend/staff/leave-requests"
+            backLabel={t('staff.leaveRequests.actions.backToList', 'Back to leave requests')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !record) {
     return (
       <Page>