From 06e68fca4af22831fc0815eab74ef11335cf1ef6 Mon Sep 17 00:00:00 2001
From: ilya-bkv <i.yablokov@ccmp.me>
Date: Thu, 9 Mar 2023 19:19:28 +0300
Subject: [PATCH] [146] resolve conversation

---
 src/components/Article/Comment.tsx              |  1 -
 src/components/Article/CommentRatingControl.tsx | 13 +++++++++----
 src/utils/clone.ts                              |  3 +++
 src/utils/jsonParse.ts                          |  5 -----
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 src/utils/clone.ts
 delete mode 100644 src/utils/jsonParse.ts

diff --git a/src/components/Article/Comment.tsx b/src/components/Article/Comment.tsx
index 8fe8dce5..21942340 100644
--- a/src/components/Article/Comment.tsx
+++ b/src/components/Article/Comment.tsx
@@ -97,7 +97,6 @@ export const Comment = (props: Props) => {
   return (
     <li class={clsx(styles.comment, { [styles.isNew]: !isCommentAuthor() && createdAt > props.lastSeen })}>
       <Show when={!!body()}>
-        <div style={{ color: 'red' }}>{comment().id}</div>
         <div class={styles.commentContent}>
           <Show
             when={!props.compact}
diff --git a/src/components/Article/CommentRatingControl.tsx b/src/components/Article/CommentRatingControl.tsx
index 9ae4f8d8..109200f4 100644
--- a/src/components/Article/CommentRatingControl.tsx
+++ b/src/components/Article/CommentRatingControl.tsx
@@ -30,7 +30,8 @@ export const CommentRatingControl = (props: Props) => {
     )
   const isUpvoted = createMemo(() => checkReaction(ReactionKind.Like))
   const isDownvoted = createMemo(() => checkReaction(ReactionKind.Dislike))
-  const canVote = userSlug() !== props.comment.createdBy.slug
+  const canVote = createMemo(() => userSlug() !== props.comment.createdBy.slug)
+
   const shoutRatingReactions = createMemo(() =>
     Object.values(reactionEntities).filter(
       (r) =>
@@ -56,7 +57,6 @@ export const CommentRatingControl = (props: Props) => {
     } else if (isDownvoted()) {
       await deleteCommentReaction(ReactionKind.Dislike)
     } else {
-      console.log('!!! createReaction:')
       await createReaction({
         kind: isUpvote ? ReactionKind.Like : ReactionKind.Dislike,
         shout: props.comment.shout.id,
@@ -72,8 +72,11 @@ export const CommentRatingControl = (props: Props) => {
 
   return (
     <div class={styles.commentRating}>
+      {!canVote()}
       <button
-        onClick={() => canVote && handleRatingChange(true)}
+        role="button"
+        disabled={!canVote() || !userSlug()}
+        onClick={() => handleRatingChange(true)}
         class={clsx(styles.commentRatingControl, styles.commentRatingControlUp, {
           [styles.voted]: isUpvoted()
         })}
@@ -102,7 +105,9 @@ export const CommentRatingControl = (props: Props) => {
         </ul>
       </Popup>
       <button
-        onClick={() => canVote && handleRatingChange(false)}
+        role="button"
+        disabled={!canVote() || !userSlug()}
+        onClick={() => handleRatingChange(false)}
         class={clsx(styles.commentRatingControl, styles.commentRatingControlDown, {
           [styles.voted]: isDownvoted()
         })}
diff --git a/src/utils/clone.ts b/src/utils/clone.ts
new file mode 100644
index 00000000..b6f4242b
--- /dev/null
+++ b/src/utils/clone.ts
@@ -0,0 +1,3 @@
+// debug nested objects console.log('message', clone(obj))
+
+export const clone = <T>(obj: T) => JSON.parse(JSON.stringify(obj))
diff --git a/src/utils/jsonParse.ts b/src/utils/jsonParse.ts
deleted file mode 100644
index ae582d55..00000000
--- a/src/utils/jsonParse.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const jsonParse = <T>(obj: T) => JSON.parse(JSON.stringify(obj))
-
-export const jsonParseLog = <T>(msg: string, obj: T) => {
-  console.log(`${msg}: `, JSON.parse(JSON.stringify(obj)))
-}