From 43adb0137a84eb45715feacce32c273ae9eb45d4 Mon Sep 17 00:00:00 2001
From: Vishnu <vishnu@hexrfactory.com>
Date: Thu, 22 May 2025 18:29:27 +0530
Subject: [PATCH] feat: implement ThreadChat component and enhance Messages and
 CommentThreads with improved structure and styling

---
 .../ui/collaboration/CommentThreads.tsx       | 32 +++++----
 .../components/ui/collaboration/Messages.tsx  | 27 ++++----
 .../ui/collaboration/ThreadChat.tsx           | 44 ++++++++-----
 app/src/pages/Project.tsx                     |  2 +
 app/src/styles/scene/comments.scss            | 66 +++++++++++++++++++
 5 files changed, 126 insertions(+), 45 deletions(-)

diff --git a/app/src/components/ui/collaboration/CommentThreads.tsx b/app/src/components/ui/collaboration/CommentThreads.tsx
index ed8d563..0ce9fad 100644
--- a/app/src/components/ui/collaboration/CommentThreads.tsx
+++ b/app/src/components/ui/collaboration/CommentThreads.tsx
@@ -18,19 +18,19 @@ const CommentThreads: React.FC<CommentThreadsProps> = ({ commentClicked }) => {
     lastUpdatedAt: "string",
     replies: [
       {
-        replyId: 'string',
-        creatorId: 'string',
-        createdAt: 'string',
-        lastUpdatedAt: 'string',
-        reply: 'string',
+        replyId: "string",
+        creatorId: "string",
+        createdAt: "string",
+        lastUpdatedAt: "string",
+        reply: "string",
       },
       {
-        replyId: 'string',
-        creatorId: 'string',
-        createdAt: 'string',
-        lastUpdatedAt: 'string',
-        reply: 'string',
-      }
+        replyId: "string",
+        creatorId: "string",
+        createdAt: "string",
+        lastUpdatedAt: "string",
+        reply: "string",
+      },
     ],
   };
 
