From 88e1734232ac2b62e7700361dc739feb765408b5 Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Sun, 3 Sep 2023 22:37:57 +0200
Subject: [PATCH] handle no category groups available

---
 src/Components/Header/index.js   |  9 +++------
 src/Components/MyAvatar/index.js |  4 +---
 src/Components/SideMenu/index.js | 18 ++++++++++--------
 src/Contexts/WebSocketContext.js |  6 +++++-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/Components/Header/index.js b/src/Components/Header/index.js
index ad71328..9592830 100644
--- a/src/Components/Header/index.js
+++ b/src/Components/Header/index.js
@@ -33,11 +33,9 @@ export default function HeaderMenu({
     useState(false);
 
   const fetchNotifications = (page = 1) => {
-    myFetch(`/notifications?page=${page}`, "GET").then((data) => {
-      console.log("data", data);
-
-      headerContext.setNotificationResponse(data);
-    });
+    myFetch(`/notifications?page=${page}`, "GET").then((data) =>
+      headerContext.setNotificationResponse(data)
+    );
   };
 
   const onPaginationChange = (page) => {
@@ -57,7 +55,6 @@ export default function HeaderMenu({
   useEffect(() => {
     if (!isNotificationDrawerOpen) return;
 
-    console.log("paginationPage", headerContext.paginationPage);
     fetchNotifications(headerContext.paginationPage);
   }, [headerContext.paginationPage]);
 
diff --git a/src/Components/MyAvatar/index.js b/src/Components/MyAvatar/index.js
index 77b63b0..485d1e2 100644
--- a/src/Components/MyAvatar/index.js
+++ b/src/Components/MyAvatar/index.js
@@ -60,9 +60,7 @@ export function MyAvatar({
 }
 
 export function MyUserAvatar({ avatar, size = "default" }) {
-  if (avatar === "") {
-    return <Avatar icon={<UserOutlined />} />;
-  }
+  if (avatar === "") return <Avatar icon={<UserOutlined />} size={size} />;
 
   return (
     <Avatar
diff --git a/src/Components/SideMenu/index.js b/src/Components/SideMenu/index.js
index 63e9955..9445388 100644
--- a/src/Components/SideMenu/index.js
+++ b/src/Components/SideMenu/index.js
@@ -91,13 +91,21 @@ export default function SideMenu({
       children: [],
     };
 
+    sideBarContext.availableCategoryGroups.forEach((categoryGroup) => {
+      groupTasks.children.push({
+        label: categoryGroup,
+        icon: <SnippetsOutlined />,
+        key: `/group-tasks/${categoryGroup}`,
+      });
+    });
+    /*
     for (let i = 0; i < sideBarContext.availableCategoryGroups.length; i++) {
       groupTasks.children.push({
         label: sideBarContext.availableCategoryGroups[i],
         icon: <SnippetsOutlined />,
         key: `/group-tasks/${sideBarContext.availableCategoryGroups[i]}`,
       });
-    }
+    } */
 
     groupTasksGroup.children.push(groupTasks);
 
@@ -213,6 +221,7 @@ export default function SideMenu({
       {
         label: t("sideMenu.logout"),
         icon: <LogoutOutlined />,
+        key: "/logout",
         onClick: () => {
           setUserSession();
           window.location.href = "/";
@@ -225,7 +234,6 @@ export default function SideMenu({
             },
           }).catch(console.error);
         },
-        key: "/",
       }
     );
 
@@ -233,12 +241,6 @@ export default function SideMenu({
   };
 
   useEffect(() => {
-    console.log("useeffect side menu");
-  }, []);
-
-  useEffect(() => {
-    console.log("useeffect side menu 2");
-
     const pathname = location.pathname;
 
     setSelectedKeys(pathname);
diff --git a/src/Contexts/WebSocketContext.js b/src/Contexts/WebSocketContext.js
index 311c22d..49d798e 100644
--- a/src/Contexts/WebSocketContext.js
+++ b/src/Contexts/WebSocketContext.js
@@ -50,7 +50,11 @@ export default function WebSocketProvider({
         headerContext.setTotalNotifications(data.TotalNotifications);
         sideBarContext.setUsername(data.Username);
         sideBarContext.setAvatar(data.Avatar);
-        sideBarContext.setAvailableCategoryGroups(data.AvailableCategoryGroups);
+        sideBarContext.setAvailableCategoryGroups(
+          data.AvailableCategoryGroups === null
+            ? []
+            : data.AvailableCategoryGroups
+        );
       });
 
       if (wsMessageCache.current.length > 0) {