l-min-components 1.6.1226 → 1.6.1228

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -242,7 +242,7 @@ const AppMainLayout = ({ children }) => {
     setIsTranslationsLoading,
   } = useTranslation(wordBank);
 
-  const messageKit = useMessageKit(affiliatesActive, selectedAccount); // useMessageKit
+  const messageKit = useMessageKit(/*affiliatesActive*/); // useMessageKit
 
   return (
     <OutletContext.Provider

package/src/hooks/messaging-kit/index.jsx

@@ -211,7 +211,7 @@ import sound from "./new-notification-7-210334.mp3";
  * @property {WebSocketMessageData} data - The payload containing the message details.
  */
 
-const useMessageKit = (affiliatesActive, selectedAccount) => {
+const useMessageKit = (/*affiliatesActive*/) => {
   const cookieGrabber = (key = "") => {
     const cookies = document.cookie;
     const string = cookies.split(";").find((cookie) => {
@@ -222,8 +222,14 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
     if (!string) return "";
     return string.split("=")[1].trim();
   };
+  const selectedAccount = useMemo(
+    () => ({
+      id: cookieGrabber("defaultAccountID"),
+      type: cookieGrabber("defaultAccountType"),
+    }),
+    []
+  );
   const buildSocketUrl = useCallback(() => {
-    if (!selectedAccount) return;
     const baseUrl =
       window.location.hostname.includes("staging") ||
       window.location.hostname.includes("localhost")
@@ -234,7 +240,7 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
       baseUrl.replace("http", "ws") +
       `/notify/v1/ws/connect/?authorization=${token}&_account=${selectedAccount.id}`
     );
-  }, [selectedAccount?.id]);
+  }, []);
 
   const affiliateAccount = cookieGrabber("affiliateAccount");
   // console.log(affiliateAccount, affiliatesActive, "affiliate");
@@ -297,13 +303,21 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
   }, []); // Empty dependency array ensures it's created only once
 
   // get room grouped by course list
-  const getMessageRoomsByCourses = async (nextPage, once = false) => {
+  const getMessageRoomsByCourses = async (
+    nextPage,
+    once = false,
+    limit = 1000
+  ) => {
     if (!selectedAccount) return;
     // selected account exists
     let response;
     if (String(selectedAccount.type).toLowerCase() === "enterprise") {
       response = await request({
         url: nextPage || "/notify/v1/enterprise/rooms/",
+        params: {
+          limit,
+          _account: selectedAccount.id,
+        },
       });
     }
 
@@ -315,11 +329,19 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
     ) {
       response = await request({
         url: nextPage || `/notify/v1/instructor/${affiliateAccount}/rooms/`,
+        params: {
+          limit,
+          _account: selectedAccount.id,
+        },
       });
     } // incomplete
     if (String(selectedAccount.type).toLowerCase() === "personal") {
       response = await request({
         url: nextPage || "/notify/v1/rooms/",
+        params: {
+          limit,
+          _account: selectedAccount.id,
+        },
       });
     } // incomplete
     if (!response?.data) return;
@@ -341,10 +363,11 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
       // Ensure the correct function name is called recursively
       getMessageRoomsByCourses(next);
     }
+    return response.data;
   };
 
   // get individual chats
-  const getIndividualChats = async (nextPage, roomId) => {
+  const getIndividualChats = async (nextPage, roomId, limit = 1000) => {
     if (!selectedAccount) return;
 
     let response;
@@ -354,6 +377,7 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
         params: {
           _account: selectedAccount.id,
           room_id: roomId,
+          limit,
         },
       });
     }
@@ -369,6 +393,7 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
         params: {
           _account: selectedAccount.id,
           room_id: roomId,
+          limit,
         },
       });
     }
@@ -457,6 +482,7 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
 
     // Pass roomId correctly in the recursive call
     if (responseData.next) getIndividualChats(responseData.next, roomId);
+    return responseData;
   };
 
   // read messages (using the latest message ID passed) and update counts
@@ -710,7 +736,6 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
 
   // Initial data fetch effect
   useEffect(() => {
-    if (!selectedAccount) return;
     (async () => {
       await getMessageRoomsByCourses();
       // Example: Fetch initial chat for a specific room if needed on load
@@ -720,11 +745,10 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
       //   roomId: "5be9b48281ac4c2885d3b719654ed59d",
       // });
     })();
-  }, [selectedAccount?.id]); // Rerun when selectedAccount changes
+  }, []); // Rerun when selectedAccount changes
 
   // --- Handle Incoming WebSocket Messages ---
   useEffect(() => {
-    if (!selectedAccount) return;
     const socket = new WebSocket(buildSocketUrl());
     socket.addEventListener("message", (event) => {
       const lastJsonMessage = JSON.parse(event.data);
@@ -758,11 +782,8 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
           console.log(
             `Room ${roomId} not found in state, refetching room list.`
           );
-          getMessageRoomsByCourses(null, true); // Refetch rooms once
-          // Room not found, trigger refetch but DO NOT return early.
-          // Allow the message to be processed for the 'chats' state at least.
-          getMessageRoomsByCourses(null, true); // Refetch rooms once
-          // Continue processing the message...
+          getMessageRoomsByCourses(null, true);
+          setTimeout(() => {}, 1000);
         }
 
         // --- Format WebSocket data into ChatMessage ---
@@ -916,7 +937,7 @@ const useMessageKit = (affiliatesActive, selectedAccount) => {
     });
 
     return () => socket.close();
-  }, [selectedAccount?.id, buildSocketUrl, readRoomMessages]); // Add dependencies
+  }, []); // Add dependencies
 
   console.log(state, "messages"); // Keep console log for debugging if needed
   // send messages to account based on account type