l-min-components 1.0.660 → 1.0.666

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.660",
+  "version": "1.0.666",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/header/getHeaderDetails.js

@@ -111,6 +111,26 @@ const handleGeneralNotificationCount= async () => {
   }
 };
 
+//  Mark All Notification as Read Notification
+const [{ ...notificationMarkReadData }, getNotificationMarkRead] = useAxios(
+  {
+    method: "PUT",
+  },
+  {
+    manual: true,
+  }
+);
+
+const handleGetNotificationMarkRead = async () => {
+  try {
+    await getNotificationMarkRead({
+      url: `/notify/v1/notifications/mark_all_as_read/`,
+    });
+  } catch (err) {
+    console.log(err);
+  }
+};
+
   return {
     handleGetUserDetails,
     userDetails,
@@ -123,7 +143,9 @@ const handleGeneralNotificationCount= async () => {
     unreadNotificationData,
     handleGetUnreadNotification,
     generalNotificationCountData,
-    handleGeneralNotificationCount
+    handleGeneralNotificationCount,
+    notificationMarkReadData,
+    handleGetNotificationMarkRead
   };
 };
 export default useHeader;

package/src/components/header/index.jsx

@@ -54,6 +54,7 @@ const HeaderComponent = (props) => {
     handleGetUnreadNotification,
     generalNotificationCountData,
     handleGeneralNotificationCount,
+    notificationMarkReadData
   } = useHeader();
   const { pathname } = useLocation();
   const { setGeneralData, generalData } = useContext(OutletContext);
@@ -267,61 +268,51 @@ const HeaderComponent = (props) => {
   const generalSocket = useRef()
   const token = getCookie("access");
   const account_id = generalData?.defaultAccount?.id || "";
- 
-  useEffect(() => {
-    if(!socket?.current){
-      socket.current = new WebSocket(
-        `wss://${socketUrl}?account=${account_id}&authorization=${token}`
-      )
-
-      socket.current.onopen = () => {
-        console.log("websocket connection established");
-      };
-      socket.current.onmessage = (event) => {
-        const response = JSON?.parse(event?.data);
-        console.log(response)
-        if(response?.data){
-          handleGetUnreadNotification();
-        }
-        
-      };
 
-    }
+  // websocket for all notification account
+  const websocket = new WebSocket(
+    `wss://${socketUrl}?account=${account_id}&authorization=${token}`
+  );
 
-    return () => {
-      console.log("websocket closed");
+  useEffect(() => {
+    websocket.onopen = () => {
+      //check if socket is connected
+      console.log("websocket connection established");
     };
-   
-  }, [socket]);
 
+    websocket.onmessage = (event) => {
+      const data = JSON.parse(event.data);
+      console.log("websocket data", data);
+    };
 
-  // websocket for all notification account
-  useEffect(() => {
-    if(!generalSocket?.current){
-      generalSocket.current = new WebSocket(
-        `wss://${socketUrl}?authorization=${token}`
-      )
-
-      generalSocket.current.onopen = () => {
-        console.log("General websocket connection established");
-      };
-      generalSocket.current.onmessage = (event) => {
-        const response = JSON?.parse(event?.data);
-        console.log(response)
-        if(response?.data){
-          handleGeneralNotificationCount();
+    const handler = (event) => {
+      if (event?.data) {
+        const data = JSON.parse(event?.data); //check for incoming message from socket
+        if (data.event === "new.notification.result") {
+          if (data.data) {
+            console.log(data)
+            handleGetUnreadNotification();
+            handleGeneralNotificationCount();
+          }
         }
-        
-      };
 
-    }
+      }
+    };
+    websocket.addEventListener("message", handler, { passive: true });
 
     return () => {
-      console.log("General websocket closed");
+      websocket.removeEventListener("message", handler);
+      console.log("websocket closed");
     };
-   
-  }, [generalSocket]);
+  }, [websocket]);
+
 
+  useEffect(() => {
+    if(notificationMarkReadData?.response){
+      handleGetUnreadNotification();
+      handleGeneralNotificationCount();
+    }
+  }, [notificationMarkReadData?.response])
 
   return (
     <Navbar>