From bc2ceadb8f7714ce87fbeecf7efcbf122d6a4d9a Mon Sep 17 00:00:00 2001
From: Julien Froidefond <julien.froidefond@cdbdx.biz>
Date: Fri, 28 Feb 2025 08:00:34 +0100
Subject: [PATCH] fix: errorMessage has to throw apperror code if apperror

---
 src/app/books/[bookId]/page.tsx        | 8 ++++++++
 src/app/libraries/[libraryId]/page.tsx | 7 ++++---
 src/app/page.tsx                       | 7 +++++++
 src/app/series/[seriesId]/page.tsx     | 8 ++++++++
 src/components/auth/LoginForm.tsx      | 3 ++-
 src/components/auth/RegisterForm.tsx   | 3 ++-
 src/components/ui/ErrorMessage.tsx     | 2 +-
 src/i18n/messages/en/common.json       | 4 +++-
 src/i18n/messages/fr/common.json       | 4 +++-
 9 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/app/books/[bookId]/page.tsx b/src/app/books/[bookId]/page.tsx
index 8f86dcf..1abb12d 100644
--- a/src/app/books/[bookId]/page.tsx
+++ b/src/app/books/[bookId]/page.tsx
@@ -7,6 +7,7 @@ import { withPageTiming } from "@/lib/hoc/withPageTiming";
 import { KomgaBookWithPages } from "@/types/komga";
 import { ErrorMessage } from "@/components/ui/ErrorMessage";
 import { ERROR_CODES } from "@/constants/errorCodes";
