l-min-components 1.6.1221 → 1.6.1223

package/package.json

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

package/src/components/AppMainLayout/index.styled.js

@@ -26,6 +26,7 @@ export const MainLayout = styled.div`
   justify-content: space-between;
   width: 100%;
   padding: 84px 20px 20px 0;
+  max-height: 100vh;
 `;
 
 export const LeftLayout = styled.div`

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

@@ -348,48 +348,9 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
     // --- End Find latest message ID ---
 
     setState((prevState) => {
-      let unreadCountToSubtract = 0;
-
-      // --- Update roomsByCourses ---
-      const updatedRoomsByCourses = prevState.roomsByCourses.map(
-        (courseGroup) => {
-          // Find the room within this course group
-          const roomIndex = courseGroup.rooms.findIndex(
-            (room) => room.id === roomId
-          );
-
-          if (roomIndex !== -1) {
-            // Found the room in this course group
-            const targetRoom = courseGroup.rooms[roomIndex];
-            unreadCountToSubtract = targetRoom.unread_count; // Store the count before resetting
-
-            // Create a new rooms array with the updated room
-            const updatedRooms = [
-              ...courseGroup.rooms.slice(0, roomIndex),
-              { ...targetRoom, unread_count: 0 }, // Reset unread count for the specific room
-              ...courseGroup.rooms.slice(roomIndex + 1),
-            ];
-
-            // Return a new course group object with updated total count and rooms
-            return {
-              ...courseGroup,
-              // Ensure total_unread_count doesn't go below zero
-              total_unread_count: Math.max(
-                0,
-                courseGroup.total_unread_count - unreadCountToSubtract
-              ),
-              rooms: updatedRooms,
-            };
-          }
-
-          // If the room wasn't in this group, return the group unchanged
-          return courseGroup;
-        }
-      );
-      // --- End Update roomsByCourses ---
-
-      // --- Update chats ---
+      // --- Update chats ONLY ---
       // Retrieve existing date groups directly from the array mapped to roomId
+      // Count updates are now handled by readRoomMessages
       const existingDateGroups = prevState.chats[roomId] || [];
       const allDateGroups = [...existingDateGroups, ...newDateGroups];
 
@@ -425,10 +386,10 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
       // Optional: Sort the date groups themselves if needed (e.g., chronologically)
       // finalDateGroups.sort((a, b) => /* comparison logic based on date */);
 
-      // --- Return combined state update ---
+      // --- Return combined state update (only updating chats here) ---
       return {
         ...prevState,
-        roomsByCourses: updatedRoomsByCourses, // Include the updated course/room list
+        // roomsByCourses is NOT updated here anymore
         chats: {
           ...prevState.chats,
           // Update the structure: Map roomId directly to the array of finalDateGroups
@@ -443,19 +404,79 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
       latestMessageIdFromFetch?.id && // Optional chaining for safety
       !latestMessageIdFromFetch?.is_read // Optional chaining for safety
     ) {
-      await readRoomMessages(latestMessageIdFromFetch.id); // Pass only the ID
+      // Pass both message ID and room ID to readRoomMessages
+      await readRoomMessages({
+        latestMessageId: latestMessageIdFromFetch.id,
+        roomId: roomId,
+      });
     }
 
     // Pass roomId correctly in the recursive call
     if (responseData.next) getIndividualChats(responseData.next, roomId);
   };
 
-  // read messages (using the latest message ID passed)
-  const readRoomMessages = async (latestMessageId) => {
-    // Assuming the API uses the latest message ID directly in the path as defined
-    return await request({
-      url: `/notify/v1/enterprise/chats/${latestMessageId}/read_message/`,
-    });
+  // read messages (using the latest message ID passed) and update counts
+  const readRoomMessages = async ({ latestMessageId, roomId }) => {
+    // 1. Make the API call to mark as read
+    try {
+      await request({
+        url: `/notify/v1/enterprise/chats/${latestMessageId}/read_message/`,
+      });
+
+      // 2. If API call is successful, update the local state counts
+      setState((prevState) => {
+        let unreadCountToSubtract = 0;
+
+        const updatedRoomsByCourses = prevState.roomsByCourses.map(
+          (courseGroup) => {
+            const roomIndex = courseGroup.rooms.findIndex(
+              (room) => room.id === roomId
+            );
+
+            if (roomIndex !== -1) {
+              const targetRoom = courseGroup.rooms[roomIndex];
+              // Store the count *before* resetting, only if it's positive
+              unreadCountToSubtract = Math.max(0, targetRoom.unread_count);
+
+              if (unreadCountToSubtract > 0) {
+                // Only update if there were unread messages
+                const updatedRooms = [
+                  ...courseGroup.rooms.slice(0, roomIndex),
+                  { ...targetRoom, unread_count: 0 }, // Reset count
+                  ...courseGroup.rooms.slice(roomIndex + 1),
+                ];
+
+                return {
+                  ...courseGroup,
+                  total_unread_count: Math.max(
+                    0, // Ensure total doesn't go below zero
+                    courseGroup.total_unread_count - unreadCountToSubtract
+                  ),
+                  rooms: updatedRooms,
+                };
+              }
+            }
+            // If room not found or no unread messages, return group unchanged
+            return courseGroup;
+          }
+        );
+
+        // Only return updated state if changes were actually made
+        if (unreadCountToSubtract > 0) {
+          return {
+            ...prevState,
+            roomsByCourses: updatedRoomsByCourses,
+          };
+        } else {
+          // No change needed, return previous state
+          return prevState;
+        }
+      });
+    } catch (error) {
+      console.error("Failed to mark messages as read:", error);
+      // Optionally handle the error (e.g., show a notification)
+      // We don't update the state counts if the API call fails
+    }
   };
 
   // sending messages
@@ -598,7 +619,11 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
     (async () => {
       await getMessageRoomsByCourses();
       // Example: Fetch initial chat for a specific room if needed on load
-      // await getIndividualChats(null, "some-initial-room-id");
+      // await getIndividualChats(null, "5be9b48281ac4c2885d3b719654ed59d");
+      // await readRoomMessages({
+      //   latestMessageId: "57e31128214a4269be8b9e3bb18495c4",
+      //   roomId: "5be9b48281ac4c2885d3b719654ed59d",
+      // });
     })();
   }, [selectedAccount?.id]); // Rerun when selectedAccount changes
 
@@ -757,7 +782,13 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
   // send messages to account based on account type
 
   // Return the state and potentially the functions if they need to be called externally
-  return { state, getIndividualChats, getMessageRoomsByCourses, sendMessage }; // Ensure sendMessage is returned
+  return {
+    state,
+    getIndividualChats,
+    getMessageRoomsByCourses,
+    sendMessage,
+    readRoomMessages,
+  };
 };
 
 export default useMessageKit;