create-mercato-app 0.6.4-develop.4363.1.2f376570ae → 0.6.4-develop.4368.1.2f7e9a7002

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.6.4-develop.4363.1.2f376570ae",
+  "version": "0.6.4-develop.4368.1.2f7e9a7002",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",

package/template/src/modules/example/backend/todos/[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 { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { fetchCrudList, updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { pushWithFlash } from '@open-mercato/ui/backend/utils/flash'
 import { SendObjectMessageDialog } from '@open-mercato/ui/backend/messages'
@@ -25,6 +26,7 @@ export default function EditTodoPage({ params }: { params?: { id?: string } }) {
   const [initial, setInitial] = React.useState<TodoFormValues | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [err, setErr] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   // Memoize fields to avoid recreating arrays/objects each render (prevents focus loss)
   const baseFields = React.useMemo<CrudField[]>(() => [
     {
@@ -76,10 +78,14 @@ export default function EditTodoPage({ params }: { params?: { id?: string } }) {
       if (!id) return
       setLoading(true)
       setErr(null)
+      setIsNotFound(false)
       try {
         const data = await fetchCrudList<TodoItem>('example/todos', { id: String(id), pageSize: 1 })
         const item = data?.items?.[0]
-        if (!item) throw new Error(t('example.todos.form.error.notFound'))
+        if (!item) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         // Map to form initial values
         const extended = item as TodoItem & Record<string, unknown>
         const cfInit = extractCustomFieldEntries(extended) as Partial<TodoCustomFieldValues>
@@ -92,8 +98,12 @@ export default function EditTodoPage({ params }: { params?: { id?: string } }) {
         if (!cancelled) setInitial(init)
       } catch (error: unknown) {
         if (!cancelled) {
-          const message = error instanceof Error && error.message ? error.message : t('example.todos.form.error.load')
-          setErr(message)
+          if ((error as { status?: number }).status === 404) {
+            setIsNotFound(true)
+          } else {
+            const message = error instanceof Error && error.message ? error.message : t('example.todos.form.error.load')
+            setErr(message)
+          }
         }
       } finally {
         if (!cancelled) setLoading(false)
@@ -111,11 +121,25 @@ export default function EditTodoPage({ params }: { params?: { id?: string } }) {
 
   if (!id) return null
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('example.todos.form.error.notFound')}
+            backHref="/backend/todos"
+            backLabel={t('example.todos.form.actions.backToList', 'Back to todos')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>
         {err ? (
-          <div className="text-red-600">{err}</div>
+          <ErrorMessage label={err} />
         ) : (
           <CrudForm<TodoFormValues>
             title={t('example.todos.form.edit.title')}

package/template/src/modules/example/i18n/de.json

@@ -208,6 +208,7 @@
   "example.salesTodos.tabLabel": "Aufgaben (Beispiel)",
   "example.todos.create.title": "To-do erstellen",
   "example.todos.edit.title": "To-do bearbeiten",
+  "example.todos.form.actions.backToList": "Zurück zu Aufgaben",
   "example.todos.form.create.submit": "To-do erstellen",
   "example.todos.form.create.title": "To-do erstellen",
   "example.todos.form.edit.submit": "Speichern",

package/template/src/modules/example/i18n/en.json

@@ -208,6 +208,7 @@
   "example.salesTodos.tabLabel": "Todos (example)",
   "example.todos.create.title": "Create Todo",
   "example.todos.edit.title": "Edit Todo",
+  "example.todos.form.actions.backToList": "Back to todos",
   "example.todos.form.create.submit": "Create Todo",
   "example.todos.form.create.title": "Create Todo",
   "example.todos.form.edit.submit": "Save",

package/template/src/modules/example/i18n/es.json

@@ -208,6 +208,7 @@
   "example.salesTodos.tabLabel": "Tareas (ejemplo)",
   "example.todos.create.title": "Crear tarea",
   "example.todos.edit.title": "Editar tarea",
+  "example.todos.form.actions.backToList": "Volver a tareas",
   "example.todos.form.create.submit": "Crear tarea",
   "example.todos.form.create.title": "Crear tarea",
   "example.todos.form.edit.submit": "Guardar",

package/template/src/modules/example/i18n/pl.json

@@ -208,6 +208,7 @@
   "example.salesTodos.tabLabel": "Zadania (przykład)",
   "example.todos.create.title": "Utwórz zadanie",
   "example.todos.edit.title": "Edytuj zadanie",
+  "example.todos.form.actions.backToList": "Powrót do zadań",
   "example.todos.form.create.submit": "Utwórz zadanie",
   "example.todos.form.create.title": "Utwórz zadanie",
   "example.todos.form.edit.submit": "Zapisz",