+import { AppError } from "@/utils/errors";
 
 async function BookPage({ params }: { params: { bookId: string } }) {
   try {
@@ -19,6 +20,13 @@ async function BookPage({ params }: { params: { bookId: string } }) {
     );
   } catch (error) {
     console.error("Erreur:", error);
+    if (error instanceof AppError) {
+      return (
+        <div className="container py-8 space-y-8">
+          <ErrorMessage errorCode={error.code} />
+        </div>
+      );
+    }
     return (
       <div className="container py-8 space-y-8">
         <ErrorMessage errorCode={ERROR_CODES.SERIES.FETCH_ERROR} />
diff --git a/src/app/libraries/[libraryId]/page.tsx b/src/app/libraries/[libraryId]/page.tsx
index 04fc2a8..2f4edc7 100644
--- a/src/app/libraries/[libraryId]/page.tsx
+++ b/src/app/libraries/[libraryId]/page.tsx
@@ -9,6 +9,7 @@ import { LibraryResponse } from "@/types/library";
 import { KomgaSeries, KomgaLibrary } from "@/types/komga";
 import { UserPreferences } from "@/types/preferences";
 import { ERROR_CODES } from "@/constants/errorCodes";
+import { AppError } from "@/utils/errors";
 
 interface PageProps {
   params: { libraryId: string };
@@ -51,7 +52,7 @@ async function getLibrarySeries(
 
     return { data: series, library };
   } catch (error) {
-    throw error instanceof Error ? error : new Error("Erreur lors de la récupération des séries");
+    throw error instanceof Error ? error : new AppError(ERROR_CODES.SERIES.FETCH_ERROR, {}, error);
   }
 }
 
@@ -92,14 +93,14 @@ async function LibraryPage({ params, searchParams }: PageProps) {
       </div>
     );
   } catch (error) {
-    if (error instanceof Error) {
+    if (error instanceof AppError) {
       return (
         <div className="container py-8 space-y-8">
           <div className="flex items-center justify-between">
             <h1 className="text-3xl font-bold">Séries</h1>
             <RefreshButton libraryId={params.libraryId} refreshLibrary={refreshLibrary} />
           </div>
-          <ErrorMessage errorCode={ERROR_CODES.SERIES.FETCH_ERROR} />
+          <ErrorMessage errorCode={error.code} />
         </div>
       );
     }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4b2ae32..04e8138 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,6 +30,13 @@ async function HomePage() {
     if (error instanceof AppError && error.code === ERROR_CODES.KOMGA.MISSING_CONFIG) {
       redirect("/settings");
     }
+    if (error instanceof AppError) {
+      return (
+        <main className="container mx-auto px-4 py-8">
+          <ErrorMessage errorCode={error.code} />
+        </main>
+      );
+    }
 
     return (
       <main className="container mx-auto px-4 py-8">
diff --git a/src/app/series/[seriesId]/page.tsx b/src/app/series/[seriesId]/page.tsx
index 57eb5cc..c6361f7 100644
--- a/src/app/series/[seriesId]/page.tsx
+++ b/src/app/series/[seriesId]/page.tsx
@@ -9,6 +9,7 @@ import { LibraryResponse } from "@/types/library";
 import { KomgaBook, KomgaSeries } from "@/types/komga";
 import { UserPreferences } from "@/types/preferences";
 import { ERROR_CODES } from "@/constants/errorCodes";
+import { AppError } from "@/utils/errors";
 
 interface PageProps {
   params: { seriesId: string };
@@ -76,6 +77,13 @@ async function SeriesPage({ params, searchParams }: PageProps) {
       </div>
     );
   } catch (error) {
+    if (error instanceof AppError) {
+      return (
+        <div className="container py-8 space-y-8">
+          <ErrorMessage errorCode={error.code} />
+        </div>
+      );
+    }
     return (
       <div className="container py-8 space-y-8">
         <h1 className="text-3xl font-bold">Série</h1>
diff --git a/src/components/auth/LoginForm.tsx b/src/components/auth/LoginForm.tsx
index 44c94a6..a020a42 100644
--- a/src/components/auth/LoginForm.tsx
+++ b/src/components/auth/LoginForm.tsx
@@ -6,6 +6,7 @@ import { authService } from "@/lib/services/auth.service";
 import { AppErrorType } from "@/types/global";
 import { ErrorMessage } from "@/components/ui/ErrorMessage";
 import { useTranslate } from "@/hooks/useTranslate";
+import { AppError } from "@/utils/errors";
 
 interface LoginFormProps {
   from?: string;
@@ -89,7 +90,7 @@ export function LoginForm({ from }: LoginFormProps) {
           {t("login.form.remember")}
         </label>
       </div>
-      {error && <ErrorMessage errorCode={error.code} variant="form" />}
+      {error && error instanceof AppError && <ErrorMessage errorCode={error.code} variant="form" />}
       <button
         type="submit"
         disabled={isLoading}
diff --git a/src/components/auth/RegisterForm.tsx b/src/components/auth/RegisterForm.tsx
index e0794d9..f083eeb 100644
--- a/src/components/auth/RegisterForm.tsx
+++ b/src/components/auth/RegisterForm.tsx
@@ -8,6 +8,7 @@ import { ERROR_CODES } from "@/constants/errorCodes";
 import { ErrorMessage } from "@/components/ui/ErrorMessage";
 import { useTranslate } from "@/hooks/useTranslate";
 import { getErrorMessage } from "@/utils/errors";
+import { AppError } from "@/utils/errors";
 
 interface RegisterFormProps {
   from?: string;
@@ -100,7 +101,7 @@ export function RegisterForm({ from }: RegisterFormProps) {
           className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
         />
       </div>
-      {error && <ErrorMessage errorCode={error.code} variant="form" />}
+      {error && error instanceof AppError && <ErrorMessage errorCode={error.code} variant="form" />}
       <button
         type="submit"
         disabled={isLoading}
diff --git a/src/components/ui/ErrorMessage.tsx b/src/components/ui/ErrorMessage.tsx
index 5705191..c54ca9b 100644
--- a/src/components/ui/ErrorMessage.tsx
+++ b/src/components/ui/ErrorMessage.tsx
@@ -43,7 +43,7 @@ export const ErrorMessage = ({ errorCode, error, variant = "default" }: ErrorMes
 
         <div className="flex-1">
           <h3 className="mb-1 font-medium text-destructive dark:text-red-400">
-            Une erreur est survenue
+            {t("errors.GENERIC_ERROR")}
           </h3>
           <p className="text-sm text-destructive/90 dark:text-red-300/90">{message}</p>
         </div>
diff --git a/src/i18n/messages/en/common.json b/src/i18n/messages/en/common.json
index e77a7fd..0081112 100644
--- a/src/i18n/messages/en/common.json
+++ b/src/i18n/messages/en/common.json
@@ -259,6 +259,8 @@
 
     "SERIES_FETCH_ERROR": "Error fetching series",
     "HOME_FETCH_ERROR": "Error fetching home",
-    "SERIES_NO_BOOKS_FOUND": "No books found in the series"
+    "SERIES_NO_BOOKS_FOUND": "No books found in the series",
+
+    "GENERIC_ERROR": "An error occurred"
   }
 }
diff --git a/src/i18n/messages/fr/common.json b/src/i18n/messages/fr/common.json
index 64b6b46..3e1873d 100644
--- a/src/i18n/messages/fr/common.json
+++ b/src/i18n/messages/fr/common.json
@@ -259,6 +259,8 @@
 
     "SERIES_FETCH_ERROR": "Erreur lors de la récupération des séries",
     "HOME_FETCH_ERROR": "Erreur lors de la récupération de l'accueil",
-    "SERIES_NO_BOOKS_FOUND": "Aucun livre trouvé dans la série"
+    "SERIES_NO_BOOKS_FOUND": "Aucun livre trouvé dans la série",
+
+    "GENERIC_ERROR": "Une erreur est survenue"
   }
 }