feat: Support replies

Support replies to comments inside patches / issues and in inline comments

Signed-off-by: stelios maurommatakis <steliosmavr@cytech.gr>

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/issues/overview/IssueComponent.java

@@ -13,6 +13,7 @@
 import com.intellij.openapi.util.text.HtmlBuilder;
 import com.intellij.openapi.util.text.HtmlChunk;
 import com.intellij.ui.ColorUtil;
+import com.intellij.openapi.project.Project;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.panels.Wrapper;
 import com.intellij.util.ui.JBFont;
@@ -21,6 +22,7 @@
 import network.radicle.jetbrains.radiclejetbrainsplugin.RadicleBundle;
 import network.radicle.jetbrains.radiclejetbrainsplugin.icons.RadicleIcons;
 import network.radicle.jetbrains.radiclejetbrainsplugin.issues.overview.editor.IssueVirtualFile;
+import network.radicle.jetbrains.radiclejetbrainsplugin.models.Embed;
 import network.radicle.jetbrains.radiclejetbrainsplugin.models.Emoji;
 import network.radicle.jetbrains.radiclejetbrainsplugin.models.RadAuthor;
 import network.radicle.jetbrains.radiclejetbrainsplugin.models.RadDetails;
@@ -32,6 +34,7 @@
 import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.DragAndDropField;
 import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.EmojiPanel;
 import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.MarkDownEditorPaneFactory;
+import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.ReplyPanel;
 import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.Utils;
 
 import javax.swing.JComponent;