@@ -54,8 +54,9 @@ const CommentThreads: React.FC<CommentThreadsProps> = ({ commentClicked }) => {
         onPointerEnter={() => getDetails()}
         onPointerLeave={() => getDetails()}
         onClick={() => getDetails("clicked")}
-        className={`comments-threads-container ${expand ? "open" : "closed"
-          } unread`}
+        className={`comments-threads-container ${
+          expand ? "open" : "closed"
+        } unread`}
       >
         <div className="users-commented">
           {commentsedUsers.map((val, i) => (
@@ -79,7 +80,10 @@ const CommentThreads: React.FC<CommentThreadsProps> = ({ commentClicked }) => {
           </div>
           <div className="message">{CommentDetails.comment}</div>
           {CommentDetails.replies.length > 0 && (
-            <div className="replies">{CommentDetails.replies.length} reply(s)</div>
+            <div className="replies">
+              {CommentDetails.replies.length}{" "}
+              {CommentDetails.replies.length === 1 ? "reply" : "replies"}
+            </div>
           )}
         </div>
       </button>
diff --git a/app/src/components/ui/collaboration/Messages.tsx b/app/src/components/ui/collaboration/Messages.tsx
index 69f9669..3440204 100644
--- a/app/src/components/ui/collaboration/Messages.tsx
+++ b/app/src/components/ui/collaboration/Messages.tsx
@@ -17,7 +17,19 @@ const Messages: React.FC<MessageProps> = ({ val, i }) => {
   return (
     <>
       {isEditing ? (
-        <>
+        <div className="edit-container">
+          <div className="input-container">
+            <textarea />
+          </div>
+          <div className="actions-container">
+            <div className="actions">
+              <button className="cancel-button">Cancel</button>
+              <button className="save-button">Save</button>
+            </div>
+          </div>
+        </div>
+      ) : (
+        <div className="message-container">
           <div
             className="profile"
             style={{ background: getAvatarColor(i, UserName) }}
@@ -54,18 +66,7 @@ const Messages: React.FC<MessageProps> = ({ val, i }) => {
                 )}
               </div>
             )}
-          </div>
-        </>
-      ) : (
-        <div className="edit-container">
-          <div className="input-container">
-            <textarea />
-          </div>
-          <div className="actions-container">
-            <div className="actions">
-              <button className="cancel-button">Cancel</button>
-              <button className="save-button">Save</button>
-            </div>
+            <div className="message">{val.reply}</div>
           </div>
         </div>
       )}
diff --git a/app/src/components/ui/collaboration/ThreadChat.tsx b/app/src/components/ui/collaboration/ThreadChat.tsx
index 522610c..10c4a23 100644
--- a/app/src/components/ui/collaboration/ThreadChat.tsx
+++ b/app/src/components/ui/collaboration/ThreadChat.tsx
@@ -1,9 +1,10 @@
-import React from "react";
+import React, { useState } from "react";
 import { CloseIcon, KebabIcon } from "../../icons/ExportCommonIcons";
 import Messages from "./Messages";
 import { ExpandIcon } from "../../icons/SimulationIcons";
 
 const ThreadChat: React.FC = () => {
+  const [openThreadOptions, setOpenThreadOptions] = useState(false);
   const messages = [
     {
       replyId: "user 1",
@@ -13,11 +14,11 @@ const ThreadChat: React.FC = () => {
       reply: "true",
     },
     {
-      userName: "user 2",
-      userId: "2",
-      message: "hello, thread check",
-      creationTime: "2 hrs ago",
-      idEdited: "true",
+      replyId: "user 2",
+      creatorId: "2",
+      createdAt: "hello, thread check",
+      lastUpdatedAt: "2 hrs ago",
+      reply: "true",
     },
   ];
 
@@ -27,14 +28,21 @@ const ThreadChat: React.FC = () => {
         <div className="header-wrapper">
           <div className="header">Comment</div>
           <div className="header-options">
-            <button className="options-button">
+            <button
+              className="options-button"
+              onClick={() => {
+                setOpenThreadOptions(true);
+              }}
+            >
               <KebabIcon />
             </button>
-            <div className="options-list">
-              <div className="options">Mark as Unread</div>
-              <div className="options">Mark as Resolved</div>
-              <div className="options">Delete Thread</div>
-            </div>
+            {openThreadOptions && (
+              <div className="options-list">
+                <div className="options">Mark as Unread</div>
+                <div className="options">Mark as Resolved</div>
+                <div className="options">Delete Thread</div>
+              </div>
+            )}
             <button className="close-button">
               <CloseIcon />
             </button>
@@ -42,16 +50,16 @@ const ThreadChat: React.FC = () => {
         </div>
         <div className="messages-wrapper">
           {messages.map((val, i) => (
-            <Messages val={val as Reply} i={i} key={val.userId} />
+            <Messages val={val as Reply} i={i} key={val.replyId} />
           ))}
         </div>
         <div className="send-message-wrapper">
-            <div className="input-container">
-                <input type="text" />
-                <div className="sent-button">
-                    <ExpandIcon />
-                </div>
+          <div className="input-container">
+            <input type="text" />
+            <div className="sent-button">
+              <ExpandIcon />
             </div>
+          </div>
         </div>
       </div>
     </div>
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index 6e49734..099efce 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -38,6 +38,7 @@ import {useToggleStore} from "../store/useUIToggleStore";
 import RegularDropDown from "../components/ui/inputs/RegularDropDown";
 import VersionSaved from "../components/layout/sidebarRight/versionHisory/VersionSaved";
 import SimulationPlayer from "../components/ui/simulation/simulationPlayer";
+import ThreadChat from "../components/ui/collaboration/ThreadChat";
 
 const Project: React.FC = () => {
   let navigate = useNavigate();
@@ -180,6 +181,7 @@ const Project: React.FC = () => {
         </>
       )}
       <VersionSaved />
+      <ThreadChat />
     </div>
   );
 };
diff --git a/app/src/styles/scene/comments.scss b/app/src/styles/scene/comments.scss
index 02ff683..f264e2d 100644
--- a/app/src/styles/scene/comments.scss
+++ b/app/src/styles/scene/comments.scss
@@ -83,3 +83,69 @@
     }
   }
 }
+
+.thread-char-wrapper {
+  position: absolute;
+  // remove later
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  // ----
+  z-index: 10000;
+  .thread-char-container {
+    .header-wrapper {
+      .header {
+      }
+      .header-options {
+        .options-button {
+        }
+        .options-list {
+          .options {
+          }
+        }
+        .close-button {
+        }
+      }
+    }
+    .messages-wrapper {
+      .edit-container {
+        .input-container {
+        }
+        .actions-container {
+          .actions {
+            .cancel-button {
+            }
+            .save-button {
+            }
+          }
+        }
+      }
+      .message-container {
+        .profile {
+        }
+        .content {
+          .user-details {
+            .user-name {
+            }
+            .time {
+            }
+          }
+        }
+        .more-options {
+          .more-options-button {
+          }
+          .options-list {
+            .option {
+            }
+          }
+        }
+      }
+    }
+    .send-message-wrapper {
+      .input-container {
+        .sent-button {
+        }
+      }
+    }
+  }
+}