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

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

@@ -5,7 +5,7 @@ import { useRouter } from 'next/navigation'
 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 { 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 { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
@@ -20,11 +20,12 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
   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)
 
   React.useEffect(() => {
     if (!id) {
-      setError(t('staff.leaveRequests.errors.notFound', 'Leave request not found.'))
+      setIsNotFound(true)
       setIsLoading(false)
       return
     }
@@ -33,6 +34,7 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
     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>(
@@ -41,15 +43,26 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
           { 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) {
           setRecord(normalizeLeaveRequest(entry))
         }
       } 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)
@@ -93,6 +106,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/my-leave-requests"
+            backLabel={t('staff.leaveRequests.actions.backToMyList', 'Back to my leave requests')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !record) {
     return (
       <Page>

package/src/modules/staff/backend/staff/team-members/[id]/page.tsx

@@ -17,6 +17,7 @@ import { TeamMemberForm, buildTeamMemberPayload, type TeamMemberFormValues } fro
 import { NotesSection } from '@open-mercato/ui/backend/detail'
 import { ActivitiesSection, type SectionAction } from '@open-mercato/ui/backend/detail'
 import { AddressesSection as SharedAddressesSection } from '@open-mercato/ui/backend/detail'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { renderDictionaryColor, renderDictionaryIcon, ICON_SUGGESTIONS } from '@open-mercato/core/modules/dictionaries/components/dictionaryAppearance'
 import { createStaffNotesAdapter } from '@open-mercato/core/modules/staff/components/detail/notesAdapter'
 import { createStaffActivitiesAdapter } from '@open-mercato/core/modules/staff/components/detail/activitiesAdapter'
@@ -70,6 +71,8 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
   const searchParams = useSearchParams()
   const [initialValues, setInitialValues] = React.useState<TeamMemberFormValues | null>(null)
   const [memberRecord, setMemberRecord] = React.useState<TeamMemberRecord | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [availabilityRuleSetId, setAvailabilityRuleSetId] = React.useState<string | null>(null)
   const [activePanel, setActivePanel] = React.useState<'details' | 'availability' | 'jobHistory'>('details')
   const [activeTab, setActiveTab] = React.useState<'notes' | 'activities' | 'addresses'>('notes')
@@ -194,6 +197,10 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
     const memberIdValue = memberId
     let cancelled = false
     async function loadMember() {
+      if (!cancelled) {
+        setError(null)
+        setIsNotFound(false)
+      }
       try {
         const params = new URLSearchParams({ page: '1', pageSize: '1', ids: memberIdValue })
         const payload = await readApiResultOrThrow<TeamMemberResponse>(
@@ -202,7 +209,10 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
           { errorMessage: t('staff.teamMembers.form.errors.load', 'Failed to load team member.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(t('staff.teamMembers.form.errors.notFound', 'Team member not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const customFields = extractCustomFieldEntries(record)
         if (!cancelled) {
           const resolvedTeamId = record.teamId ?? record.team_id ?? null
@@ -227,9 +237,15 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
                 : null,
           )
         }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : t('staff.teamMembers.form.errors.load', 'Failed to load team member.')
-        flash(message, 'error')
+      } catch (err) {
+        if (!cancelled) {
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = err instanceof Error ? err.message : t('staff.teamMembers.form.errors.load', 'Failed to load team member.')
+            setError(message)
+          }
+        }
       }
     }
     void loadMember()
@@ -304,6 +320,30 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
     : [t('staff.teamMembers.detail.roles.unassigned', 'No roles assigned')]
   const userEmail = memberRecord?.user?.email ?? null
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.teamMembers.form.errors.notFound', 'Team member not found.')}
+            backHref="/backend/staff/team-members"
+            backLabel={t('staff.teamMembers.actions.backToList', 'Back to team members')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (error && !initialValues) {
+    return (
+      <Page>
+        <PageBody>
+          <ErrorMessage label={error} />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>

package/src/modules/staff/backend/staff/team-roles/[id]/edit/page.tsx

@@ -3,6 +3,7 @@
 import * as React from 'react'
 import { useRouter } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { readApiResultOrThrow, apiCall } 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'
@@ -38,6 +39,8 @@ export default function StaffTeamRoleEditPage({ params }: { params?: { id?: stri
   const router = useRouter()
   const scopeVersion = useOrganizationScopeVersion()
   const [initialValues, setInitialValues] = React.useState<TeamRoleFormValues | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [teams, setTeams] = React.useState<TeamRoleOption[]>([])
 
   React.useEffect(() => {
@@ -45,6 +48,10 @@ export default function StaffTeamRoleEditPage({ params }: { params?: { id?: stri
     const roleIdValue = roleId
     let cancelled = false
     async function loadRole() {
+      if (!cancelled) {
+        setError(null)
+        setIsNotFound(false)
+      }
       try {
         const params = new URLSearchParams({ page: '1', pageSize: '1', ids: roleIdValue })
         const payload = await readApiResultOrThrow<TeamRoleResponse>(
@@ -53,7 +60,10 @@ export default function StaffTeamRoleEditPage({ params }: { params?: { id?: stri
           { errorMessage: t('staff.teamRoles.errors.load', 'Failed to load team role.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(t('staff.teamRoles.errors.notFound', 'Team role not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const customFields = extractCustomFieldEntries(record)
         const appearanceIcon = typeof record.appearanceIcon === 'string'
           ? record.appearanceIcon
@@ -79,9 +89,15 @@ export default function StaffTeamRoleEditPage({ params }: { params?: { id?: stri
             ...customFields,
           })
         }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : t('staff.teamRoles.errors.load', 'Failed to load team role.')
-        flash(message, 'error')
+      } catch (err) {
+        if (!cancelled) {
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = err instanceof Error ? err.message : t('staff.teamRoles.errors.load', 'Failed to load team role.')
+            setError(message)
+          }
+        }
       }
     }
     loadRole()
@@ -131,6 +147,30 @@ export default function StaffTeamRoleEditPage({ params }: { params?: { id?: stri
     router.push('/backend/staff/team-roles')
   }, [roleId, router, t])
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.teamRoles.errors.notFound', 'Team role not found.')}
+            backHref="/backend/staff/team-roles"
+            backLabel={t('staff.teamRoles.actions.backToList', 'Back to team roles')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (error && !initialValues) {
+    return (
+      <Page>
+        <PageBody>
+          <ErrorMessage label={error} />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
+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 { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/DataTable'
@@ -59,6 +60,8 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
   const searchParams = useSearchParams()
   const scopeVersion = useOrganizationScopeVersion()
   const [initialValues, setInitialValues] = React.useState<TeamFormValues | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [activeTab, setActiveTab] = React.useState<'details' | 'members'>('details')
   const [memberRows, setMemberRows] = React.useState<TeamMemberRow[]>([])
   const [memberPage, setMemberPage] = React.useState(1)
@@ -168,6 +171,10 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
     const teamIdValue = teamId
     let cancelled = false
     async function loadTeam() {
+      if (!cancelled) {
+        setError(null)
+        setIsNotFound(false)
+      }
       try {
         const params = new URLSearchParams({ page: '1', pageSize: '1', ids: teamIdValue })
         const payload = await readApiResultOrThrow<TeamResponse>(
@@ -176,7 +183,10 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
           { errorMessage: t('staff.teams.errors.load', 'Failed to load team.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(t('staff.teams.errors.notFound', 'Team not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const customFields = extractCustomFieldEntries(record)
         const isActive = typeof record.isActive === 'boolean'
           ? record.isActive
@@ -192,9 +202,15 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
             ...customFields,
           })
         }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : t('staff.teams.errors.load', 'Failed to load team.')
-        flash(message, 'error')
+      } catch (err) {
+        if (!cancelled) {
+          if ((err as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = err instanceof Error ? err.message : t('staff.teams.errors.load', 'Failed to load team.')
+            setError(message)
+          }
+        }
       }
     }
     loadTeam()
@@ -288,6 +304,30 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
     router.push('/backend/staff/teams')
   }, [teamId, router, t])
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.teams.errors.notFound', 'Team not found.')}
+            backHref="/backend/staff/teams"
+            backLabel={t('staff.teams.actions.backToList', 'Back to teams')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (error && !initialValues) {
+    return (
+      <Page>
+        <PageBody>
+          <ErrorMessage label={error} />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>

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

@@ -214,6 +214,8 @@
   "staff.errors.unauthorized": "Nicht autorisiert",
   "staff.leaveRequests.actions.accept": "Genehmigen",
   "staff.leaveRequests.actions.add": "Neuer Antrag",
+  "staff.leaveRequests.actions.backToList": "Zurück zu Urlaubsanträgen",
+  "staff.leaveRequests.actions.backToMyList": "Zurück zu meinen Urlaubsanträgen",
   "staff.leaveRequests.actions.createProfile": "Mein Profil erstellen",
   "staff.leaveRequests.actions.refresh": "Aktualisieren",
   "staff.leaveRequests.actions.reject": "Ablehnen",
@@ -444,6 +446,7 @@
   "staff.services.table.search": "Leistungen suchen...",
   "staff.services.table.tags": "Schlagworte",
   "staff.teamMembers.actions.add": "Teammitglied hinzufügen",
+  "staff.teamMembers.actions.backToList": "Zurück zu Teammitgliedern",
   "staff.teamMembers.actions.delete": "Löschen",
   "staff.teamMembers.actions.deleteConfirm": "Teammitglied \"{{name}}\" löschen?",
   "staff.teamMembers.actions.edit": "Bearbeiten",
@@ -854,6 +857,7 @@
   "staff.teamMembers.tags.title": "Schlagworte",
   "staff.teamMembers.tags.updateError": "Tags konnten nicht aktualisiert werden.",
   "staff.teamRoles.actions.add": "Teamrolle hinzufügen",
+  "staff.teamRoles.actions.backToList": "Zurück zu Teamrollen",
   "staff.teamRoles.actions.delete": "Löschen",
   "staff.teamRoles.actions.deleteConfirm": "Teamrolle \"{{name}}\" löschen?",
   "staff.teamRoles.actions.edit": "Bearbeiten",
@@ -897,6 +901,7 @@
   "staff.teamRoles.table.search": "Rollen suchen...",
   "staff.teamRoles.table.updatedAt": "Aktualisiert",
   "staff.teams.actions.add": "Team hinzufügen",
+  "staff.teams.actions.backToList": "Zurück zu Teams",
   "staff.teams.actions.delete": "Löschen",
   "staff.teams.actions.deleteConfirm": "Team \"{{name}}\" löschen?",
   "staff.teams.actions.edit": "Bearbeiten",

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

@@ -214,6 +214,8 @@
   "staff.errors.unauthorized": "Unauthorized",
   "staff.leaveRequests.actions.accept": "Approve",
   "staff.leaveRequests.actions.add": "New request",
+  "staff.leaveRequests.actions.backToList": "Back to leave requests",
+  "staff.leaveRequests.actions.backToMyList": "Back to my leave requests",
   "staff.leaveRequests.actions.createProfile": "Create my profile",
   "staff.leaveRequests.actions.refresh": "Refresh",
   "staff.leaveRequests.actions.reject": "Reject",
@@ -444,6 +446,7 @@
   "staff.services.table.search": "Search services...",
   "staff.services.table.tags": "Tags",
   "staff.teamMembers.actions.add": "Add team member",
+  "staff.teamMembers.actions.backToList": "Back to team members",
   "staff.teamMembers.actions.delete": "Delete",
   "staff.teamMembers.actions.deleteConfirm": "Delete team member \"{{name}}\"?",
   "staff.teamMembers.actions.edit": "Edit",
@@ -854,6 +857,7 @@
   "staff.teamMembers.tags.title": "Tags",
   "staff.teamMembers.tags.updateError": "Failed to update tags.",
   "staff.teamRoles.actions.add": "Add team role",
+  "staff.teamRoles.actions.backToList": "Back to team roles",
   "staff.teamRoles.actions.delete": "Delete",
   "staff.teamRoles.actions.deleteConfirm": "Delete team role \"{{name}}\"?",
   "staff.teamRoles.actions.edit": "Edit",
@@ -897,6 +901,7 @@
   "staff.teamRoles.table.search": "Search roles...",
   "staff.teamRoles.table.updatedAt": "Updated",
   "staff.teams.actions.add": "Add team",
+  "staff.teams.actions.backToList": "Back to teams",
   "staff.teams.actions.delete": "Delete",
   "staff.teams.actions.deleteConfirm": "Delete team \"{{name}}\"?",
   "staff.teams.actions.edit": "Edit",

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

@@ -214,6 +214,8 @@
   "staff.errors.unauthorized": "No autorizado",
   "staff.leaveRequests.actions.accept": "Aprobar",
   "staff.leaveRequests.actions.add": "Nueva solicitud",
+  "staff.leaveRequests.actions.backToList": "Volver a solicitudes de ausencia",
+  "staff.leaveRequests.actions.backToMyList": "Volver a mis solicitudes de ausencia",
   "staff.leaveRequests.actions.createProfile": "Crear mi perfil",
   "staff.leaveRequests.actions.refresh": "Actualizar",
   "staff.leaveRequests.actions.reject": "Rechazar",
@@ -444,6 +446,7 @@
   "staff.services.table.search": "Buscar servicios...",
   "staff.services.table.tags": "Etiquetas",
   "staff.teamMembers.actions.add": "Agregar miembro",
+  "staff.teamMembers.actions.backToList": "Volver a miembros del equipo",
   "staff.teamMembers.actions.delete": "Eliminar",
   "staff.teamMembers.actions.deleteConfirm": "¿Eliminar al miembro \"{{name}}\"?",
   "staff.teamMembers.actions.edit": "Editar",
@@ -854,6 +857,7 @@
   "staff.teamMembers.tags.title": "Etiquetas",
   "staff.teamMembers.tags.updateError": "No se pudieron actualizar las etiquetas.",
   "staff.teamRoles.actions.add": "Agregar rol",
+  "staff.teamRoles.actions.backToList": "Volver a roles del equipo",
   "staff.teamRoles.actions.delete": "Eliminar",
   "staff.teamRoles.actions.deleteConfirm": "¿Eliminar el rol \"{{name}}\"?",
   "staff.teamRoles.actions.edit": "Editar",
@@ -897,6 +901,7 @@
   "staff.teamRoles.table.search": "Buscar roles...",
   "staff.teamRoles.table.updatedAt": "Actualizado",
   "staff.teams.actions.add": "Agregar equipo",
+  "staff.teams.actions.backToList": "Volver a equipos",
   "staff.teams.actions.delete": "Eliminar",
   "staff.teams.actions.deleteConfirm": "¿Eliminar el equipo \"{{name}}\"?",
   "staff.teams.actions.edit": "Editar",

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

@@ -214,6 +214,8 @@
   "staff.errors.unauthorized": "Brak autoryzacji",
   "staff.leaveRequests.actions.accept": "Zatwierdź",
   "staff.leaveRequests.actions.add": "Nowy wniosek",
+  "staff.leaveRequests.actions.backToList": "Powrót do wniosków urlopowych",
+  "staff.leaveRequests.actions.backToMyList": "Powrót do moich wniosków urlopowych",
   "staff.leaveRequests.actions.createProfile": "Utwórz mój profil",
   "staff.leaveRequests.actions.refresh": "Odśwież",
   "staff.leaveRequests.actions.reject": "Odrzuć",
@@ -444,6 +446,7 @@
   "staff.services.table.search": "Szukaj usług...",
   "staff.services.table.tags": "Tagi",
   "staff.teamMembers.actions.add": "Dodaj członka",
+  "staff.teamMembers.actions.backToList": "Powrót do członków zespołu",
   "staff.teamMembers.actions.delete": "Usuń",
   "staff.teamMembers.actions.deleteConfirm": "Usunąć członka \"{{name}}\"?",
   "staff.teamMembers.actions.edit": "Edytuj",
@@ -854,6 +857,7 @@
   "staff.teamMembers.tags.title": "Tagi",
   "staff.teamMembers.tags.updateError": "Nie udało się zaktualizować tagów.",
   "staff.teamRoles.actions.add": "Dodaj rolę",
+  "staff.teamRoles.actions.backToList": "Powrót do ról zespołu",
   "staff.teamRoles.actions.delete": "Usuń",
   "staff.teamRoles.actions.deleteConfirm": "Usunąć rolę \"{{name}}\"?",
   "staff.teamRoles.actions.edit": "Edytuj",
@@ -897,6 +901,7 @@
   "staff.teamRoles.table.search": "Szukaj ról...",
   "staff.teamRoles.table.updatedAt": "Zaktualizowano",
   "staff.teams.actions.add": "Dodaj zespół",
+  "staff.teams.actions.backToList": "Powrót do zespołów",
   "staff.teams.actions.delete": "Usuń",
   "staff.teams.actions.deleteConfirm": "Usunąć zespół \"{{name}}\"?",
   "staff.teams.actions.edit": "Edytuj",

package/src/modules/workflows/backend/definitions/[id]/page.tsx

@@ -8,6 +8,7 @@ import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { apiFetch } from '@open-mercato/ui/backend/utils/api'
 import { readJsonSafe } from '@open-mercato/ui/backend/utils/serverErrors'
 import { formatWorkflowValidationError } from '../../../lib/format-validation-error'
@@ -49,14 +50,22 @@ export default function EditWorkflowDefinitionPage() {
     queryFn: async () => {
       const response = await apiFetch(`/api/workflows/definitions/${definitionId}`)
       if (!response.ok) {
-        throw new Error(t('workflows.errors.fetchFailed'))
+        const err = new Error(t('workflows.errors.fetchFailed')) as Error & { status?: number }
+        err.status = response.status
+        throw err
       }
       const result = await response.json()
       return result.data
     },
     enabled: !!definitionId,
+    retry: (failureCount, err) => {
+      if ((err as { status?: number }).status === 404) return false
+      return failureCount < 2
+    },
   })
 
+  const isNotFound = (error as { status?: number } | null)?.status === 404
+
   const initialValues = React.useMemo(() => {
     if (definition) {
       return parseWorkflowToFormValues(definition)
@@ -209,12 +218,26 @@ export default function EditWorkflowDefinitionPage() {
     )
   }
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('workflows.errors.notFound', t('workflows.errors.loadFailed'))}
+            backHref="/backend/definitions"
+            backLabel={t('workflows.backToList')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !definition) {
     return (
       <Page>
         <PageBody>
-          <div className="flex h-[50vh] flex-col items-center justify-center gap-2 text-muted-foreground">
-            <p>{t('workflows.errors.loadFailed')}</p>
+          <ErrorMessage label={t('workflows.errors.loadFailed')} />
+          <div className="mt-4 flex justify-center">
             <Button asChild variant="outline">
               <a href="/backend/definitions">{t('workflows.backToList')}</a>
             </Button>

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

@@ -402,6 +402,7 @@
   "workflows.errors.createFailed": "Workflow konnte nicht erstellt werden",
   "workflows.errors.fetchFailed": "Workflow konnte nicht abgerufen werden",
   "workflows.errors.loadFailed": "Workflow konnte nicht geladen werden. Bitte versuchen Sie es erneut.",
+  "workflows.errors.notFound": "Workflow nicht gefunden.",
   "workflows.errors.updateFailed": "Workflow konnte nicht aktualisiert werden",
   "workflows.events.backToList": "Zurück zu Ereignissen",
   "workflows.events.detail.eventData": "Ereignisdaten",

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

@@ -402,6 +402,7 @@
   "workflows.errors.createFailed": "Failed to create workflow",
   "workflows.errors.fetchFailed": "Failed to fetch workflow",
   "workflows.errors.loadFailed": "Failed to load workflow. Please try again.",
+  "workflows.errors.notFound": "Workflow not found.",
   "workflows.errors.updateFailed": "Failed to update workflow",
   "workflows.events.backToList": "Back to Events",
   "workflows.events.detail.eventData": "Event Data",

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

@@ -402,6 +402,7 @@
   "workflows.errors.createFailed": "No se pudo crear el flujo de trabajo",
   "workflows.errors.fetchFailed": "No se pudo obtener el flujo de trabajo",
   "workflows.errors.loadFailed": "No se pudo cargar el flujo de trabajo. Intentalo de nuevo.",
+  "workflows.errors.notFound": "Flujo de trabajo no encontrado.",
   "workflows.errors.updateFailed": "No se pudo actualizar el flujo de trabajo",
   "workflows.events.backToList": "Volver a eventos",
   "workflows.events.detail.eventData": "Datos del evento",

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

@@ -402,6 +402,7 @@
   "workflows.errors.createFailed": "Nie udało się utworzyć przepływu",
   "workflows.errors.fetchFailed": "Nie udało się pobrać przepływu",
   "workflows.errors.loadFailed": "Nie udało się załadować przepływu. Spróbuj ponownie.",
+  "workflows.errors.notFound": "Nie znaleziono przepływu pracy.",
   "workflows.errors.updateFailed": "Nie udało się zaktualizować przepływu",
   "workflows.events.backToList": "Powrót do Zdarzeń",
   "workflows.events.detail.eventData": "Dane Zdarzenia",