refactor: simplify HomePage and LibraryPage components by integrating ClientHomePage and ClientLibraryPage, enhancing data fetching and error handling
This commit is contained in:
38
src/app/api/komga/home/route.ts
Normal file
38
src/app/api/komga/home/route.ts
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { HomeService } from "@/lib/services/home.service";
|
||||||
|
import { ERROR_CODES } from "@/constants/errorCodes";
|
||||||
|
import { AppError } from "@/utils/errors";
|
||||||
|
import { getErrorMessage } from "@/utils/errors";
|
||||||
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
try {
|
||||||
|
const data = await HomeService.getHomeData();
|
||||||
|
return NextResponse.json(data);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("API Home - Erreur:", error);
|
||||||
|
if (error instanceof AppError) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: error.code,
|
||||||
|
name: "Home data fetch error",
|
||||||
|
message: getErrorMessage(error.code),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: error.code === ERROR_CODES.KOMGA.MISSING_CONFIG ? 404 : 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: ERROR_CODES.KOMGA.SERVER_UNREACHABLE,
|
||||||
|
name: "Home data fetch error",
|
||||||
|
message: getErrorMessage(ERROR_CODES.KOMGA.SERVER_UNREACHABLE),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
56
src/app/api/komga/libraries/[libraryId]/series/route.ts
Normal file
56
src/app/api/komga/libraries/[libraryId]/series/route.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { LibraryService } from "@/lib/services/library.service";
|
||||||
|
import { ERROR_CODES } from "@/constants/errorCodes";
|
||||||
|
import { AppError } from "@/utils/errors";
|
||||||
|
import { getErrorMessage } from "@/utils/errors";
|
||||||
|
import type { NextRequest } from "next/server";
|
||||||
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
const DEFAULT_PAGE_SIZE = 20;
|
||||||
|
|
||||||
|
export async function GET(
|
||||||
|
request: NextRequest,
|
||||||
|
{ params }: { params: Promise<{ libraryId: string }> }
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
const libraryId: string = (await params).libraryId;
|
||||||
|
const searchParams = request.nextUrl.searchParams;
|
||||||
|
|
||||||
|
const page = parseInt(searchParams.get("page") || "0");
|
||||||
|
const size = parseInt(searchParams.get("size") || String(DEFAULT_PAGE_SIZE));
|
||||||
|
const unreadOnly = searchParams.get("unread") === "true";
|
||||||
|
const search = searchParams.get("search") || undefined;
|
||||||
|
|
||||||
|
const [series, library] = await Promise.all([
|
||||||
|
LibraryService.getLibrarySeries(libraryId, page, size, unreadOnly, search),
|
||||||
|
LibraryService.getLibrary(libraryId)
|
||||||
|
]);
|
||||||
|
|
||||||
|
return NextResponse.json({ series, library });
|
||||||
|
} catch (error) {
|
||||||
|
console.error("API Library Series - Erreur:", error);
|
||||||
|
if (error instanceof AppError) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: error.code,
|
||||||
|
name: "Library series fetch error",
|
||||||
|
message: getErrorMessage(error.code),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: ERROR_CODES.SERIES.FETCH_ERROR,
|
||||||
|
name: "Library series fetch error",
|
||||||
|
message: getErrorMessage(ERROR_CODES.SERIES.FETCH_ERROR),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
55
src/app/api/komga/series/[seriesId]/books/route.ts
Normal file
55
src/app/api/komga/series/[seriesId]/books/route.ts
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { SeriesService } from "@/lib/services/series.service";
|
||||||
|
import { ERROR_CODES } from "@/constants/errorCodes";
|
||||||
|
import { AppError } from "@/utils/errors";
|
||||||
|
import { getErrorMessage } from "@/utils/errors";
|
||||||
|
import type { NextRequest } from "next/server";
|
||||||
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
const DEFAULT_PAGE_SIZE = 20;
|
||||||
|
|
||||||
|
export async function GET(
|
||||||
|
request: NextRequest,
|
||||||
|
{ params }: { params: Promise<{ seriesId: string }> }
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
const seriesId: string = (await params).seriesId;
|
||||||
|
const searchParams = request.nextUrl.searchParams;
|
||||||
|
|
||||||
|
const page = parseInt(searchParams.get("page") || "0");
|
||||||
|
const size = parseInt(searchParams.get("size") || String(DEFAULT_PAGE_SIZE));
|
||||||
|
const unreadOnly = searchParams.get("unread") === "true";
|
||||||
|
|
||||||
|
const [books, series] = await Promise.all([
|
||||||
|
SeriesService.getSeriesBooks(seriesId, page, size, unreadOnly),
|
||||||
|
SeriesService.getSeries(seriesId)
|
||||||
|
]);
|
||||||
|
|
||||||
|
return NextResponse.json({ books, series });
|
||||||
|
} catch (error) {
|
||||||
|
console.error("API Series Books - Erreur:", error);
|
||||||
|
if (error instanceof AppError) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: error.code,
|
||||||
|
name: "Series books fetch error",
|
||||||
|
message: getErrorMessage(error.code),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: {
|
||||||
|
code: ERROR_CODES.BOOK.PAGES_FETCH_ERROR,
|
||||||
|
name: "Series books fetch error",
|
||||||
|
message: getErrorMessage(ERROR_CODES.BOOK.PAGES_FETCH_ERROR),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,46 +1,138 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
import { PaginatedSeriesGrid } from "@/components/library/PaginatedSeriesGrid";
|
import { PaginatedSeriesGrid } from "@/components/library/PaginatedSeriesGrid";
|
||||||
import { RefreshButton } from "@/components/library/RefreshButton";
|
import { RefreshButton } from "@/components/library/RefreshButton";
|
||||||
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
||||||
import { useTranslate } from "@/hooks/useTranslate";
|
import { useTranslate } from "@/hooks/useTranslate";
|
||||||
|
import { OptimizedSkeleton } from "@/components/skeletons/OptimizedSkeletons";
|
||||||
|
import { LibraryService } from "@/lib/services/library.service";
|
||||||
import type { LibraryResponse } from "@/types/library";
|
import type { LibraryResponse } from "@/types/library";
|
||||||
import type { KomgaSeries, KomgaLibrary } from "@/types/komga";
|
import type { KomgaSeries, KomgaLibrary } from "@/types/komga";
|
||||||
import type { UserPreferences } from "@/types/preferences";
|
import type { UserPreferences } from "@/types/preferences";
|
||||||
|
|
||||||
interface ClientLibraryPageProps {
|
interface ClientLibraryPageProps {
|
||||||
library: KomgaLibrary | null;
|
|
||||||
series: LibraryResponse<KomgaSeries> | null;
|
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
libraryId: string;
|
libraryId: string;
|
||||||
refreshLibrary: (libraryId: string) => Promise<{ success: boolean; error?: string }>;
|
|
||||||
preferences: UserPreferences;
|
preferences: UserPreferences;
|
||||||
unreadOnly: boolean;
|
unreadOnly: boolean;
|
||||||
errorCode?: string;
|
search?: string;
|
||||||
|
pageSize?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DEFAULT_PAGE_SIZE = 20;
|
||||||
|
|
||||||
export function ClientLibraryPage({
|
export function ClientLibraryPage({
|
||||||
library,
|
|
||||||
series,
|
|
||||||
currentPage,
|
currentPage,
|
||||||
libraryId,
|
libraryId,
|
||||||
refreshLibrary,
|
|
||||||
preferences,
|
preferences,
|
||||||
unreadOnly,
|
unreadOnly,
|
||||||
errorCode,
|
search,
|
||||||
|
pageSize,
|
||||||
}: ClientLibraryPageProps) {
|
}: ClientLibraryPageProps) {
|
||||||
const { t } = useTranslate();
|
const { t } = useTranslate();
|
||||||
|
const [library, setLibrary] = useState<KomgaLibrary | null>(null);
|
||||||
|
const [series, setSeries] = useState<LibraryResponse<KomgaSeries> | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
if (errorCode) {
|
const effectivePageSize = pageSize || preferences.displayMode?.itemsPerPage || DEFAULT_PAGE_SIZE;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchData = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const params = new URLSearchParams({
|
||||||
|
page: String(currentPage - 1),
|
||||||
|
size: String(effectivePageSize),
|
||||||
|
unread: String(unreadOnly),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (search) {
|
||||||
|
params.append("search", search);
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(`/api/komga/libraries/${libraryId}/series?${params}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const errorData = await response.json();
|
||||||
|
throw new Error(errorData.error?.code || "SERIES_FETCH_ERROR");
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
setLibrary(data.library);
|
||||||
|
setSeries(data.series);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Error fetching library series:", err);
|
||||||
|
setError(err instanceof Error ? err.message : "SERIES_FETCH_ERROR");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchData();
|
||||||
|
}, [libraryId, currentPage, unreadOnly, search, effectivePageSize]);
|
||||||
|
|
||||||
|
const handleRefresh = async (libraryId: string) => {
|
||||||
|
try {
|
||||||
|
await LibraryService.invalidateLibrarySeriesCache(libraryId);
|
||||||
|
|
||||||
|
// Recharger les données
|
||||||
|
const params = new URLSearchParams({
|
||||||
|
page: String(currentPage - 1),
|
||||||
|
size: String(effectivePageSize),
|
||||||
|
unread: String(unreadOnly),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (search) {
|
||||||
|
params.append("search", search);
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(`/api/komga/libraries/${libraryId}/series?${params}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Error refreshing library");
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
setLibrary(data.library);
|
||||||
|
setSeries(data.series);
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error during refresh:", error);
|
||||||
|
return { success: false, error: "Error refreshing library" };
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return (
|
||||||
|
<div className="container py-8 space-y-8">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<OptimizedSkeleton className="h-10 w-64" />
|
||||||
|
<OptimizedSkeleton className="h-10 w-10 rounded-full" />
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
|
||||||
|
{Array.from({ length: effectivePageSize }).map((_, i) => (
|
||||||
|
<OptimizedSkeleton key={i} className="aspect-[3/4] w-full rounded" />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
return (
|
return (
|
||||||
<div className="container py-8 space-y-8">
|
<div className="container py-8 space-y-8">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<h1 className="text-3xl font-bold">
|
<h1 className="text-3xl font-bold">
|
||||||
{library?.name || t("series.empty")}
|
{library?.name || t("series.empty")}
|
||||||
</h1>
|
</h1>
|
||||||
<RefreshButton libraryId={libraryId} refreshLibrary={refreshLibrary} />
|
<RefreshButton libraryId={libraryId} refreshLibrary={handleRefresh} />
|
||||||
</div>
|
</div>
|
||||||
<ErrorMessage errorCode={errorCode} />
|
<ErrorMessage errorCode={error} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -61,13 +153,13 @@ export function ClientLibraryPage({
|
|||||||
{series.totalElements > 0 && (
|
{series.totalElements > 0 && (
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
{t("series.display.showing", {
|
{t("series.display.showing", {
|
||||||
start: ((currentPage - 1) * (preferences.displayMode?.itemsPerPage || 20)) + 1,
|
start: ((currentPage - 1) * effectivePageSize) + 1,
|
||||||
end: Math.min(currentPage * (preferences.displayMode?.itemsPerPage || 20), series.totalElements),
|
end: Math.min(currentPage * effectivePageSize, series.totalElements),
|
||||||
total: series.totalElements,
|
total: series.totalElements,
|
||||||
})}
|
})}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
<RefreshButton libraryId={libraryId} refreshLibrary={refreshLibrary} />
|
<RefreshButton libraryId={libraryId} refreshLibrary={handleRefresh} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<PaginatedSeriesGrid
|
<PaginatedSeriesGrid
|
||||||
|
|||||||
@@ -1,57 +1,13 @@
|
|||||||
import { LibraryService } from "@/lib/services/library.service";
|
|
||||||
import { PreferencesService } from "@/lib/services/preferences.service";
|
import { PreferencesService } from "@/lib/services/preferences.service";
|
||||||
import { revalidatePath } from "next/cache";
|
|
||||||
import { withPageTiming } from "@/lib/hoc/withPageTiming";
|
|
||||||
import type { LibraryResponse } from "@/types/library";
|
|
||||||
import type { KomgaSeries, KomgaLibrary } from "@/types/komga";
|
|
||||||
import type { UserPreferences } from "@/types/preferences";
|
|
||||||
import { ERROR_CODES } from "@/constants/errorCodes";
|
|
||||||
import { AppError } from "@/utils/errors";
|
|
||||||
import { ClientLibraryPage } from "./ClientLibraryPage";
|
import { ClientLibraryPage } from "./ClientLibraryPage";
|
||||||
|
import type { UserPreferences } from "@/types/preferences";
|
||||||
|
|
||||||
interface PageProps {
|
interface PageProps {
|
||||||
params: { libraryId: string };
|
params: { libraryId: string };
|
||||||
searchParams: { page?: string; unread?: string; search?: string; size?: string };
|
searchParams: { page?: string; unread?: string; search?: string; size?: string };
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_PAGE_SIZE = 20;
|
export default async function LibraryPage({ params, searchParams }: PageProps) {
|
||||||
|
|
||||||
async function refreshLibrary(libraryId: string) {
|
|
||||||
"use server";
|
|
||||||
|
|
||||||
try {
|
|
||||||
await LibraryService.invalidateLibrarySeriesCache(libraryId);
|
|
||||||
|
|
||||||
revalidatePath(`/libraries/${libraryId}`);
|
|
||||||
return { success: true };
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error during refresh:", error);
|
|
||||||
return { success: false, error: "Error refreshing library" };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getLibrarySeries(
|
|
||||||
libraryId: string,
|
|
||||||
page: number = 1,
|
|
||||||
unreadOnly: boolean = false,
|
|
||||||
search?: string,
|
|
||||||
size: number = DEFAULT_PAGE_SIZE
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const pageIndex = page - 1;
|
|
||||||
|
|
||||||
const [series, library] = await Promise.all([
|
|
||||||
LibraryService.getLibrarySeries(libraryId, pageIndex, size, unreadOnly, search),
|
|
||||||
LibraryService.getLibrary(libraryId)
|
|
||||||
]);
|
|
||||||
|
|
||||||
return { data: series, library };
|
|
||||||
} catch (error) {
|
|
||||||
throw error instanceof Error ? error : new AppError(ERROR_CODES.SERIES.FETCH_ERROR, {}, error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function LibraryPage({ params, searchParams }: PageProps) {
|
|
||||||
const libraryId = (await params).libraryId;
|
const libraryId = (await params).libraryId;
|
||||||
const unread = (await searchParams).unread;
|
const unread = (await searchParams).unread;
|
||||||
const search = (await searchParams).search;
|
const search = (await searchParams).search;
|
||||||
@@ -63,54 +19,15 @@ async function LibraryPage({ params, searchParams }: PageProps) {
|
|||||||
|
|
||||||
// Utiliser le paramètre d'URL s'il existe, sinon utiliser la préférence utilisateur
|
// Utiliser le paramètre d'URL s'il existe, sinon utiliser la préférence utilisateur
|
||||||
const unreadOnly = unread !== undefined ? unread === "true" : preferences.showOnlyUnread;
|
const unreadOnly = unread !== undefined ? unread === "true" : preferences.showOnlyUnread;
|
||||||
// Utiliser le paramètre de pageSize s'il existe, sinon utiliser la valeur par défaut
|
|
||||||
const pageSize = size
|
|
||||||
? parseInt(size)
|
|
||||||
: preferences.displayMode?.itemsPerPage || DEFAULT_PAGE_SIZE;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data: series, library }: { data: LibraryResponse<KomgaSeries>; library: KomgaLibrary } =
|
|
||||||
await getLibrarySeries(libraryId, currentPage, unreadOnly, search, pageSize);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ClientLibraryPage
|
<ClientLibraryPage
|
||||||
library={library}
|
|
||||||
series={series}
|
|
||||||
currentPage={currentPage}
|
currentPage={currentPage}
|
||||||
libraryId={libraryId}
|
libraryId={libraryId}
|
||||||
refreshLibrary={refreshLibrary}
|
|
||||||
preferences={preferences}
|
preferences={preferences}
|
||||||
unreadOnly={unreadOnly}
|
unreadOnly={unreadOnly}
|
||||||
|
search={search}
|
||||||
|
pageSize={size ? parseInt(size) : undefined}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} catch (error) {
|
|
||||||
if (error instanceof AppError) {
|
|
||||||
return (
|
|
||||||
<ClientLibraryPage
|
|
||||||
library={null}
|
|
||||||
series={null}
|
|
||||||
currentPage={currentPage}
|
|
||||||
libraryId={libraryId}
|
|
||||||
refreshLibrary={refreshLibrary}
|
|
||||||
preferences={preferences}
|
|
||||||
unreadOnly={unreadOnly}
|
|
||||||
errorCode={error.code}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<ClientLibraryPage
|
|
||||||
library={null}
|
|
||||||
series={null}
|
|
||||||
currentPage={currentPage}
|
|
||||||
libraryId={libraryId}
|
|
||||||
refreshLibrary={refreshLibrary}
|
|
||||||
preferences={preferences}
|
|
||||||
unreadOnly={unreadOnly}
|
|
||||||
errorCode={ERROR_CODES.SERIES.FETCH_ERROR}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default withPageTiming("LibraryPage", LibraryPage);
|
|
||||||
|
|||||||
@@ -1,50 +1,5 @@
|
|||||||
import { HomeContent } from "@/components/home/HomeContent";
|
import { ClientHomePage } from "@/components/home/ClientHomePage";
|
||||||
import { HomeService } from "@/lib/services/home.service";
|
|
||||||
import { redirect } from "next/navigation";
|
|
||||||
import { revalidatePath } from "next/cache";
|
|
||||||
import { withPageTiming } from "@/lib/hoc/withPageTiming";
|
|
||||||
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
|
||||||
import { ERROR_CODES } from "@/constants/errorCodes";
|
|
||||||
import type { HomeData } from "@/lib/services/home.service";
|
|
||||||
import { AppError } from "@/utils/errors";
|
|
||||||
|
|
||||||
async function refreshHome() {
|
export default function HomePage() {
|
||||||
"use server";
|
return <ClientHomePage />;
|
||||||
|
|
||||||
try {
|
|
||||||
await HomeService.invalidateHomeCache();
|
|
||||||
revalidatePath("/");
|
|
||||||
return { success: true };
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Erreur lors du rafraîchissement:", error);
|
|
||||||
return { success: false, error: "Erreur lors du rafraîchissement de la page d'accueil" };
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function HomePage() {
|
|
||||||
try {
|
|
||||||
const data: HomeData = await HomeService.getHomeData();
|
|
||||||
return <HomeContent data={data} refreshHome={refreshHome} />;
|
|
||||||
} catch (error) {
|
|
||||||
// Si l'erreur indique une configuration manquante, rediriger vers les préférences
|
|
||||||
|
|
||||||
if (error instanceof AppError) {
|
|
||||||
if (error.code === ERROR_CODES.KOMGA.MISSING_CONFIG) {
|
|
||||||
redirect("/settings");
|
|
||||||
}
|
|
||||||
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">
|
|
||||||
<ErrorMessage errorCode={ERROR_CODES.KOMGA.SERVER_UNREACHABLE} />
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default withPageTiming("HomePage", HomePage);
|
|
||||||
|
|||||||
148
src/app/series/[seriesId]/ClientSeriesPage.tsx
Normal file
148
src/app/series/[seriesId]/ClientSeriesPage.tsx
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { PaginatedBookGrid } from "@/components/series/PaginatedBookGrid";
|
||||||
|
import { SeriesHeader } from "@/components/series/SeriesHeader";
|
||||||
|
import { SeriesService } from "@/lib/services/series.service";
|
||||||
|
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
||||||
|
import { OptimizedSkeleton } from "@/components/skeletons/OptimizedSkeletons";
|
||||||
|
import type { LibraryResponse } from "@/types/library";
|
||||||
|
import type { KomgaBook, KomgaSeries } from "@/types/komga";
|
||||||
|
import type { UserPreferences } from "@/types/preferences";
|
||||||
|
import { ERROR_CODES } from "@/constants/errorCodes";
|
||||||
|
|
||||||
|
interface ClientSeriesPageProps {
|
||||||
|
seriesId: string;
|
||||||
|
currentPage: number;
|
||||||
|
preferences: UserPreferences;
|
||||||
|
unreadOnly: boolean;
|
||||||
|
pageSize?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const DEFAULT_PAGE_SIZE = 20;
|
||||||
|
|
||||||
|
export function ClientSeriesPage({
|
||||||
|
seriesId,
|
||||||
|
currentPage,
|
||||||
|
preferences,
|
||||||
|
unreadOnly,
|
||||||
|
pageSize,
|
||||||
|
}: ClientSeriesPageProps) {
|
||||||
|
const [series, setSeries] = useState<KomgaSeries | null>(null);
|
||||||
|
const [books, setBooks] = useState<LibraryResponse<KomgaBook> | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const effectivePageSize = pageSize || preferences.displayMode?.itemsPerPage || DEFAULT_PAGE_SIZE;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchData = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const params = new URLSearchParams({
|
||||||
|
page: String(currentPage - 1),
|
||||||
|
size: String(effectivePageSize),
|
||||||
|
unread: String(unreadOnly),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await fetch(`/api/komga/series/${seriesId}/books?${params}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const errorData = await response.json();
|
||||||
|
throw new Error(errorData.error?.code || ERROR_CODES.BOOK.PAGES_FETCH_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
setSeries(data.series);
|
||||||
|
setBooks(data.books);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Error fetching series books:", err);
|
||||||
|
setError(err instanceof Error ? err.message : ERROR_CODES.BOOK.PAGES_FETCH_ERROR);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchData();
|
||||||
|
}, [seriesId, currentPage, unreadOnly, effectivePageSize]);
|
||||||
|
|
||||||
|
const handleRefresh = async (seriesId: string) => {
|
||||||
|
try {
|
||||||
|
await SeriesService.invalidateSeriesBooksCache(seriesId);
|
||||||
|
await SeriesService.invalidateSeriesCache(seriesId);
|
||||||
|
|
||||||
|
// Recharger les données
|
||||||
|
const params = new URLSearchParams({
|
||||||
|
page: String(currentPage - 1),
|
||||||
|
size: String(effectivePageSize),
|
||||||
|
unread: String(unreadOnly),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await fetch(`/api/komga/series/${seriesId}/books?${params}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Erreur lors du rafraîchissement de la série");
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
setSeries(data.series);
|
||||||
|
setBooks(data.books);
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Erreur lors du rafraîchissement:", error);
|
||||||
|
return { success: false, error: "Erreur lors du rafraîchissement de la série" };
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return (
|
||||||
|
<div className="container py-8 space-y-8">
|
||||||
|
<div className="space-y-4">
|
||||||
|
<OptimizedSkeleton className="h-64 w-full rounded" />
|
||||||
|
<OptimizedSkeleton className="h-10 w-64" />
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
|
||||||
|
{Array.from({ length: effectivePageSize }).map((_, i) => (
|
||||||
|
<OptimizedSkeleton key={i} className="aspect-[3/4] w-full rounded" />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<div className="container py-8 space-y-8">
|
||||||
|
<h1 className="text-3xl font-bold">Série</h1>
|
||||||
|
<ErrorMessage errorCode={error} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!series || !books) {
|
||||||
|
return (
|
||||||
|
<div className="container py-8 space-y-8">
|
||||||
|
<h1 className="text-3xl font-bold">Série</h1>
|
||||||
|
<ErrorMessage errorCode={ERROR_CODES.SERIES.FETCH_ERROR} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="container">
|
||||||
|
<SeriesHeader series={series} refreshSeries={handleRefresh} />
|
||||||
|
<PaginatedBookGrid
|
||||||
|
books={books.content || []}
|
||||||
|
currentPage={currentPage}
|
||||||
|
totalPages={books.totalPages}
|
||||||
|
totalElements={books.totalElements}
|
||||||
|
defaultShowOnlyUnread={preferences.showOnlyUnread}
|
||||||
|
showOnlyUnread={unreadOnly}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,58 +1,13 @@
|
|||||||
import { PaginatedBookGrid } from "@/components/series/PaginatedBookGrid";
|
|
||||||
import { SeriesHeader } from "@/components/series/SeriesHeader";
|
|
||||||
import { SeriesService } from "@/lib/services/series.service";
|
|
||||||
import { PreferencesService } from "@/lib/services/preferences.service";
|
import { PreferencesService } from "@/lib/services/preferences.service";
|
||||||
import { revalidatePath } from "next/cache";
|
import { ClientSeriesPage } from "./ClientSeriesPage";
|
||||||
import { withPageTiming } from "@/lib/hoc/withPageTiming";
|
|
||||||
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
|
||||||
import type { LibraryResponse } from "@/types/library";
|
|
||||||
import type { KomgaBook, KomgaSeries } from "@/types/komga";
|
|
||||||
import type { UserPreferences } from "@/types/preferences";
|
import type { UserPreferences } from "@/types/preferences";
|
||||||
import { ERROR_CODES } from "@/constants/errorCodes";
|
|
||||||
import { AppError } from "@/utils/errors";
|
|
||||||
|
|
||||||
interface PageProps {
|
interface PageProps {
|
||||||
params: { seriesId: string };
|
params: { seriesId: string };
|
||||||
searchParams: { page?: string; unread?: string; size?: string };
|
searchParams: { page?: string; unread?: string; size?: string };
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_PAGE_SIZE = 20;
|
export default async function SeriesPage({ params, searchParams }: PageProps) {
|
||||||
|
|
||||||
async function getSeriesBooks(
|
|
||||||
seriesId: string,
|
|
||||||
page: number = 1,
|
|
||||||
unreadOnly: boolean = false,
|
|
||||||
size: number = DEFAULT_PAGE_SIZE
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const pageIndex = page - 1;
|
|
||||||
|
|
||||||
const [books, series] = await Promise.all([
|
|
||||||
SeriesService.getSeriesBooks(seriesId, pageIndex, size, unreadOnly),
|
|
||||||
SeriesService.getSeries(seriesId)
|
|
||||||
]);
|
|
||||||
|
|
||||||
return { data: books, series };
|
|
||||||
} catch (error) {
|
|
||||||
throw error instanceof AppError ? error : new AppError(ERROR_CODES.BOOK.PAGES_FETCH_ERROR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function refreshSeries(seriesId: string) {
|
|
||||||
"use server";
|
|
||||||
|
|
||||||
try {
|
|
||||||
await SeriesService.invalidateSeriesBooksCache(seriesId);
|
|
||||||
await SeriesService.invalidateSeriesCache(seriesId);
|
|
||||||
revalidatePath(`/series/${seriesId}`);
|
|
||||||
return { success: true };
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Erreur lors du rafraîchissement:", error);
|
|
||||||
return { success: false, error: "Erreur lors du rafraîchissement de la série" };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function SeriesPage({ params, searchParams }: PageProps) {
|
|
||||||
const seriesId = (await params).seriesId;
|
const seriesId = (await params).seriesId;
|
||||||
const page = (await searchParams).page;
|
const page = (await searchParams).page;
|
||||||
const unread = (await searchParams).unread;
|
const unread = (await searchParams).unread;
|
||||||
@@ -63,43 +18,14 @@ async function SeriesPage({ params, searchParams }: PageProps) {
|
|||||||
|
|
||||||
// Utiliser le paramètre d'URL s'il existe, sinon utiliser la préférence utilisateur
|
// Utiliser le paramètre d'URL s'il existe, sinon utiliser la préférence utilisateur
|
||||||
const unreadOnly = unread !== undefined ? unread === "true" : preferences.showOnlyUnread;
|
const unreadOnly = unread !== undefined ? unread === "true" : preferences.showOnlyUnread;
|
||||||
// Utiliser le paramètre de pageSize s'il existe, sinon utiliser la préférence utilisateur
|
|
||||||
const pageSize = size
|
|
||||||
? parseInt(size)
|
|
||||||
: preferences.displayMode?.itemsPerPage || DEFAULT_PAGE_SIZE;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data: books, series }: { data: LibraryResponse<KomgaBook>; series: KomgaSeries } =
|
|
||||||
await getSeriesBooks(seriesId, currentPage, unreadOnly, pageSize);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container">
|
<ClientSeriesPage
|
||||||
<SeriesHeader series={series} refreshSeries={refreshSeries} />
|
seriesId={seriesId}
|
||||||
<PaginatedBookGrid
|
|
||||||
books={books.content || []}
|
|
||||||
currentPage={currentPage}
|
currentPage={currentPage}
|
||||||
totalPages={books.totalPages}
|
preferences={preferences}
|
||||||
totalElements={books.totalElements}
|
unreadOnly={unreadOnly}
|
||||||
defaultShowOnlyUnread={preferences.showOnlyUnread}
|
pageSize={size ? parseInt(size) : undefined}
|
||||||
showOnlyUnread={unreadOnly}
|
|
||||||
/>
|
/>
|
||||||
</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>
|
|
||||||
<ErrorMessage errorCode={ERROR_CODES.SERIES.FETCH_ERROR} />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default withPageTiming("SeriesPage", SeriesPage);
|
|
||||||
|
|||||||
94
src/components/home/ClientHomePage.tsx
Normal file
94
src/components/home/ClientHomePage.tsx
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { HomeContent } from "./HomeContent";
|
||||||
|
import { HomeService } from "@/lib/services/home.service";
|
||||||
|
import { ErrorMessage } from "@/components/ui/ErrorMessage";
|
||||||
|
import { HomePageSkeleton } from "@/components/skeletons/OptimizedSkeletons";
|
||||||
|
import { ERROR_CODES } from "@/constants/errorCodes";
|
||||||
|
import type { HomeData } from "@/lib/services/home.service";
|
||||||
|
|
||||||
|
export function ClientHomePage() {
|
||||||
|
const router = useRouter();
|
||||||
|
const [data, setData] = useState<HomeData | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchData = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch("/api/komga/home");
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const errorData = await response.json();
|
||||||
|
const errorCode = errorData.error?.code || ERROR_CODES.KOMGA.SERVER_UNREACHABLE;
|
||||||
|
|
||||||
|
// Si la config Komga est manquante, rediriger vers les settings
|
||||||
|
if (errorCode === ERROR_CODES.KOMGA.MISSING_CONFIG) {
|
||||||
|
router.push("/settings");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(errorCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
const homeData = await response.json();
|
||||||
|
setData(homeData);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Error fetching home data:", err);
|
||||||
|
setError(err instanceof Error ? err.message : ERROR_CODES.KOMGA.SERVER_UNREACHABLE);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchData();
|
||||||
|
}, [router]);
|
||||||
|
|
||||||
|
const handleRefresh = async () => {
|
||||||
|
try {
|
||||||
|
await HomeService.invalidateHomeCache();
|
||||||
|
|
||||||
|
const response = await fetch("/api/komga/home");
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Erreur lors du rafraîchissement de la page d'accueil");
|
||||||
|
}
|
||||||
|
|
||||||
|
const homeData = await response.json();
|
||||||
|
setData(homeData);
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Erreur lors du rafraîchissement:", error);
|
||||||
|
return { success: false, error: "Erreur lors du rafraîchissement de la page d'accueil" };
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return <HomePageSkeleton />;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<main className="container mx-auto px-4 py-8">
|
||||||
|
<ErrorMessage errorCode={error} />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!data) {
|
||||||
|
return (
|
||||||
|
<main className="container mx-auto px-4 py-8">
|
||||||
|
<ErrorMessage errorCode={ERROR_CODES.KOMGA.SERVER_UNREACHABLE} />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return <HomeContent data={data} refreshHome={handleRefresh} />;
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user