From 900847eab3a116ad122ea411e88114584b90b641 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Sun, 29 Aug 2021 20:47:57 +0430
Subject: [PATCH] fix some bugs with category

---
 src/screens/manga/Library.tsx       | 40 ++++++++++++++++++-----------
 src/screens/settings/Categories.tsx |  4 +--
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/screens/manga/Library.tsx b/src/screens/manga/Library.tsx
index 330051a2..41b5d94a 100644
--- a/src/screens/manga/Library.tsx
+++ b/src/screens/manga/Library.tsx
@@ -44,7 +44,7 @@ export default function Library() {
     const { setTitle, setAction } = useContext(NavbarContext);
     useEffect(() => { setTitle('Library'); setAction(<></>); }, []);
 
-    const [tabs, setTabs] = useState<IMangaCategory[]>([]);
+    const [tabs, setTabs] = useState<IMangaCategory[]>();
     const [tabNum, setTabNum] = useState<number>(0);
 
     // a hack so MangaGrid doesn't stop working. I won't change it in case
@@ -66,26 +66,35 @@ export default function Library() {
                 }));
 
                 setTabs(categoryTabs);
+                if (categoryTabs.length > 0) {
+                    setTabNum(categoryTabs[0].category.order);
+                }
             });
     }, []);
 
     // fetch the current tab
     useEffect(() => {
-        tabs.forEach((tab, index) => {
-            if (index === tabNum && !tab.isFetched) {
-                // eslint-disable-next-line @typescript-eslint/no-shadow
-                client.get(`/api/v1/category/${tab.category.id}`)
-                    .then((response) => response.data)
-                    .then((data: IManga[]) => {
-                        const tabsClone = cloneObject(tabs);
-                        tabsClone[index].mangas = data;
-                        tabsClone[index].isFetched = true;
+        if (tabs !== undefined) {
+            tabs.forEach((tab, index) => {
+                if (tab.category.order === tabNum && !tab.isFetched) {
+                    // eslint-disable-next-line @typescript-eslint/no-shadow
+                    client.get(`/api/v1/category/${tab.category.id}`)
+                        .then((response) => response.data)
+                        .then((data: IManga[]) => {
+                            const tabsClone = cloneObject(tabs);
+                            tabsClone[index].mangas = data;
+                            tabsClone[index].isFetched = true;
 
-                        setTabs(tabsClone); // clone the object
-                    });
-            }
-        });
-    }, [tabs.length, tabNum]);
+                            setTabs(tabsClone);
+                        });
+                }
+            });
+        }
+    }, [tabs?.length, tabNum]);
+
+    if (tabs === undefined) {
+        return <h3>Loading...</h3>;
+    }
 
     if (tabs.length === 0) {
         return <h3>Library is empty</h3>;
@@ -113,6 +122,7 @@ export default function Library() {
         toRender = (
             <>
                 <Tabs
+                    key={tabNum}
                     value={tabNum}
                     onChange={(e, newTab) => handleTabChange(newTab)}
                     indicatorColor="primary"
diff --git a/src/screens/settings/Categories.tsx b/src/screens/settings/Categories.tsx
index 1f026f9d..57f3df7e 100644
--- a/src/screens/settings/Categories.tsx
+++ b/src/screens/settings/Categories.tsx
@@ -71,12 +71,10 @@ export default function Categories() {
     }, [updateTriggerHolder]);
 
     const categoryReorder = (list: ICategory[], from: number, to: number) => {
-        const category = list[from];
-
         const formData = new FormData();
         formData.append('from', `${from + 1}`);
         formData.append('to', `${to + 1}`);
-        client.post(`/api/v1/category/${category.id}/reorder`, formData)
+        client.patch('/api/v1/category/reorder', formData)
             .finally(() => triggerUpdate());
 
         // also move it in local state to avoid jarring moving behviour...