delete msg function passed, which re-fetches the conversation

CodeAcademyBerlin · Jun 30, 2023 · 0318505 · 0318505
1 parent 9d54486
commit 0318505
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/apps/codac-quasseln/src/components/chat/main-chat/message.tsx b/apps/codac-quasseln/src/components/chat/main-chat/message.tsx
@@ -56,8 +56,8 @@ const deleteChatMessage = gql`
   }
 `;
 
-const Message = ({ message }: { message: any }) => {
-  console.log("message.id: ", message.id);
+const Message = ({ message, deleteMsg }: { message: any, deleteMsg: () => void }) => {
+  // console.log("message.id: ", message.id);
   const [hiddenDiv, setHiddenDiv] = useState(false);
   const [editToggle, setEditToggle] = useState(false);
   const [newMsg, setNewMsg] = useState(message?.attributes?.body || "");
@@ -76,21 +76,21 @@ const Message = ({ message }: { message: any }) => {
 
   const [deleteMessageMutation] = useMutation(deleteChatMessage);
   //  the mentor has permmision to delete as well... condicional... id not working and only deleting first message...
-  const deleteMessage = async (messageId: any) => {
-    console.log("object :>> ", message.attributes.author.data?.id);
+  const deleteMessage = (messageId: any) => {
+    // console.log("object :>> ", message.attributes.author.data?.id);
     if (userId === message.attributes.author.data.id || user?.role?.name === "Mentor") {
       deleteMessageMutation({
         variables: {
           id: message.id,
         },
       });
-      await refetch();
+      deleteMsg()
     }
   };
   const updateMessage = async (e: FormEvent<HTMLFormElement>, message: any) => {
     e.preventDefault();
-    console.log("message.id :>> ", message.id);
-    console.log("msg attributes:>>", message.attributes);
+    // console.log("message.id :>> ", message.id);
+    // console.log("msg attributes:>>", message.attributes);
     if (userId === message.attributes.author.data.id) {
       if (newMsg) {
         updateMessageMutation({
@@ -112,7 +112,7 @@ const Message = ({ message }: { message: any }) => {
         <>
           <div className="option-A" style={{ border: "2px solid white", margin: "1rem" }}>
             <p>
-              {message && message.attributes.author.data.attributes.username} -{" "}
+              {message && message.attributes.author.data?.attributes.username} -{" "}
               {message && message.attributes.createdAt}{" "}
               <button
                 onClick={() => {
@@ -134,14 +134,15 @@ const Message = ({ message }: { message: any }) => {
             <p>{message && message.attributes?.body}</p>
             {hiddenDiv && (
               <>
-                <span>No</span>
-                <span
+                <button>No</button>
+                <button
                   onClick={() => {
                     deleteMessage(message.id);
+
                   }}
                 >
                   Yes
-                </span>
+                </button>
               </>
             )}
           </div>

diff --git a/apps/codac-quasseln/src/pages/main-chat/[chatId].tsx b/apps/codac-quasseln/src/pages/main-chat/[chatId].tsx
@@ -147,9 +147,16 @@ const updatePinnedConversation = gql`
 const SingleChat = (props: Props) => {
   const [testVariable, setTestVariable] = useState(false);
   const { user } = useAuth();
-  console.log("user :>> ", user);
+  // console.log("user :>> ", user);
   const userId = user?.id;
-  // console.log("userId :>> ", userId);
+  // console.log("userId :>> ", userId)
+
+  const deleteMsg = () => {
+    refetch()
+  }
+
+
+
 
   // UPDATE PINNED CONVERSATION FUNCTION
   const [updatePinnedMutation] = useMutation(updatePinnedConversation);
@@ -220,7 +227,8 @@ const SingleChat = (props: Props) => {
       setMessageText("");
     }
     refetch();
-    setTestVariable(!testVariable);
+    // setTestVariable(!testVariable);
+
   };
 
   // const [deleteMessageMutation] = useMutation(deleteChatMessage);
@@ -284,12 +292,13 @@ const SingleChat = (props: Props) => {
   // console.log('chatId :>> ', chatId);
   // console.log('router :>> ', router);
   // console.log('data :>> ', chatRooms);
-  console.log("messages history :>> ", allMessages?.conversation?.data.attributes.messages.data);
+  // console.log("messages history :>> ", allMessages?.conversation?.data.attributes.messages.data);
 
   // +++++++++++++++++++++++ MODALS ++++++++++++++++++++++
 
   return (
     <div>
+
       <h1
         style={{
           color: "white",
@@ -379,7 +388,7 @@ const SingleChat = (props: Props) => {
             {conversations &&
               conversations.chatroom?.data?.attributes.conversations?.data?.map(
                 (conversation: any) => {
-                  console.log("conversation :>> ", conversation);
+                  // console.log("conversation :>> ", conversation);
                   if (conversation.attributes.pinned === false) {
                     return (
                       <div
@@ -443,7 +452,12 @@ const SingleChat = (props: Props) => {
           >
             {allMessages &&
               allMessages?.conversation?.data.attributes?.messages?.data?.map((message: any) => {
-                return <Message message={message} />;
+                return <Message
+                  message={message}
+                  deleteMsg={deleteMsg}
+
+
+                />;
               })}
           </div>