l-min-components 1.6.1240 → 1.6.1245

package/package.json

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

package/src/components/messageAddon/messages/chatheader/index.jsx

@@ -62,7 +62,7 @@ const ChatHeader = ({
             {chatRecipient?.is_online && <span className="online-dot"></span>}
           </div>
           <div className="user-details">
-            <h5>{chatRecipient?.course || courseName}</h5>
+            <h5>{courseName || chatRecipient?.course}</h5>
             <div className="friend_cont">
               {/* <div className="friend-tag">
                 <HiUser /> {userType}

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

@@ -32,7 +32,8 @@ const SideMenu = ({
   // const [isOpen, setIsOpen] = useState(false);
   const [gracePeriod, setGracePeriod] = useState(true);
 
-  const { setGeneralData, generalData } = useContext(OutletContext);
+  const { setGeneralData, generalData, messageKit } = useContext(OutletContext);
+  const { state } = messageKit;
   const onToggle = () => {
     setIsOpen(!isOpen);
     window.localStorage.setItem("isOpen", !isOpen);
@@ -88,8 +89,11 @@ const SideMenu = ({
   const InstructorRight = <InstructorRightBar />;
 
   const renderNavigationItem = (route, index) => {
+    console.log(route, "route");
+    let notificationCount;
     const { icon, iconActive, text, notifications, path, affiliates, newTab } =
       route;
+
     const handlePathCheck = () => {
       let statusText;
       //console.log(window.location.pathname, "pathname");
@@ -268,6 +272,11 @@ const SideMenu = ({
       }
     };
     const active = handlePathCheck();
+    if (notifications && String(text).toLowerCase().includes("message")) {
+      notificationCount = state.roomsByCourses.reduce((acc, group) => {
+        return acc + group.total_unread_count;
+      }, 0);
+    }
 
     return (
       <NavigationItemContainer
@@ -280,16 +289,15 @@ const SideMenu = ({
         }}
         key={index}
         className={cx(`${route.text} ${active && "active"}`)}
-        minimal={isOpen}
-      >
+        minimal={isOpen}>
         <IconContainer active={active}>
           {active ? iconActive : icon}
         </IconContainer>
         <TextContainer minimal={isOpen}>{findText(text)}</TextContainer>
 
-        {notifications && (
+        {!!notifications && (
           <NotificationCount minimal={isOpen}>
-            <div className="text">{notifications}</div>
+            <div className="text">{notificationCount}</div>
           </NotificationCount>
         )}
       </NavigationItemContainer>
@@ -304,8 +312,7 @@ const SideMenu = ({
         generalData?.selectedAccount?.type?.toLowerCase() === "enterprise"
           ? "grace_period disabled"
           : ""
-      }
-    >
+      }>
       <UserCard user={user} isOpen={isOpen} findText={findText} />
 
       {!isPendingDelete && (

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

@@ -20,7 +20,6 @@ export const SideMenuContainer = styled.div`
 
   &.disabled {
     pointer-events: none;
-    
   }
 
   .toggle {
@@ -99,10 +98,9 @@ export const NavigationItemContainer = styled.p`
     }
   }
 
-
-/* GRACE PERIOD AND DEACTIVATED */
-  &.grace_period{
-    background: var(--Neutral-40, #ADB2B2);
+  /* GRACE PERIOD AND DEACTIVATED */
+  &.grace_period {
+    background: var(--Neutral-40, #adb2b2);
     margin: 2px 0px;
   }
 
@@ -142,7 +140,7 @@ export const TextContainer = styled.div`
 `;
 
 export const NotificationCount = styled.div`
-  background-color: #009999;
+  background-color: rgba(254, 191, 16, 0.7);
   color: #fff;
   font-size: 12px;
   font-weight: 500;

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

@@ -658,6 +658,69 @@ const useMessageKit = (/*affiliatesActive*/) => {
 
     // --- 2. Update State ---
     setState((prevState) => {
+      // --- Check if room exists before updating state ---
+      let roomExistsInState = false;
+      for (const courseGroup of prevState.roomsByCourses) {
+        if (courseGroup.rooms.some((room) => room.id === roomId)) {
+          roomExistsInState = true;
+          break;
+        }
+      }
+
+      // If room doesn't exist, fetch rooms and skip this state update
+      if (!roomExistsInState) {
+        console.log(
+          `Room ${roomId} not found in state after sending message, refetching room list.`
+        );
+        getMessageRoomsByCourses(null, true); // Fetch room list
+
+        // --- Update chats state even if room metadata isn't found yet ---
+        const chatHistoryForMissingRoom = prevState.chats[roomId] || [];
+        let updatedChatHistoryForMissingRoom = [...chatHistoryForMissingRoom];
+        const todayDateStringForMissing = "today"; // Assume API uses "today"
+
+        const todayGroupIndexForMissing =
+          updatedChatHistoryForMissingRoom.findIndex(
+            (group) => group.date === todayDateStringForMissing
+          );
+
+        if (todayGroupIndexForMissing !== -1) {
+          const todayGroup =
+            updatedChatHistoryForMissingRoom[todayGroupIndexForMissing];
+          if (
+            !todayGroup.messages.some((msg) => msg.id === newChatMessage.id)
+          ) {
+            const updatedTodayGroup = {
+              ...todayGroup,
+              messages: [...todayGroup.messages, newChatMessage],
+            };
+            updatedChatHistoryForMissingRoom.splice(
+              todayGroupIndexForMissing,
+              1,
+              updatedTodayGroup
+            );
+          }
+        } else {
+          const newTodayGroup = {
+            date: todayDateStringForMissing,
+            messages: [newChatMessage],
+          };
+          updatedChatHistoryForMissingRoom = [
+            newTodayGroup,
+            ...updatedChatHistoryForMissingRoom,
+          ];
+        }
+
+        const updatedChatsOnly = {
+          ...prevState.chats,
+          [roomId]: updatedChatHistoryForMissingRoom,
+        };
+
+        // Return state with only chats updated, roomsByCourses will update after fetch
+        return { ...prevState, chats: updatedChatsOnly };
+      }
+
+      // --- Room exists, proceed with updates for both chats and roomsByCourses ---
       // --- 2a. Update chats state ---
       const currentChatHistory = prevState.chats[roomId] || [];
       let updatedChatHistory = [...currentChatHistory];
@@ -863,6 +926,39 @@ const useMessageKit = (/*affiliatesActive*/) => {
       setState(previousState);
     }
   };
+  const reportChat = async ({
+    reasons,
+    accountId,
+    messageIds,
+    others, // optional
+  }) => {
+    let response;
+    const data = {
+      reasons,
+      account_id: accountId,
+      message_ids: messageIds,
+      others,
+    };
+    if (selectedAccount.type.toLowerCase() === "enterprise") {
+      console.log("Reporting chat in enterprise", data);
+      response = await request({
+        url: `/notify/v1/enterprise/chats/reports/`,
+        method: "post",
+        data,
+      });
+    }
+    if (
+      selectedAccount.type.toLowerCase() === "instructor" &&
+      affiliateAccount
+    ) {
+      response = await request({
+        url: `/notify/v1/instructor/${affiliateAccount}/chats/reports/`,
+        method: "post",
+        data,
+      });
+    }
+    return response;
+  };
   // Initial data fetch effect
   useEffect(() => {
     (async () => {
@@ -1089,6 +1185,7 @@ const useMessageKit = (/*affiliatesActive*/) => {
     removeAutoReadRooms, // Expose new function
     pinRoom,
     deleteRoom,
+    reportChat,
   };
 };