From e9c18faf32bd9641f30bc42d3801d272455bf2de Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 8 May 2018 11:30:33 -0300
Subject: [PATCH] Deleted Comment display in Queues

---
 .../src/components/CommentDeletedTombstone.js |   3 +-
 .../src/components/UserDetailComment.js       |  97 ++++++++--------
 .../routes/Moderation/components/Comment.css  |   4 +
 .../routes/Moderation/components/Comment.js   | 105 ++++++++++--------
 4 files changed, 120 insertions(+), 89 deletions(-)

diff --git a/client/coral-admin/src/components/CommentDeletedTombstone.js b/client/coral-admin/src/components/CommentDeletedTombstone.js
index db9a609b1..c04e97b88 100644
--- a/client/coral-admin/src/components/CommentDeletedTombstone.js
+++ b/client/coral-admin/src/components/CommentDeletedTombstone.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import styles from './CommentDeletedTombstone.css';
+import t from 'coral-framework/services/i18n';
 
 const CommentDeletedTombstone = () => (
-  <div className={styles.tombstone}>The comment was deleted.</div>
+  <div className={styles.tombstone}>{t('framework.comment_is_deleted')}</div>
 );
 
 export default CommentDeletedTombstone;
diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js
index f7a500203..41fb87b28 100644
--- a/client/coral-admin/src/components/UserDetailComment.js
+++ b/client/coral-admin/src/components/UserDetailComment.js
@@ -44,6 +44,19 @@ class UserDetailComment extends React.Component {
       body: comment.body,
     };
 
+    if (!comment.body) {
+      return (
+        <li
+          tabIndex={0}
+          className={cn(className, styles.root, {
+            [styles.rootSelected]: selected,
+          })}
+        >
+          <CommentDeletedTombstone />
+        </li>
+      );
+    }
+
     return (
       <li
         tabIndex={0}
@@ -84,53 +97,49 @@ class UserDetailComment extends React.Component {
               </Link>
             }
           </div>
-          {comment.body ? (
-            <CommentAnimatedEdit body={comment.body}>
-              <div className={styles.bodyContainer}>
-                <div className={styles.body}>
-                  <Slot
-                    fill="userDetailCommentContent"
-                    className={cn(
-                      styles.commentContent,
-                      'talk-admin-user-detail-comment'
-                    )}
-                    size={1}
-                    defaultComponent={AdminCommentContent}
-                    passthrough={slotPassthrough}
+          <CommentAnimatedEdit body={comment.body}>
+            <div className={styles.bodyContainer}>
+              <div className={styles.body}>
+                <Slot
+                  fill="userDetailCommentContent"
+                  className={cn(
+                    styles.commentContent,
+                    'talk-admin-user-detail-comment'
+                  )}
+                  size={1}
+                  defaultComponent={AdminCommentContent}
+                  passthrough={slotPassthrough}
+                />
+                <a
+                  className={styles.external}
+                  href={`${comment.asset.url}?commentId=${comment.id}`}
+                  target="_blank"
+                >
+                  <Icon name="open_in_new" /> {t('comment.view_context')}
+                </a>
+              </div>
+              <div className={styles.sideActions}>
+                <IfHasLink text={comment.body}>
+                  <span className={styles.hasLinks}>
+                    {/* TODO: translate string */}
+                    <Icon name="error_outline" /> Contains Link
+                  </span>
+                </IfHasLink>
+                <div className={styles.actions}>
+                  <ApproveButton
+                    active={comment.status === 'ACCEPTED'}
+                    onClick={this.approve}
+                    minimal
+                  />
+                  <RejectButton
+                    active={comment.status === 'REJECTED'}
+                    onClick={this.reject}
+                    minimal
                   />
-                  <a
-                    className={styles.external}
-                    href={`${comment.asset.url}?commentId=${comment.id}`}
-                    target="_blank"
-                  >
-                    <Icon name="open_in_new" /> {t('comment.view_context')}
-                  </a>
-                </div>
-                <div className={styles.sideActions}>
-                  <IfHasLink text={comment.body}>
-                    <span className={styles.hasLinks}>
-                      {/* TODO: translate string */}
-                      <Icon name="error_outline" /> Contains Link
-                    </span>
-                  </IfHasLink>
-                  <div className={styles.actions}>
-                    <ApproveButton
-                      active={comment.status === 'ACCEPTED'}
-                      onClick={this.approve}
-                      minimal
-                    />
-                    <RejectButton
-                      active={comment.status === 'REJECTED'}
-                      onClick={this.reject}
-                      minimal
-                    />
-                  </div>
                 </div>
               </div>
-            </CommentAnimatedEdit>
-          ) : (
-            <CommentDeletedTombstone />
-          )}
+            </div>
+          </CommentAnimatedEdit>
         </div>
         <CommentDetails root={root} comment={comment} />
       </li>
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index 2dc03a503..0f8f91a97 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -85,6 +85,10 @@
   font-weight: 300;
 }
 
