From ceca51c1bbf760ad5ec8760fa2d5fc9e3af8915b Mon Sep 17 00:00:00 2001
From: Thomas Scholtes <geigerzaehler@axiom.fm>
Date: Fri, 11 Jul 2025 16:41:01 +0200
Subject: [PATCH] Support deleting draft review comments

---
 src/components/Comment.svelte | 13 +++++++++----
 src/components/Diff.svelte    |  4 +++-
 src/components/Review.svelte  | 10 ++++++++++
 src/components/Thread.svelte  |  5 ++++-
 src/lib/draftReviewStorage.ts |  9 +++++++++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 9daeb334f..dc22d3eef 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -34,6 +34,7 @@
     emptyBodyTooltip?: string;
     editComment?: (body: string, embeds: Embed[]) => Promise<void>;
     reactOnComment?: (authors: Author[], reaction: string) => Promise<void>;
+    deleteComment?: () => Promise<void>;
     styleWidth?: string;
     // See `ExtendedTextarea`
     disableAttachments?: boolean | string;
@@ -55,6 +56,7 @@
     disallowEmptyBody = false,
     editComment,
     reactOnComment,
+    deleteComment,
     styleWidth,
     emptyBodyTooltip,
     disableAttachments,
@@ -122,9 +124,7 @@
     font-size: var(--font-size-small);
     color: var(--color-fill-gray);
   }
-  .edit-buttons {
-    display: flex;
-    gap: 0.25rem;
+  .icon-button {
     cursor: pointer;
   }
 </style>
@@ -157,10 +157,15 @@
       {/if}
       <div class="header-right">
         {#if editComment}
-          <div class="edit-buttons">
+          <div class="icon-button">
             <Icon name="pen" onclick={toggleEdit} />
           </div>
         {/if}
+        {#if deleteComment}
+          <div class="icon-button">
+            <Icon name="cross" onclick={deleteComment} />
+          </div>
+        {/if}
         {#if reactions && reactOnComment}
           <ReactionSelector
             popoverPositionRight="0"
diff --git a/src/components/Diff.svelte b/src/components/Diff.svelte
index d3351f411..c310d8346 100644
--- a/src/components/Diff.svelte
+++ b/src/components/Diff.svelte
@@ -21,6 +21,7 @@
       authors: Author[],
       reaction: string,
     ) => Promise<void>;
+    deleteComment?: (commentId: string) => Promise<void>;
     // Defaults to `true`.
     canReply?: boolean;
     // See `ExtendedTextarea`.
@@ -446,7 +447,8 @@
           roles.isDelegateOrAuthor,
           codeComments.config.publicKey,
           codeComments.repoDelegates.map(delegate => delegate.did),
-        )} />
+        )}
+        deleteComment={codeComments.deleteComment} />
     </div>
   {/if}
 
diff --git a/src/components/Review.svelte b/src/components/Review.svelte
index 19c0fc2b8..d55df9322 100644
--- a/src/components/Review.svelte
+++ b/src/components/Review.svelte
@@ -273,6 +273,15 @@
       await loadReview();
     }
   }
+
+  async function deleteDraftComment(commentId: string) {
+    if (!("draft" in review)) {
+      throw new Error("Cannot change comment status for draft review");
+    }
+
+    draftReviewStorage.deleteComment(review.id, commentId);
+    await loadReview();
+  }
 </script>
 
 <style>
@@ -478,6 +487,7 @@
       createComment,
       editComment,
       reactOnComment: "draft" in review ? undefined : reactOnComment,
+      deleteComment: "draft" in review ? deleteDraftComment : undefined,
       repoDelegates: repo.delegates,
       canReply: false,
       disableAttachments:
diff --git a/src/components/Thread.svelte b/src/components/Thread.svelte
index 313ba46ce..9364d8c71 100644
--- a/src/components/Thread.svelte
+++ b/src/components/Thread.svelte
@@ -32,6 +32,7 @@
       authors: Author[],
       reaction: string,
     ) => Promise<void>;
+    deleteComment?: (commentId: string) => Promise<void>;
     inline?: boolean;
   }
 
@@ -42,6 +43,7 @@
     editComment,
     createReply,
     reactOnComment,
+    deleteComment,
     inline = false,
   }: Props = $props();
 
@@ -152,7 +154,8 @@
       body={root.edits.slice(-1)[0].body}
       editComment={canEditComment(root.author.did) &&
         editComment?.bind(null, root.id)}
-      reactOnComment={reactOnComment?.bind(null, root.id)}>
+      reactOnComment={reactOnComment?.bind(null, root.id)}
+      deleteComment={deleteComment?.bind(null, root.id)}>
       {#snippet actions()}
         {#if createReply}
           <Icon name="reply" onclick={toggleReply} />
diff --git a/src/lib/draftReviewStorage.ts b/src/lib/draftReviewStorage.ts
index e5b6823aa..a6ac86a90 100644
--- a/src/lib/draftReviewStorage.ts
+++ b/src/lib/draftReviewStorage.ts
@@ -116,6 +116,15 @@ export const draftReviewStorage = {
     storage.value = draftPatches;
   },
 
+  deleteComment(id: string, commentId: string) {
+    const draftReviews = storage.value;
+    const index = draftReviews[id].comments.findIndex(
+      comment => comment.id === commentId,
+    );
+    draftReviews[id].comments.splice(index, 1);
+    storage.value = draftReviews;
+  },
+
   addComment(
     id: string,
     comment: {