From ec120e7d2619d9d28751b49bbc9bd1999a22bdf9 Mon Sep 17 00:00:00 2001
From: monoid <qaswedfr55@gmail.com>
Date: Sat, 13 Apr 2024 12:55:46 +0900
Subject: [PATCH] fix: fetcher arguments

---
 packages/client/src/hook/fetcher.ts         | 13 +++-
 packages/client/src/hook/useDifference.ts   |  8 +--
 packages/client/src/page/differencePage.tsx |  5 +-
 packages/client/src/page/galleryPage.tsx    | 76 ++++++++++-----------
 4 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/packages/client/src/hook/fetcher.ts b/packages/client/src/hook/fetcher.ts
index 5d02720..d35738f 100644
--- a/packages/client/src/hook/fetcher.ts
+++ b/packages/client/src/hook/fetcher.ts
@@ -4,8 +4,17 @@ export function makeApiUrl(pathnameAndQueryparam: string) {
     return new URL(pathnameAndQueryparam, BASE_API_URL).toString();
 }
 
-export async function fetcher(url: string) {
+export class ApiError extends Error {
+    constructor(public readonly status: number, message: string) {
+        super(message);
+    }
+}
+
+export async function fetcher(url: string, init?: RequestInit) {
     const u = makeApiUrl(url);
-    const res = await fetch(u);
+    const res = await fetch(u, init);
+    if (!res.ok) {
+        throw new ApiError(res.status, await res.text());
+    }
     return res.json();
 }
diff --git a/packages/client/src/hook/useDifference.ts b/packages/client/src/hook/useDifference.ts
index 37976a5..627f628 100644
--- a/packages/client/src/hook/useDifference.ts
+++ b/packages/client/src/hook/useDifference.ts
@@ -14,7 +14,7 @@ export function useDifferenceDoc() {
 }
 
 export async function commit(path: string, type: string) {
-    const res = await fetch("/api/diff/commit", {
+    const data = await fetcher("/api/diff/commit", {
         method: "POST",
         body: JSON.stringify([{ path, type }]),
         headers: {
@@ -22,11 +22,11 @@ export async function commit(path: string, type: string) {
         },
     });
     mutate("/api/diff/list");
-    return res.ok;
+    return data;
 }
 
 export async function commitAll(type: string) {
-    const res = await fetch("/api/diff/commitall", {
+    const data = await fetcher("/api/diff/commitall", {
         method: "POST",
         body: JSON.stringify({ type }),
         headers: {
@@ -34,5 +34,5 @@ export async function commitAll(type: string) {
         },
     });
     mutate("/api/diff/list");
-    return res.ok;
+    return data;
 }
\ No newline at end of file
diff --git a/packages/client/src/page/differencePage.tsx b/packages/client/src/page/differencePage.tsx
index efe7ffc..0d49d9b 100644
--- a/packages/client/src/page/differencePage.tsx
+++ b/packages/client/src/page/differencePage.tsx
@@ -26,7 +26,7 @@ export function DifferencePage() {
             <Card>
                 <CardHeader className="relative">
                     <Button className="absolute right-2 top-8" variant="ghost"
-                        onClick={() => commitAll("comic")}
+                        onClick={() => {commitAll("comic")}}
                     >Commit All</Button>
                     <CardTitle className="text-2xl">Difference</CardTitle>
                     <CardDescription>Scanned Files List</CardDescription>
@@ -45,8 +45,7 @@ export function DifferencePage() {
                                         <Button
                                             className="flex-none ml-2"
                                             variant="outline"
-                                            onClick={() => commit(y.path, y.type)}
-                                        >
+                                            onClick={() => {commit(y.path, y.type)}}>
                                             Commit
                                         </Button>
                                     </div>
diff --git a/packages/client/src/page/galleryPage.tsx b/packages/client/src/page/galleryPage.tsx
index 326dd00..3d89e40 100644
--- a/packages/client/src/page/galleryPage.tsx
+++ b/packages/client/src/page/galleryPage.tsx
@@ -46,7 +46,7 @@ export default function Gallery() {
             }
         }
     }, [virtualItems, setSize, size, data]);
-    
+
     if (isLoading) {
         return <div className="p-4">Loading...</div>
     }
@@ -66,47 +66,45 @@ export default function Gallery() {
         {(word || tags) &&
             <div className="bg-primary rounded-full p-1 sticky top-0 shadow-md z-20">
                 {word && <span className="text-primary-foreground ml-4">Search: {word}</span>}
-                {tags && <span className="text-primary-foreground ml-4">Tags: <ul className="inline-flex">{tags.split(",").map(x => <TagBadge tagname={x} key={x} />)}</ul></span>}
+                {tags && <span className="text-primary-foreground ml-4">Tags: <ul className="inline-flex">{
+                    tags.split(",").map(x => <TagBadge tagname={x} key={x} />)}
+                </ul></span>}
             </div>
         }
-        {
-            data?.length === 0 && <div className="p-4 text-3xl">No results</div>
-        }
+        {data?.length === 0 && <div className="p-4 text-3xl">No results</div>}
         <div className="w-full relative"
-            style={{ height: virtualizer.getTotalSize() }}
-        >
-        {
-            // TODO: date based grouping
-            virtualItems.map((item) => {
-                const isLoaderRow = item.index === size - 1 && isLoadingMore;
-                if (isLoaderRow) {
-                    return <div key={item.index} className="w-full flex justify-center top-0 left-0 absolute" 
-                    style={{
-                        height: `${item.size}px`,
-                        transform: `translateY(${item.start}px)`
-                    }}>
-                        <Spinner />
-                    </div>;
-                }
-                const docs = data[item.index];
-                if (!docs) return null;
-                return <div className="w-full grid gap-2 content-start top-0 left-0 absolute mb-2" key={item.index}
-                style={{
-                    height: `${item.size}px`,
-                    transform: `translateY(${item.start}px)`
-                }}>
-                    {docs.startCursor && <div> 
-                        <h3 className="text-3xl">Start with {docs.startCursor}</h3>
-                        <Separator/>
-                    </div>}
-                    {docs?.data?.map((x) => {
-                        return (
-                            <GalleryCard doc={x} key={x.id} />
-                        );
-                    })}
-                </div>
-            })
-        }
+            style={{ height: virtualizer.getTotalSize() }}>
+            {// TODO: date based grouping
+                virtualItems.map((item) => {
+                    const isLoaderRow = item.index === size - 1 && isLoadingMore;
+                    if (isLoaderRow) {
+                        return <div key={item.index} className="w-full flex justify-center top-0 left-0 absolute"
+                            style={{
+                                height: `${item.size}px`,
+                                transform: `translateY(${item.start}px)`
+                            }}>
+                            <Spinner />
+                        </div>;
+                    }
+                    const docs = data[item.index];
+                    if (!docs) return null;
+                    return <div className="w-full grid gap-2 content-start top-0 left-0 absolute mb-2" key={item.index}
+                        style={{
+                            height: `${item.size}px`,
+                            transform: `translateY(${item.start}px)`
+                        }}>
+                        {docs.startCursor && <div>
+                            <h3 className="text-3xl">Start with {docs.startCursor}</h3>
+                            <Separator />
+                        </div>}
+                        {docs?.data?.map((x) => {
+                            return (
+                                <GalleryCard doc={x} key={x.id} />
+                            );
+                        })}
+                    </div>
+                })
+            }
         </div>
     </div>
     );