@@ -55,6 +58,7 @@ public class IssueComponent {
     private JPanel emojiJPanel;
     private EmojiPanel<RadIssue> emojiPanel;
     private final IssueVirtualFile  file;
+    private JComponent replyPanel;
 
     public IssueComponent(IssueVirtualFile file) {
         this.file = file;
@@ -110,19 +114,22 @@ public JComponent createCommentSection(List<RadDiscussion> discussionList) {
             var message = com.body;
             if (!Strings.isNullOrEmpty(com.replyTo) && !com.replyTo.equals(issueId)) {
                 var replyToMessage = findMessage(com.replyTo, discussionList);
-                message = "<div><div style=\"border-left: 2px solid black;\">" +
-                        " <div style=\"margin-left:10px\">" + replyToMessage + "</div>\n" +
-                        "</div><div style=\"margin-top:5px\">" + message + "</div></div>";
+                message = Utils.formatReplyMessage(message, replyToMessage);
             }
             var panel = new BorderLayoutPanel();
             panel.setOpaque(false);
             var editorPane = new MarkDownEditorPaneFactory(message, radIssue.project, radIssue.projectId, file);
             panel.addToCenter(StatusMessageComponentFactory.INSTANCE.create(editorPane.htmlEditorPane(), StatusMessageType.WARNING));
             emojiPanel = new IssueEmojiPanel(issueModel, com.reactions, com.id, radDetails);
+            var verticalPanel = getVerticalPanel(5);
+            verticalPanel.setOpaque(false);
             emojiJPanel = emojiPanel.getEmojiPanel();
-            panel.addToBottom(emojiJPanel);
+            verticalPanel.add(emojiJPanel);
+            replyPanel = new MyReplyPanel(radIssue.project, com, issueModel).getThreadActionsComponent();
+            verticalPanel.add(replyPanel);
+            panel.addToBottom(verticalPanel);
             var panelHandle = new EditablePanelHandler.PanelBuilder(radIssue.project, panel,
-                    RadicleBundle.message("save"), new SingleValueModel<>(message), (field) -> {
+                    RadicleBundle.message("save"), new SingleValueModel<>(com.body), (field) -> {
                 var edited = api.editIssueComment(radIssue, field.getText(), com.id, field.getEmbedList());
                 final boolean success = edited != null;
                 if (success) {
@@ -229,6 +236,24 @@ public JComponent getCommentSection() {
         return commentSection;
     }
 
+    public JComponent getReplyPanel() {
+        return replyPanel;
+    }
+
+    public class MyReplyPanel extends ReplyPanel<RadIssue> {
+
+        public MyReplyPanel(Project project, RadDiscussion radDiscussion,
+                            SingleValueModel<RadIssue> model) {
+            super(project, radDiscussion, model);
+        }
+
+        @Override
+        public boolean addReply(String comment, List<Embed> embedList, String replyToId) {
+            var res = api.addIssueComment(radIssue, comment, replyToId, embedList);
+            return res != null;
+        }
+    }
+
     public class IssueEmojiPanel extends EmojiPanel<RadIssue> {
         protected IssueEmojiPanel(SingleValueModel<RadIssue> model, List<Reaction> reactions, String discussionId, RadDetails radDetails) {
             super(model, reactions, discussionId, radDetails);

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/models/RadDiscussion.java

@@ -1,6 +1,7 @@
 package network.radicle.jetbrains.radiclejetbrainsplugin.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Strings;
 
 import java.time.Instant;
 import java.util.HashMap;
@@ -36,6 +37,10 @@ public boolean isReviewComment() {
         return location != null;
     }
 
+    public boolean isReply() {
+        return !Strings.isNullOrEmpty(replyTo);
+    }
+
     public Reaction findReaction(String emojiUnicode) {
         return reactions.stream().filter(r -> r.emoji().equals(emojiUnicode)).findFirst().orElse(null);
     }

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/models/RadPatch.java

@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.Set;
 
 public class RadPatch {
@@ -186,6 +187,12 @@ public List<Review> getReviews() {
             return myReviews;
         }
 
+        public List<RadDiscussion> getReviewComments(String filePath, String commitHash) {
+            return discussions.stream().filter(disc -> disc.isReviewComment() &&
+                            disc.location.path.equals(filePath) && disc.location.commit.equals(commitHash))
+                    .collect(Collectors.toList());
+        }
+
         public RadDiscussion findDiscussion(String commentId) {
             return discussions().stream().filter(disc -> disc.id.equals(commentId)).findFirst().orElse(null);
         }

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/review/ObservableThreadModel.java

@@ -12,6 +12,7 @@
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.ui.EDT;
 import git4idea.GitUtil;
+import network.radicle.jetbrains.radiclejetbrainsplugin.models.RadDiscussion;
 import network.radicle.jetbrains.radiclejetbrainsplugin.models.RadPatch;
 import network.radicle.jetbrains.radiclejetbrainsplugin.models.ThreadModel;
 import network.radicle.jetbrains.radiclejetbrainsplugin.services.RadicleProjectApi;
@@ -22,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.EventListener;
 import java.util.List;
+import java.util.Optional;
 
 public class ObservableThreadModel {
     private static final Logger logger = LoggerFactory.getLogger(ObservableThreadModel.class);
@@ -82,20 +84,47 @@ private List<LineRange> calculateModifiedLines() {
     }
 
     public List<ThreadModel> getInlineComments(RadPatch patch) {
-        var lastRevision = patch.revisions.get(patch.revisions.size() - 1);
-        var discussions = lastRevision.discussions().stream().filter(discussion -> discussion.isReviewComment() &&
-                (discussion.location.path.equals(getFilePath()) && discussion.location.commit.equals(getCommitHash()))).toList();
+        var lastRevision = patch.getLatestRevision();
+        var reviewComments = lastRevision.getReviewComments(getFilePath(), getCommitHash());
         var groupedDiscussions = new ArrayList<ThreadModel>();
-        for (var discussion : discussions) {
-            var line = discussion.location.start;
-            if (isCommentInModifiedLine(line)) {
-                var threadModel = new ThreadModel(line, discussion);
-                groupedDiscussions.add(threadModel);
+        for (var disc : reviewComments) {
+            var line = disc.location.start;
+            if (!isCommentInModifiedLine(line)) {
+                continue;
+            }
+            if (!disc.isReply()) {
+                addNewThread(groupedDiscussions, disc);
+            } else {
+                addToExistingThread(groupedDiscussions, disc);
             }
         }
         return groupedDiscussions;
     }
 
+    private void addNewThread(List<ThreadModel> groupedDiscussions, RadDiscussion discussion) {
+        var newThreadModel = new ThreadModel(discussion.location.start, discussion);
+        groupedDiscussions.add(newThreadModel);
+    }
+
+    private void addToExistingThread(List<ThreadModel> groupedDiscussions, RadDiscussion discussion) {
+        var existingThreadModel = findThreadModel(groupedDiscussions, discussion);
+        if (existingThreadModel.isPresent()) {
+            var threadModel = existingThreadModel.get();
+            threadModel.addRadDiscussion(discussion);
+        } else {
+            addNewThread(groupedDiscussions, discussion);
+        }
+    }
+
+    private Optional<ThreadModel> findThreadModel(List<ThreadModel> groupedDiscussions, RadDiscussion discussion) {
+        return groupedDiscussions.stream()
+                .filter(threadModel -> threadModel.getRadDiscussion()
+                        .stream()
+                        .anyMatch(radDiscussion -> radDiscussion.id.equals(discussion.replyTo)))
+                .findFirst();
+    }
+
+
     private void updateEditorCommentsUi(RadPatch patch) {
         var fetched = this.api.fetchPatch(patch.radProject.id, patch.repo, patch.id);
         boolean success = fetched != null;

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/review/PatchReviewThreadComponentFactory.java

@@ -1,16 +1,19 @@
 package network.radicle.jetbrains.radiclejetbrainsplugin.patches.review;
 
 import com.google.common.base.Strings;
+import com.google.protobuf.Any;
 import com.intellij.collaboration.ui.CollaborationToolsUIUtilKt;
 import com.intellij.collaboration.ui.SingleValueModel;
 import com.intellij.collaboration.ui.codereview.CodeReviewChatItemUIUtil;
+import com.intellij.collaboration.ui.codereview.ToggleableContainer;
 import com.intellij.collaboration.ui.codereview.comment.CodeReviewCommentUIUtil;
 import com.intellij.collaboration.ui.codereview.timeline.thread.TimelineThreadCommentsPanel;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.text.HtmlBuilder;
 import com.intellij.openapi.util.text.HtmlChunk;
 import com.intellij.ui.CollectionListModel;
 import com.intellij.ui.ColorUtil;
+import com.intellij.ui.components.labels.LinkLabel;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import kotlin.Unit;
@@ -23,9 +26,11 @@
 import network.radicle.jetbrains.radiclejetbrainsplugin.services.RadicleProjectApi;
 import network.radicle.jetbrains.radiclejetbrainsplugin.services.RadicleProjectService;
 import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.MarkDownEditorPaneFactory;
+import network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.Utils;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -55,6 +60,7 @@ public JComponent createThread(ThreadModel threadModel) {
         }
         var commentsPanel = new TimelineThreadCommentsPanel<>(listModel, this::createComponent, 0, 10);
         verticalPanel.add(commentsPanel);
+        verticalPanel.add(getThreadActionsComponent(threadModel));
         verticalPanel.setBorder(JBUI.Borders.empty(CodeReviewChatItemUIUtil.ComponentType.COMPACT.getInputPaddingInsets()));
         return CodeReviewCommentUIUtil.INSTANCE.createEditorInlayPanel(verticalPanel);
     }
@@ -65,6 +71,50 @@ public boolean deleteComment(RadDiscussion disc) {
         return res != null;
     }
 
+    public JComponent createUncollapsedThreadActionsComponent(ThreadModel threadModel) {
+        var panelHandle = new EditablePanelHandler.PanelBuilder(patch.project, new JPanel(),
+                RadicleBundle.message("reply", "Reply"),
+                new SingleValueModel<>(""), (field) -> {
+            var line = Integer.valueOf(threadModel.getLine());
+            var latestRev = threadModel.getRadDiscussion().get(threadModel.getRadDiscussion().size() - 1);
+            var location = new RadDiscussion.Location(threadsModel.getFilePath(), "ranges",
+                    threadsModel.getCommitHash(), line, line);
+            var res = this.api.addPatchComment(patch, field.getText(), latestRev.id, location, field.getEmbedList());
+            boolean success = res != null;
+            if (success) {
+                threadsModel.update(patch);
+            }
+            return success;
+        }).enableDragAndDrop(false).hideCancelAction(true).build();
+        panelHandle.showAndFocusEditor();
+        var builder = new CodeReviewChatItemUIUtil.Builder(CodeReviewChatItemUIUtil.ComponentType.COMPACT, integer ->
+                new SingleValueModel<>(RadicleIcons.DEFAULT_AVATAR), panelHandle.panel);
+        return builder.build();
+    }
+
+    public JComponent createCollapsedThreadActionComponent(ReplyAction replyAct) {
+        var reply = new LinkLabel<Any>(RadicleBundle.message("reply", "Reply"), null) {
+            @Override
+            public void doClick() {
+                replyAct.reply();
+            }
+        };
+        var horizontalPanel = CollaborationToolsUIUtilKt.HorizontalListPanel(CodeReviewCommentUIUtil.Actions.HORIZONTAL_GAP);
+        horizontalPanel.setBorder(JBUI.Borders.emptyLeft(CodeReviewChatItemUIUtil.ComponentType.COMPACT.getContentLeftShift() + 12));
+        horizontalPanel.add(reply);
+        return horizontalPanel;
+    }
+
+    public JComponent getThreadActionsComponent(ThreadModel myThreadsModel) {
+        var toggleModel = new SingleValueModel<>(false);
+        return ToggleableContainer.INSTANCE.create(toggleModel, () -> {
+            ReplyAction rep = () -> {
+                toggleModel.setValue(true);
+            };
+            return createCollapsedThreadActionComponent(rep);
+        }, () -> createUncollapsedThreadActionsComponent(myThreadsModel));
+    }
+
     private JComponent createComponent(RadDiscussion disc) {
         var editorPane = new MarkDownEditorPaneFactory(disc.body, patch.project, patch.radProject.id, patch.repo.getRoot());
         var panelHandle = new EditablePanelHandler.PanelBuilder(patch.project, editorPane.htmlEditorPane(),
@@ -100,7 +150,7 @@ private JComponent createComponent(RadDiscussion disc) {
         }
         var builder = new CodeReviewChatItemUIUtil.Builder(CodeReviewChatItemUIUtil.ComponentType.COMPACT, integer ->
                 new SingleValueModel<>(RadicleIcons.DEFAULT_AVATAR), panelHandle.panel);
-        var author = !Strings.isNullOrEmpty(disc.author.alias) ? disc.author.alias : disc.author.id;
+        var author = !Strings.isNullOrEmpty(disc.author.alias) ? disc.author.alias : Utils.formatDid(disc.author.id);
         var authorLink = HtmlChunk.link("#",
                 author).wrapWith(HtmlChunk.font(ColorUtil.toHtmlColor(UIUtil.getLabelForeground()))).bold();
         var titleText = new HtmlBuilder().append(authorLink)
@@ -109,4 +159,8 @@ private JComponent createComponent(RadDiscussion disc) {
         builder.withHeader(new JLabel(MarkDownEditorPaneFactory.wrapHtml(titleText.toString())), actionsPanel);
         return builder.build();
     }
+
+    public interface ReplyAction {
+        void reply();
+    }
 }

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/timeline/EditablePanelHandler.java

@@ -40,6 +40,7 @@ public class EditablePanelHandler {
     private final boolean allowDragAndDrop;
     private DragAndDropField dragAndDropField;
     private SingleValueModel<Boolean> isLoading = new SingleValueModel<>(false);
+    private OnCloseListener onCloseListener;
 
     public EditablePanelHandler(PanelBuilder builder) {
         this.closeEditorAfterSubmit = builder.closeEditorAfterSubmit;
@@ -142,6 +143,17 @@ public void hideEditor() {
         panel.revalidate();
         panel.repaint();
         editor = null;
+        if (onCloseListener != null) {
+            onCloseListener.onClose();
+        }
+    }
+
+    public interface OnCloseListener {
+        void onClose();
+    }
+
+    public void addOnCloseListener(OnCloseListener myListener) {
+        onCloseListener = myListener;
     }
 
     public static class PanelBuilder {