l-min-components 1.0.680 → 1.0.683

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -47,6 +47,7 @@ const AppMainLayout = () => {
   const [affiliatesActive, setAffiliatesActive] = useState(false);
   const [accessToken, setAccessToken] = useState("");
   const [envType, setEnvType] = useState("");
+  const [newNotifications, setNewNotifications] = useState([]);
   const { setDefaultAccount, handleSetDefaultAccount } = useHeader();
 
   useEffect(() => {
@@ -148,13 +149,15 @@ const AppMainLayout = () => {
         affiliatesActive,
         accessToken,
         envType,
+        newNotifications,
+        setNewNotifications,
       }}
     >
       <Layout
         coming={coming}
         hasLayoutBackgroundImage={hasLayoutBackgroundImage}
       >
-        <HeaderComponent />
+        <HeaderComponent setNewNotifications={setNewNotifications} />
         <MainLayout coming={coming}>
           <LeftLayout>
             <SideBar routes={leftNavMenu} />

package/src/components/header/getHeaderDetails.js

@@ -131,6 +131,29 @@ const handleGetNotificationMarkRead = async () => {
   }
 };
 
+  //Notification List
+  const [{ ...notificationData }, getNotification] = useAxios(
+    {
+      method: "GET",
+    },
+    {
+      manual: true,
+    }
+  );
+
+  const handleGetNotification = async (read) => {
+    try {
+      await getNotification({
+        url: `/notify/v1/notifications/`,
+        params: {
+          read: read,
+        },
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
   return {
     handleGetUserDetails,
     userDetails,
@@ -145,7 +168,9 @@ const handleGetNotificationMarkRead = async () => {
     generalNotificationCountData,
     handleGeneralNotificationCount,
     notificationMarkReadData,
-    handleGetNotificationMarkRead
+    handleGetNotificationMarkRead,
+    notificationData,
+    handleGetNotification
   };
 };
 export default useHeader;

package/src/components/header/index.jsx

@@ -58,6 +58,8 @@ const HeaderComponent = (props) => {
     generalNotificationCountData,
     handleGeneralNotificationCount,
     notificationMarkReadData,
+    notificationData,
+    handleGetNotification
   } = useHeader();
   const { pathname } = useLocation();
   const { setGeneralData, generalData } = useContext(OutletContext);
@@ -273,14 +275,15 @@ const HeaderComponent = (props) => {
   const socket = useRef();
   const generalSocket = useRef();
   const token = getCookie("access");
-  const account_id = generalData?.defaultAccount?.id || "";
+  const defaultAcctId = getCookie("defaultAccountID");
+  const account_id = generalData?.defaultAccount?.id || defaultAcctId;
 
   // websocket for all notification account
-  const websocket = new WebSocket(
-    `wss://${socketUrl}?account=${account_id}&authorization=${token}`
-  );
-
   useEffect(() => {
+    const websocket = new WebSocket(
+      `wss://${socketUrl}?account=${account_id}&authorization=${token}`
+    );
+
     websocket.onopen = () => {
       //check if socket is connected
       console.log("websocket connection established");
@@ -296,9 +299,12 @@ const HeaderComponent = (props) => {
         const data = JSON.parse(event?.data); //check for incoming message from socket
         if (data.event === "new.notification.result") {
           if (data.data) {
+            props.setNewNotifications((prev) => [...prev, data.data]);
+
             console.log(data);
             handleGetUnreadNotification();
             handleGeneralNotificationCount();
+            handleGetNotification();
           }
         }
       }
@@ -309,14 +315,15 @@ const HeaderComponent = (props) => {
       websocket.removeEventListener("message", handler);
       console.log("websocket closed");
     };
-  }, [websocket]);
-
-  const websocket2 = new WebSocket(
-    `wss://${socketUrl}?account=${account_id}&authorization=${token}&room_id=${account_id}`
-  );
+  }, []);
 
   // websocket for room
   useEffect(() => {
+
+    const websocket2 = new WebSocket(
+      `wss://${socketUrl}?account=${account_id}&authorization=${token}&room_id=${account_id}`
+    );
+
     websocket2.onopen = () => {
       //check if socket is connected
       console.log("room websocket connection established");
@@ -341,6 +348,7 @@ const HeaderComponent = (props) => {
           if (data.status) {
             handleGetUnreadNotification();
             handleGeneralNotificationCount();
+            handleGetNotification();
           }
         }
       }
@@ -351,7 +359,7 @@ const HeaderComponent = (props) => {
       websocket2.removeEventListener("message", handler);
       console.log("room websocket closed");
     };
-  }, [websocket2]);
+  }, []);
 
   useEffect(() => {
     handleGetUnreadNotification();

package/src/components/sideBar/sideMenu/index.jsx

@@ -250,7 +250,7 @@ const SideMenu = ({
         onClick={() => {
           if (
             window.location.hostname.includes("staging") &&
-            window.location.hostname.includes("developer")
+            window.location.pathname.includes("developer")
           ) {
             newTab
               ? window.open(path, "_blank")