l-min-components 1.6.1245 → 1.6.1247

package/package.json

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

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

@@ -279,6 +279,7 @@ const useMessageKit = (/*affiliatesActive*/) => {
   const [state, setState] = useState({
     roomsByCourses: [],
     chats: {},
+    loadingRoomIds: new Set(), // Track which rooms are currently loading
   });
   // State for rooms that should be automatically marked as read
   const [autoReadRoomIds, setAutoReadRoomIds] = useState(() => new Set());
@@ -370,7 +371,14 @@ const useMessageKit = (/*affiliatesActive*/) => {
   const getIndividualChats = async (nextPage, roomId, limit = 1000) => {
     if (!selectedAccount) return;
 
-    let response;
+    // Add roomId to loading state
+    setState((prevState) => ({
+      ...prevState,
+      loadingRoomIds: new Set([...prevState.loadingRoomIds, roomId])
+    }));
+
+    try {
+      let response;
     if (String(selectedAccount.type).toLowerCase() === "enterprise") {
       response = await request({
         url: nextPage || "/notify/v1/enterprise/chats/",
@@ -480,10 +488,34 @@ const useMessageKit = (/*affiliatesActive*/) => {
       });
     }
 
+    // Only remove from loading state if this is the last page or there was an error
+    if (!responseData.next) {
+      setState((prevState) => {
+        const updatedLoadingRoomIds = new Set(prevState.loadingRoomIds);
+        updatedLoadingRoomIds.delete(roomId);
+        return {
+          ...prevState,
+          loadingRoomIds: updatedLoadingRoomIds
+        };
+      });
+    }
+  
     // Pass roomId correctly in the recursive call
     if (responseData.next) getIndividualChats(responseData.next, roomId);
     return responseData;
-  };
+  } catch (error) {
+    // Remove from loading state in case of error
+    setState((prevState) => {
+      const updatedLoadingRoomIds = new Set(prevState.loadingRoomIds);
+      updatedLoadingRoomIds.delete(roomId);
+      return {
+        ...prevState,
+        loadingRoomIds: updatedLoadingRoomIds
+      };
+    });
+    throw error; // Re-throw to allow error handling upstream
+  }
+};
 
   // read messages (using the latest message ID passed) and update counts
   const readRoomMessages = async ({ latestMessageId, roomId }) => {
@@ -963,6 +995,12 @@ const useMessageKit = (/*affiliatesActive*/) => {
   useEffect(() => {
     (async () => {
       await getMessageRoomsByCourses();
+      // reportChat({
+      //   reasons: ["Verbal harassment"],
+      //   accountId: "24dbaeede1",
+      //   messageIds: ["438745c081564ee9aeb76ed29052bd4b"],
+      //   // others: "",
+      // });
       // await deleteRoom("5be9b48281ac4c2885d3b719654ed59d");
       // await pinRoom("5be9b48281ac4c2885d3b719654ed59d");
       // Example: Fetch initial chat for a specific room if needed on load
@@ -1186,6 +1224,8 @@ const useMessageKit = (/*affiliatesActive*/) => {
     pinRoom,
     deleteRoom,
     reportChat,
+    // Helper method to check if a specific room is loading
+    isRoomLoading: (roomId) => state.loadingRoomIds.has(roomId),
   };
 };