l-min-components 1.6.1232 → 1.6.1234

package/package.json

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

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

@@ -322,7 +322,7 @@ const useMessageKit = (/*affiliatesActive*/) => {
     }
 
     if (
-      String(selectedAccount.type).toLowerCase() === "instructor" &&
+      selectedAccount.type.toLowerCase() === "instructor" &&
       affiliateAccount
       // &&
       // affiliatesActive
@@ -765,32 +765,31 @@ const useMessageKit = (/*affiliatesActive*/) => {
         }),
       };
     });
-
-    let response;
-    if (selectedAccount.type.toLowerCase() === "enterprise") {
-      response = await request({
-        url: `/notify/v1/enterprise/rooms/${roomId}/change_pin_status/`,
-        method: "patch",
-      });
-    }
-    if (
-      selectedAccount.type.toLowerCase() === "instructor" &&
-      affiliateAccount
-      // &&
-      // affiliatesActive
-    ) {
-      response = await request({
-        url: `/notify/v1/instructor/${affiliateAccount}/rooms/${roomId}/change_pin_status/`,
-        method: "patch",
-      });
-    } // incomplete
-
-    if (!response?.data) {
+    try {
+      let response;
+      if (selectedAccount.type.toLowerCase() === "enterprise") {
+        response = await request({
+          url: `/notify/v1/enterprise/rooms/${roomId}/change_pin_status/`,
+          method: "patch",
+        });
+      }
+      if (
+        selectedAccount.type.toLowerCase() === "instructor" &&
+        affiliateAccount
+        // &&
+        // affiliatesActive
+      ) {
+        response = await request({
+          url: `/notify/v1/instructor/${affiliateAccount}/rooms/${roomId}/change_pin_status/`,
+          method: "patch",
+        });
+      } // incomplete
+    } catch (err) {
       // Revert optimistic update on failure (optional, depends on desired UX)
       // You might want to implement more specific error handling here
       getMessageRoomsByCourses(null, true);
-      return;
     }
+
     // const isPinned = response.data.detail === "True";
     // The optimistic update should ideally handle the UI change,
     // so no further state update might be needed here based on the response.
@@ -798,18 +797,78 @@ const useMessageKit = (/*affiliatesActive*/) => {
   };
 
   const deleteRoom = async (roomId) => {
-    let response;
-    if (selectedAccount.type.toLowerCase() === "enterprise") {
-      response = await request({
-        url: ``,
-      });
+    // Optimistic update: Remove the room and potentially the group
+    let previousState;
+    setState((prevState) => {
+      previousState = { ...prevState };
+      let updatedRoomsByCourses = prevState.roomsByCourses
+        .map((courseGroup) => {
+          const updatedRooms = courseGroup.rooms.filter(
+            (room) => room.id !== roomId
+          );
+
+          if (
+            updatedRooms.length === 0 &&
+            courseGroup.rooms.some((room) => room.id === roomId)
+          ) {
+            // If the deleted room was the last one, remove the entire group
+            return null;
+          }
+
+          return {
+            ...courseGroup,
+            rooms: updatedRooms,
+            // Recalculate total unread count
+            total_unread_count: updatedRooms.reduce(
+              (sum, room) => sum + room.unread_count,
+              0
+            ),
+            pin_status: updatedRooms.some((room) => room.pin_status),
+          };
+        })
+        .filter(Boolean); // Remove null entries (deleted groups)
+
+      const updatedChats = { ...prevState.chats };
+      delete updatedChats[roomId]; // Remove chat history
+
+      return {
+        ...prevState,
+        roomsByCourses: updatedRoomsByCourses,
+        chats: updatedChats,
+      };
+    });
+
+    try {
+      let response;
+      if (selectedAccount.type.toLowerCase() === "enterprise") {
+        response = await request({
+          url: `/notify/v1/enterprise/rooms/${roomId}/`,
+          method: "delete",
+        });
+      }
+      if (
+        selectedAccount.type.toLowerCase() === "instructor" &&
+        affiliateAccount
+        // &&
+        // affiliatesActive
+      ) {
+        response = await request({
+          url: `/notify/v1/instructor/${affiliateAccount}/rooms/${roomId}/`,
+          method: "delete",
+        });
+      } // incomplete
+    } catch (err) {
+      console.error("Error deleting room:", err);
+      // Revert the optimistic update on error
+      setState(previousState);
     }
   };
   // Initial data fetch effect
   useEffect(() => {
     (async () => {
       await getMessageRoomsByCourses();
-      await pinRoom("5be9b48281ac4c2885d3b719654ed59d");
+      // await deleteRoom("5be9b48281ac4c2885d3b719654ed59d");
+      // await pinRoom("5be9b48281ac4c2885d3b719654ed59d");
       // Example: Fetch initial chat for a specific room if needed on load
       // await getIndividualChats(null, "5be9b48281ac4c2885d3b719654ed59d");
       // await readRoomMessages({
@@ -1024,6 +1083,7 @@ const useMessageKit = (/*affiliatesActive*/) => {
     addAutoReadRooms, // Expose new function
     removeAutoReadRooms, // Expose new function
     pinRoom,
+    deleteRoom,
   };
 };