l-min-components 1.0.467 → 1.0.472

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.467",
+  "version": "1.0.472",
   "type": "module",
   "files": [
     "src/assets",
@@ -19,8 +19,10 @@
     "chart.js": "4.4.1",
     "classnames": "^2.3.2",
     "emoji-picker-react": "^4.4.10",
+    "i": "^0.3.7",
     "js-cookie": "^3.0.5",
     "moment": "^2.29.4",
+    "npm": "^10.2.5",
     "prop-types": "^15.8.1",
     "rc-progress": "^3.5.1",
     "rc-slider": "^10.1.1",

package/src/components/messageAddon/hooks/useMessaging.js

@@ -54,14 +54,14 @@ const useMessaging = () => {
     }
   );
 
-  const handleCreateMessage = async (user_id, data) => {
+  const handleCreateMessage = async (account_id, data) => {
     await createMessage({
       url: `/notify/v1/chats/`,
       data: {
         ...data,
       },
       params: {
-        user_id,
+        account_id,
         // room_id,
       },
     });
@@ -87,7 +87,6 @@ const useMessaging = () => {
 
     newUploaded.push(uploadedData?.data?.results[0]);
 
-
     // if (uploadMediaData?.data) {
     await createMessageMedia({
       url: `/notify/v1/chats/`,
@@ -216,6 +215,30 @@ const useMessaging = () => {
     }
   };
 
+  //GET Room Messages for Recipient
+
+  const [{ ...roomRecipientDetailsData }, roomRecipientDetails] = useAxios(
+    {
+      method: "GET",
+    },
+    {
+      manual: true,
+    }
+  );
+
+  const handleRoomRecipientDetails = async (room_id, recipient_only = true) => {
+    try {
+      await roomRecipientDetails({
+        url: `/notify/v1/chats/recipient_details/`,
+        params: {
+          room_id,
+        },
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
   return {
     retrieveMessageData,
     handleRetrieveMessage,
@@ -235,6 +258,8 @@ const useMessaging = () => {
     handleClearChat,
     roomMessageRecipientData,
     handleRoomMessageRecipient,
+    roomRecipientDetailsData,
+    handleRoomRecipientDetails,
   };
 };
 

package/src/components/messageAddon/hooks/useRooms.js

@@ -58,7 +58,7 @@ const useRooms = () => {
     }
   };
 
-  //GET Change Pin Status
+  //PATCH Change Pin Status
   const [{ ...changePinStatusData }, changePinStatus] = useAxios(
     {
       method: "PATCH",
@@ -67,12 +67,15 @@ const useRooms = () => {
       manual: true,
     }
   );
-  const handleChangePinStatus = async (room_id, data) => {
+  const handleChangePinStatus = async (room_id, type) => {
     try {
       await changePinStatus({
         url: `/notify/v1/rooms/${room_id}/change_pin_status/`,
-        data: {
-          ...data,
+        // data: {
+        //   ...data,
+        // },
+        params: {
+          type,
         },
       });
     } catch (err) {
@@ -185,6 +188,66 @@ const useRooms = () => {
     }
   };
 
+  //GET List Rooms Enterprise
+  const [{ ...getEnterpriseRoomsData }, getEnterpriseRooms] = useAxios(
+    {
+      method: "GET",
+    },
+    {
+      manual: true,
+    }
+  );
+
+  const handleGetEnterpriseRooms = async () => {
+    try {
+      await getEnterpriseRooms({
+        url: `/notify/v1/rooms/enterprise/`,
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
+  //GET List Rooms Personal
+  const [{ ...getPersonalRoomsData }, getPersonalRooms] = useAxios(
+    {
+      method: "GET",
+    },
+    {
+      manual: true,
+    }
+  );
+
+  const handleGetPersonalRooms = async () => {
+    try {
+      await getPersonalRooms({
+        url: `/notify/v1/rooms/personal`,
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
+  //GET List Rooms Instructor
+  const [{ ...getInstructorRoomsData }, getInstructorRooms] = useAxios(
+    {
+      method: "GET",
+    },
+    {
+      manual: true,
+    }
+  );
+
+  const handleGetInstructorRooms = async () => {
+    try {
+      await getInstructorRooms({
+        url: `/notify/v1/rooms/instructor`,
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
   return {
     getMyRoomsData,
     handleGetMyRooms,
@@ -204,6 +267,12 @@ const useRooms = () => {
     handleChangePinStatus,
     getAllRoomsData,
     handleGetAllRooms,
+    getEnterpriseRoomsData,
+    handleGetEnterpriseRooms,
+    getPersonalRoomsData,
+    handleGetPersonalRooms,
+    getInstructorRoomsData,
+    handleGetInstructorRooms,
   };
 };
 

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

@@ -17,6 +17,9 @@ const ChatHeader = ({
   roomID,
   handleChangePinStatus,
   deleteChatModal,
+  userFullName,
+  courseName,
+  userType
 }) => {
   // handle click outside dropdown container
   const dropdownContainer = useRef(null);
@@ -55,15 +58,18 @@ const ChatHeader = ({
           </div>
           <div className="user-details">
             <h5>
-              {chatRecipient?.first_name || "French For Geginners"} {chatRecipient?.last_name}
+              {chatRecipient?.course || courseName}
             </h5>
             <div className="friend_cont">
-            <div className="friend-tag">
-              <HiUser /> Friend
+              <div className="friend-tag">
+                <HiUser /> {userType}
+              </div>
+              <p>
+                {" "}
+                {chatRecipient?.full_name || userFullName}
+              </p>
             </div>
-            <p>Julius Rippin</p>
-            </div>
-            
+
             {/* <div className="instructor-tag">
               <HiUser /> Instructor
             </div> */}

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

@@ -34,7 +34,17 @@ import { MdOutlineClose } from "react-icons/md";
 import DownSvg from "./assets/down";
 import CloseSvg from "./assets/close";
 
-const Messages = ({ close }) => {
+const Messages = ({
+  close,
+  user,
+  userFullName,
+  userType,
+  courseName,
+  roomID,
+  setRoomID,
+  userID,
+  setUserID,
+}) => {
   const [showEmoji, setShowEmoji] = useState(false);
   const [chatOptions, setChatOptions] = useState(false);
   const [modalIsOpen, setIsOpen] = useState(false);
@@ -59,10 +69,10 @@ const Messages = ({ close }) => {
   // } = useContext(MessagesContext);
   const { generalData, setRightLayout } = useContext(OutletContext);
   const [socketUrl, setSocketUrl] = useState(
-    "dev-117782726-api.learngual.com/notify/v1/ws/connect/",
+    "dev-117782726-api.learngual.com/notify/v1/ws/connect/"
   );
-  const [roomID, setRoomID] = useState("");
-  const [userID, setUserID] = useState("");
+  // const [roomID, setRoomID] = useState("");
+  // const [userID, setUserID] = useState("");
   const [userChatList, setUserChatList] = useState([]);
   const [isFullHeight, setIsFullHeight] = useState(true);
 
@@ -77,6 +87,9 @@ const Messages = ({ close }) => {
     clearChatData,
     roomMessageRecipientData,
     handleRoomMessageRecipient,
+    roomRecipientDetailsData,
+    handleRoomRecipientDetails,
+    handleRetrieveMessage,
   } = useMessaging();
   const {
     handleGetMyRooms,
@@ -89,7 +102,7 @@ const Messages = ({ close }) => {
     handleGetAllRooms,
   } = useRooms();
 
-  const chatRecipient = roomMessageRecipientData?.data;
+  const chatRecipient = roomRecipientDetailsData?.data;
   const singleChat = getAllRoomsData?.data?.results?.map((user) => {
     return user.id;
   });
@@ -119,7 +132,7 @@ const Messages = ({ close }) => {
       handleGetMyRooms();
       handleGetPinnedRooms();
       handleRoomMessage(roomID);
-      handleRoomMessageRecipient(roomID);
+      handleRoomRecipientDetails(roomID);
     }
   }, [clearChatData?.response]);
 
@@ -141,12 +154,12 @@ const Messages = ({ close }) => {
   console.log("clearChatData", clearChatData);
 
   useEffect(() => {
-    setUserID(roomMessageRecipientData?.data?.id);
-  }, [roomMessageRecipientData?.data]);
+    setUserID(roomRecipientDetailsData?.data?.id);
+  }, [roomRecipientDetailsData?.data]);
 
   useEffect(() => {
     handleRoomMessage(roomID);
-    handleRoomMessageRecipient(roomID);
+    handleRoomRecipientDetails();
   }, [roomID]);
 
   console.log("allMessages", allMessages);
@@ -159,7 +172,7 @@ const Messages = ({ close }) => {
 
   console.log("account_id", account_id);
   const websocket = new WebSocket(
-    `wss://${socketUrl}?account=${account_id}&authorization=${token}`,
+    `wss://${socketUrl}?account=${account_id}&authorization=${token}`
   );
 
   useEffect(() => {
@@ -211,7 +224,7 @@ const Messages = ({ close }) => {
     const sortedList = chatListCopy?.sort(
       (chatA, chatB) =>
         new Date(chatA.last_message.created_at).getTime() -
-        new Date(chatB.last_message.created_at).getTime(),
+        new Date(chatB.last_message.created_at).getTime()
     );
 
     setUserChatList(sortedList);
@@ -248,7 +261,7 @@ const Messages = ({ close }) => {
     <>
       <MessagesWrapper>
         <div className="message_by_wrapper">
-          <p className="mbw_name"> Message Julius Rippin </p>
+          <p className="mbw_name"> Message {user} </p>
 
           <div className="icon-box">
             <span onClick={() => setIsFullHeight(!isFullHeight)}>
@@ -275,6 +288,9 @@ const Messages = ({ close }) => {
                 deleteChatModal={() => {
                   setDeleteChatModalIsOpen(true);
                 }}
+                userFullName={userFullName}
+                userType={userType}
+                courseName={courseName}
               />
 
               <MessageBody ref={scrollRef}>