From 55f650f9642cc2767822e4759310ee2a45252285 Mon Sep 17 00:00:00 2001
From: James Morris <moreofmorris@users.noreply.github.com>
Date: Wed, 20 Jul 2022 17:26:29 +0100
Subject: [PATCH] Updated some of the logic for the dropdowns for hidden, etc

refs https://github.com/TryGhost/Team/issues/1693
---
 apps/comments-ui/src/components/Comment.js    |  4 ++--
 .../components/modals/CommentContextMenu.js   | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/comments-ui/src/components/Comment.js b/apps/comments-ui/src/components/Comment.js
index 4c1e50a86f..2c53496783 100644
--- a/apps/comments-ui/src/components/Comment.js
+++ b/apps/comments-ui/src/components/Comment.js
@@ -58,8 +58,8 @@ const Comment = (props) => {
                             <p dangerouslySetInnerHTML={html} className="gh-comment-content text-[16.5px] leading-normal"></p>
                         </div>
                         <div className="ml-14 flex gap-5 items-center">
-                            <Like comment={comment} />
-                            {canReply && (isNotPublished || !props.parent) && <Reply comment={comment} toggleReply={toggleReplyMode} isReplying={isInReplyMode} />}
+                            {!isNotPublished && <Like comment={comment} />}
+                            {!isNotPublished && (canReply && (isNotPublished || !props.parent) && <Reply comment={comment} toggleReply={toggleReplyMode} isReplying={isInReplyMode} />)}
                             <div className="text-sm text-neutral-400 dark:text-[rgba(255,255,255,0.5)] font-sans">{formatRelativeTime(comment.created_at)}</div>
                             <More comment={comment} toggleEdit={toggleEditMode} />
                         </div>
diff --git a/apps/comments-ui/src/components/modals/CommentContextMenu.js b/apps/comments-ui/src/components/modals/CommentContextMenu.js
index 9a2c86d0ce..044fdf097a 100644
--- a/apps/comments-ui/src/components/modals/CommentContextMenu.js
+++ b/apps/comments-ui/src/components/modals/CommentContextMenu.js
@@ -10,9 +10,28 @@ const CommentContextMenu = (props) => {
     const isAuthor = member && comment.member?.uuid === member?.uuid;
     const isAdmin = !!admin;
 
+    let contextMenu = null;
+    if (comment.status === 'published') {
+        if (isAuthor) {
+            contextMenu = <AuthorContextMenu comment={comment} close={props.close} toggleEdit={props.toggleEdit} />;
+        } else {
+            if (isAdmin) {
+                contextMenu = <AdminContextMenu comment={comment} close={props.close}/>;
+            } else {
+                contextMenu = <NotAuthorContextMenu comment={comment} close={props.close}/>;
+            }
+        }
+    } else {
+        if (isAdmin) {
+            contextMenu = <AdminContextMenu comment={comment} close={props.close}/>;
+        } else {
+            return null;
+        }
+    }
+
     return (
         <div className="min-w-[170px] bg-white absolute font-sans rounded py-3 px-4 shadow-lg text-sm whitespace-nowrap z-10 dark:bg-zinc-900 dark:text-white">
-            {isAuthor && comment.status === 'published' ? <AuthorContextMenu comment={comment} close={props.close} toggleEdit={props.toggleEdit} /> : (isAdmin ? <AdminContextMenu comment={comment} close={props.close}/> : <NotAuthorContextMenu comment={comment} close={props.close}/>)}
+            {contextMenu}
         </div>
     );
 };