Address Greptile deleted-comment feedback

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Dotta
2026-06-05 03:43:12 +00:00
parent cf0ec9933a
commit 1afa337841
5 changed files with 91 additions and 35 deletions
+9 -3
View File
@@ -1270,7 +1270,6 @@ describe("IssueChatThread", () => {
it("confirms and invokes delete only for the current user's normal comments", async () => {
const root = createRoot(container);
const onDeleteComment = vi.fn(async () => {});
const confirmSpy = vi.spyOn(window, "confirm").mockReturnValue(true);
act(() => {
root.render(
@@ -1324,10 +1323,17 @@ describe("IssueChatThread", () => {
deleteButtons[0]?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
});
expect(confirmSpy).toHaveBeenCalled();
expect(document.body.textContent).toContain("Delete comment?");
const confirmButton = Array.from(document.body.querySelectorAll("button"))
.find((button) => button.textContent === "Delete comment");
expect(confirmButton).toBeTruthy();
await act(async () => {
confirmButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
});
expect(onDeleteComment).toHaveBeenCalledWith("comment-owned");
confirmSpy.mockRestore();
act(() => {
root.unmount();
});
+40 -16
View File
@@ -1290,6 +1290,7 @@ function IssueChatUserMessage({
const deleted = Boolean(custom.deletedAt);
const queueTargetRunId = typeof custom.queueTargetRunId === "string" ? custom.queueTargetRunId : null;
const [copied, setCopied] = useState(false);
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
const {
isCurrentUser,
authorName: resolvedAuthorName,
@@ -1309,8 +1310,11 @@ function IssueChatUserMessage({
const canDeleteComment = Boolean(onDeleteComment && isCurrentUser && !queued && !pending && !deleted);
const handleDeleteComment = () => {
if (!canDeleteComment) return;
const confirmed = window.confirm("Delete this comment? This will replace it with a deleted-comment marker.");
if (!confirmed) return;
setDeleteDialogOpen(true);
};
const confirmDeleteComment = () => {
if (!canDeleteComment) return;
setDeleteDialogOpen(false);
void onDeleteComment?.(commentId);
};
const messageBody = (
@@ -1432,21 +1436,41 @@ function IssueChatUserMessage({
);
return (
<div id={anchorId}>
<div className={cn("group flex items-start gap-2.5", isCurrentUser && "justify-end")}>
{isCurrentUser ? (
<>
{messageBody}
{authorAvatar}
</>
) : (
<>
{authorAvatar}
{messageBody}
</>
)}
<>
<div id={anchorId}>
<div className={cn("group flex items-start gap-2.5", isCurrentUser && "justify-end")}>
{isCurrentUser ? (
<>
{messageBody}
{authorAvatar}
</>
) : (
<>
{authorAvatar}
{messageBody}
</>
)}
</div>
</div>
</div>
<Dialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
<DialogContent>
<DialogHeader>
<DialogTitle>Delete comment?</DialogTitle>
<DialogDescription>
This will replace the comment with a deleted-comment marker.
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button variant="outline" onClick={() => setDeleteDialogOpen(false)}>
Cancel
</Button>
<Button variant="destructive" onClick={confirmDeleteComment}>
Delete comment
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</>
);
}
-14
View File
@@ -2461,20 +2461,6 @@ export function IssueDetail() {
const cancelQueuedComment = useMutation({
mutationFn: async ({ commentId }: { commentId: string }) => issuesApi.cancelComment(issueId!, commentId),
onSuccess: (comment) => {
if (comment.deletedAt) {
upsertCommentInCache(comment);
clearCommentHashIfCurrent(comment.id);
invalidateIssueDetail();
invalidateIssueThreadLazily();
invalidateIssueCollections();
invalidateIssueDocumentAnnotationState();
pushToast({
title: "Comment deleted",
body: "The comment was replaced with a deleted marker.",
tone: "success",
});
return;
}
setLocallyQueuedCommentRunIds((current) => {
if (!current.has(comment.id)) return current;
const next = new Map(current);