From c112b785d3afd544716592555cb29876d6b790e9 Mon Sep 17 00:00:00 2001
From: Terence Ho <>
Date: Fri, 21 Oct 2022 11:20:26 +0800
Subject: [PATCH] [resumes][feat] Render replies

---
 .../comments/ResumeCommentListItem.tsx        | 72 +++++++++++++++----
 .../comment/ResumeCommentReplyForm.tsx        |  2 +-
 .../router/resumes/resumes-comments-router.ts |  2 +
 apps/portal/src/types/resume-comments.d.ts    |  1 +
 4 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/apps/portal/src/components/resumes/comments/ResumeCommentListItem.tsx b/apps/portal/src/components/resumes/comments/ResumeCommentListItem.tsx
index 1be17cf7..c20930cf 100644
--- a/apps/portal/src/components/resumes/comments/ResumeCommentListItem.tsx
+++ b/apps/portal/src/components/resumes/comments/ResumeCommentListItem.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import { useState } from 'react';
 import { FaceSmileIcon } from '@heroicons/react/24/outline';
 
@@ -23,27 +24,45 @@ export default function ResumeCommentListItem({
   const [isReplyingComment, setIsReplyingComment] = useState(false);
 
   return (
-    <div className="border-primary-300 w-11/12 min-w-fit rounded-md border-2 bg-white p-2 drop-shadow-md">
+    <div
+      className={clsx(
+        'min-w-fit rounded-md bg-white ',
+        !comment.parentId &&
+          'w-11/12 border-2 border-indigo-300 p-2 drop-shadow-md',
+      )}>
       <div className="flex flex-row space-x-2 p-1 align-top">
+        {/* Image Icon */}
         {comment.user.image ? (
           <img
             alt={comment.user.name ?? 'Reviewer'}
-            className="mt-1 h-8 w-8 rounded-full"
+            className={clsx(
+              'mt-1 rounded-full',
+              comment.parentId ? 'h-6 w-6' : 'h-8 w-8 ',
+            )}
             src={comment.user.image!}
           />
         ) : (
-          <FaceSmileIcon className="h-8 w-8 rounded-full" />
+          <FaceSmileIcon
+            className={clsx(
+              'mt-1 rounded-full',
+              comment.parentId ? 'h-6 w-6' : 'h-8 w-8 ',
+            )}
+          />
         )}
 
         <div className="flex w-full flex-col space-y-1">
           {/* Name and creation time */}
           <div className="flex flex-row justify-between">
             <div className="flex flex-row items-center space-x-1">
-              <p className="font-medium">
+              <p
+                className={clsx(
+                  'font-medium',
+                  !!comment.parentId && 'text-sm',
+                )}>
                 {comment.user.name ?? 'Reviewer ABC'}
               </p>
 
-              <p className="text-primary-800 text-xs font-medium">
+              <p className="text-xs font-medium text-indigo-800">
                 {isCommentOwner ? '(Me)' : ''}
               </p>
 
@@ -72,26 +91,29 @@ export default function ResumeCommentListItem({
           <div className="flex flex-row space-x-1 pt-1 align-middle">
             <ResumeCommentVoteButtons commentId={comment.id} userId={userId} />
 
+            {/* Action buttons; only present when not editing/replying */}
             {isCommentOwner && !isEditingComment && !isReplyingComment && (
               <>
                 <button
-                  className="text-primary-800 hover:text-primary-400 px-1 text-xs"
+                  className="px-1 text-xs text-indigo-800 hover:text-indigo-400"
                   type="button"
                   onClick={() => setIsEditingComment(true)}>
                   Edit
                 </button>
 
-                <button
-                  className="text-primary-800 hover:text-primary-400 px-1 text-xs"
-                  type="button"
-                  onClick={() => setIsReplyingComment(true)}>
-                  Reply
-                </button>
+                {!comment.parentId && (
+                  <button
+                    className="px-1 text-xs text-indigo-800 hover:text-indigo-400"
+                    type="button"
+                    onClick={() => setIsReplyingComment(true)}>
+                    Reply
+                  </button>
+                )}
               </>
             )}
           </div>
 
-          {/* Replies */}
+          {/* Reply Form */}
           {isReplyingComment && (
             <ResumeCommentReplyForm
               parentId={comment.id}
@@ -100,6 +122,30 @@ export default function ResumeCommentListItem({
               setIsReplyingComment={setIsReplyingComment}
             />
           )}
+
+          {/* Replies */}
+          {comment.children.length > 0 && (
+            // Horizontal Divider
+            <div className="min-w-fit space-y-1 pt-1">
+              <div className="relative flex items-center">
+                <div className="flex-grow border-t border-gray-300" />
+                <span className="mx-4 flex-shrink text-xs text-gray-400">
+                  Replies
+                </span>
+                <div className="flex-grow border-t border-gray-300" />
+              </div>
+
+              {comment.children.map((child) => {
+                return (
+                  <ResumeCommentListItem
+                    key={child.id}
+                    comment={child}
+                    userId={userId}
+                  />
+                );
+              })}
+            </div>
+          )}
         </div>
       </div>
     </div>
diff --git a/apps/portal/src/components/resumes/comments/comment/ResumeCommentReplyForm.tsx b/apps/portal/src/components/resumes/comments/comment/ResumeCommentReplyForm.tsx
index 0f2f89e6..ea14632a 100644
--- a/apps/portal/src/components/resumes/comments/comment/ResumeCommentReplyForm.tsx
+++ b/apps/portal/src/components/resumes/comments/comment/ResumeCommentReplyForm.tsx
@@ -69,7 +69,7 @@ export default function ResumeCommentReplyForm({
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
-      <div className="flex-column mt-1 space-y-2">
+      <div className="flex-column space-y-2 pt-2">
         <TextArea
           {...(register('description', {
             required: 'Reply cannot be empty!',
diff --git a/apps/portal/src/server/router/resumes/resumes-comments-router.ts b/apps/portal/src/server/router/resumes/resumes-comments-router.ts
index 32084966..d6d12177 100644
--- a/apps/portal/src/server/router/resumes/resumes-comments-router.ts
+++ b/apps/portal/src/server/router/resumes/resumes-comments-router.ts
@@ -50,6 +50,7 @@ export const resumeCommentsRouter = createRouter().query('list', {
           createdAt: child.createdAt,
           description: child.description,
           id: child.id,
+          parentId: data.id,
           resumeId: child.resumeId,
           section: child.section,
           updatedAt: child.updatedAt,
@@ -66,6 +67,7 @@ export const resumeCommentsRouter = createRouter().query('list', {
         createdAt: data.createdAt,
         description: data.description,
         id: data.id,
+        parentId: data.parentId,
         resumeId: data.resumeId,
         section: data.section,
         updatedAt: data.updatedAt,
diff --git a/apps/portal/src/types/resume-comments.d.ts b/apps/portal/src/types/resume-comments.d.ts
index c8d4d403..f953c827 100644
--- a/apps/portal/src/types/resume-comments.d.ts
+++ b/apps/portal/src/types/resume-comments.d.ts
@@ -9,6 +9,7 @@ export type ResumeComment = Readonly<{
   createdAt: Date;
   description: string;
   id: string;
+  parentId: string?;
   resumeId: string;
   section: ResumesSection;
   updatedAt: Date;