+.deleted {
+  background-color: #f0f0f0;
+}
+
 .moderateArticle {
   font-size: 14px;
   margin: 10px 0;
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 137bd9381..97cdf9443 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -76,6 +76,27 @@ class Comment extends React.Component {
       asset: comment.asset,
     };
 
+    if (!comment.body) {
+      return (
+        <li
+          tabIndex={0}
+          className={cn(
+            className,
+            'mdl-card',
+            selectionStateCSS,
+            styles.root,
+            { [styles.selected]: selected, [styles.dangling]: dangling },
+            'talk-admin-moderate-comment',
+            styles.deleted
+          )}
+          id={`comment_${comment.id}`}
+          ref={this.handleRef}
+        >
+          <CommentDeletedTombstone />
+        </li>
+      );
+    }
+
     return (
       <li
         tabIndex={0}
@@ -134,52 +155,48 @@ class Comment extends React.Component {
               </Link>
             )}
           </div>
-          {comment.body ? (
-            <CommentAnimatedEdit body={comment.body}>
-              <div className={styles.itemBody}>
-                <div className={styles.body}>
-                  <Slot
-                    fill="adminCommentContent"
-                    className={cn(styles.commentContent, 'talk-admin-comment')}
-                    size={1}
-                    defaultComponent={AdminCommentContent}
-                    passthrough={{ ...slotPassthrough, ...formatterSettings }}
-                  />
-                  <div className={styles.commentContentFooter}>
-                    <a
-                      className={styles.external}
-                      href={`${comment.asset.url}?commentId=${comment.id}`}
-                      target="_blank"
-                    >
-                      <Icon name="open_in_new" /> {t('comment.view_context')}
-                    </a>
-                  </div>
-                </div>
-
-                <div className={styles.sideActions}>
-                  <IfHasLink text={comment.body}>
-                    <span className={styles.hasLinks}>
-                      {/* TODO: translate string */}
-                      <Icon name="error_outline" /> Contains Link
-                    </span>
-                  </IfHasLink>
-                  <div className={`actions ${styles.actions}`}>
-                    <ApproveButton
-                      active={comment.status === 'ACCEPTED'}
-                      onClick={this.approve}
-                    />
-                    <RejectButton
-                      active={comment.status === 'REJECTED'}
-                      onClick={this.reject}
-                    />
-                  </div>
-                  <Slot fill="adminSideActions" passthrough={slotPassthrough} />
+          <CommentAnimatedEdit body={comment.body}>
+            <div className={styles.itemBody}>
+              <div className={styles.body}>
+                <Slot
+                  fill="adminCommentContent"
+                  className={cn(styles.commentContent, 'talk-admin-comment')}
+                  size={1}
+                  defaultComponent={AdminCommentContent}
+                  passthrough={{ ...slotPassthrough, ...formatterSettings }}
+                />
+                <div className={styles.commentContentFooter}>
+                  <a
+                    className={styles.external}
+                    href={`${comment.asset.url}?commentId=${comment.id}`}
+                    target="_blank"
+                  >
+                    <Icon name="open_in_new" /> {t('comment.view_context')}
+                  </a>
                 </div>
               </div>
-            </CommentAnimatedEdit>
-          ) : (
-            <CommentDeletedTombstone />
-          )}
+
+              <div className={styles.sideActions}>
+                <IfHasLink text={comment.body}>
+                  <span className={styles.hasLinks}>
+                    {/* TODO: translate string */}
+                    <Icon name="error_outline" /> Contains Link
+                  </span>
+                </IfHasLink>
+                <div className={`actions ${styles.actions}`}>
+                  <ApproveButton
+                    active={comment.status === 'ACCEPTED'}
+                    onClick={this.approve}
+                  />
+                  <RejectButton
+                    active={comment.status === 'REJECTED'}
+                    onClick={this.reject}
+                  />
+                </div>
+                <Slot fill="adminSideActions" passthrough={slotPassthrough} />
+              </div>
+            </div>
+          </CommentAnimatedEdit>
         </div>
         <CommentDetails
           root={root}