Skip to content

The Unified and Autonomous Development Platform

Some usability improvements

Robin Shen3381383bf1f2
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
index 99a9ebb58f..f9c6491c5c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
@@ -5,6 +5,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
@@ -37,6 +38,8 @@ public interface UrlManager {
String urlFor(CodeCommentReply reply);
+ String urlFor(CodeCommentStatusChange change);
+
String cloneUrlFor(Project project, boolean ssh);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
index 819799cfc9..6eed88893d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java
@@ -6,8 +6,11 @@ import javax.inject.Singleton;
import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.event.codecomment.CodeCommentStatusChanged;
+import io.onedev.server.event.pullrequest.PullRequestCodeCommentStatusChanged;
+import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -32,19 +35,29 @@ public class DefaultCodeCommentStatusChangeManager extends BaseEntityManager<Cod
@Transactional
@Override
public void save(CodeCommentStatusChange change, String note) {
- change.getComment().setResolved(change.isResolved());
+ CodeComment comment = change.getComment();
+ comment.setResolved(change.isResolved());
+
dao.persist(change);
if (note != null) {
CodeCommentReply reply = new CodeCommentReply();
- reply.setComment(change.getComment());
+ reply.setComment(comment);
reply.setCompareContext(change.getCompareContext());
reply.setContent(note);
reply.setDate(change.getDate());
reply.setUser(change.getUser());
dao.persist(reply);
+
+ comment.setReplyCount(comment.getReplyCount()+1);
}
listenerRegistry.post(new CodeCommentStatusChanged(change, note));
+
+ PullRequest request = comment.getCompareContext().getPullRequest();
+ if (request != null) {
+ request.setCommentCount(request.getCommentCount()+1);
+ listenerRegistry.post(new PullRequestCodeCommentStatusChanged(request, change, note));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
index 0a805b4ed5..6d5ee73260 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
@@ -16,6 +16,7 @@ import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentReplied;
+import io.onedev.server.event.codecomment.CodeCommentStatusChanged;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.event.issue.IssueChanged;
import io.onedev.server.event.issue.IssueCommented;
@@ -263,6 +264,12 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {
addReferenceChange(event.getComment(), event.getReply().getContent());
}
+ @Transactional
+ @Listen
+ public void on(CodeCommentStatusChanged event) {
+ addReferenceChange(event.getComment(), event.getNote());
+ }
+
@Transactional
@Listen
public void on(PullRequestOpened event) {
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
index 8240e2aa67..0e64dba9d1 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
@@ -15,7 +15,7 @@ public class CodeCommentCreated extends CodeCommentEvent {
@Override
public String getActivity() {
- return "commented";
+ return "added";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
index eb1e706935..cca034ceca 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
@@ -22,7 +22,7 @@ public class CodeCommentReplied extends CodeCommentEvent {
@Override
public String getActivity() {
- return "replied comment";
+ return "replied";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.java
deleted file mode 100644
index 76a88ec897..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.event.codecomment;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.CodeCommentStatusChange;
-
-public class CodeCommentResolved extends CodeCommentStatusChanged {
-
- public CodeCommentResolved(CodeCommentStatusChange change, @Nullable String note) {
- super(change, note);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
index 72df7c4ca3..8b8acc7763 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
@@ -20,6 +20,11 @@ public class CodeCommentStatusChanged extends CodeCommentEvent {
return change;
}
+ @Override
+ public String getMarkdown() {
+ return getNote();
+ }
+
@Nullable
public String getNote() {
return note;
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.java
deleted file mode 100644
index c7ee3aa682..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.event.codecomment;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.CodeCommentStatusChange;
-
-public class CodeCommentUnresolved extends CodeCommentStatusChanged {
-
- public CodeCommentUnresolved(CodeCommentStatusChange change, @Nullable String note) {
- super(change, note);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
index 0ae881b9a5..abe3edddcf 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
@@ -18,7 +18,7 @@ public class CodeCommentUpdated extends CodeCommentEvent {
@Override
public String getActivity() {
- return "updated comment";
+ return "updated";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java
new file mode 100644
index 0000000000..077f5d06f5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java
@@ -0,0 +1,37 @@
+package io.onedev.server.event.pullrequest;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.PullRequest;
+
+public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentEvent {
+
+ private final CodeCommentStatusChange change;
+
+ private final String note;
+
+ public PullRequestCodeCommentStatusChanged(PullRequest request, CodeCommentStatusChange change, @Nullable String note) {
+ super(change.getUser(), change.getDate(), request, change.getComment());
+ this.change = change;
+ this.note = note;
+ }
+
+ public CodeCommentStatusChange getChange() {
+ return change;
+ }
+
+ @Override
+ public String getMarkdown() {
+ return note;
+ }
+
+ @Override
+ public String getActivity() {
+ if (change.isResolved())
+ return "resolved code comment";
+ else
+ return "unresolved code comment";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 4e5478e095..44b3a92c99 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -520,6 +520,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return UNKNOWN_ID.equals(getId());
}
+ public boolean isOrdinary() {
+ return getId() > 0;
+ }
+
public Collection<UserAuthorization> getAuthorizations() {
return authorizations;
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index dd28a795d6..80024f3954 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -1,10 +1,14 @@
package io.onedev.server.notification;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import io.onedev.commons.loader.Listen;
import io.onedev.server.entitymanager.SettingManager;
@@ -13,9 +17,10 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentReplied;
+import io.onedev.server.event.codecomment.CodeCommentStatusChanged;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.MentionParser;
-import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
@@ -40,39 +45,58 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- if (event.getComment().getCompareContext().getPullRequest() == null) {
+ CodeComment comment = event.getComment();
+ if (comment.getCompareContext().getPullRequest() == null) {
String markdown = event.getMarkdown();
String renderedMarkdown = markdownManager.render(markdown);
String processedMarkdown = markdownManager.process(renderedMarkdown, event.getProject(), null, true);
+ Collection<User> notifyUsers = new HashSet<>();
+
+ notifyUsers.add(comment.getUser());
+ notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));
+ notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));
+
for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {
User user = userManager.findByName(userName);
- if (user != null) {
- String url;
- if (event instanceof CodeCommentCreated)
- url = urlManager.urlFor(event.getComment());
- else if (event instanceof CodeCommentReplied)
- url = urlManager.urlFor(((CodeCommentReplied)event).getReply());
- else
- url = null;
+ if (user != null)
+ notifyUsers.add(user);
+ }
+
+ Set<String> emailAddresses = notifyUsers.stream()
+ .filter(it-> it.isOrdinary()
+ && !it.equals(event.getUser())
+ && it.getPrimaryEmailAddress() != null
+ && it.getPrimaryEmailAddress().isVerified())
+ .map(it->it.getPrimaryEmailAddress().getValue())
+ .collect(Collectors.toSet());
+
+ if (!emailAddresses.isEmpty()) {
+ String url;
+ if (event instanceof CodeCommentCreated)
+ url = urlManager.urlFor(comment);
+ else if (event instanceof CodeCommentReplied)
+ url = urlManager.urlFor(((CodeCommentReplied)event).getReply());
+ else if (event instanceof CodeCommentStatusChanged)
+ url = urlManager.urlFor(((CodeCommentStatusChanged)event).getChange());
+ else
+ url = null;
+
+ if (url != null) {
+ String subject = String.format("[Code Comment] %s:%s",
+ event.getProject().getPath(), comment.getMark().getPath());
+
+ String summary = String.format("%s %s code comment",
+ event.getUser().getDisplayName(), event.getActivity());
- if (url != null) {
- String subject = String.format("[Code Comment] (Mentioned You) %s:%s",
- event.getProject().getPath(), event.getComment().getMark().getPath());
- String summary = String.format("%s added code comment",
- event.getUser().getDisplayName());
- String threadingReferences = "<" + event.getComment().getProject().getPath()
- + "-codecomment-" + event.getComment().getId() + "@onedev>";
+ String threadingReferences = "<" + comment.getProject().getPath()
+ + "-codecomment-" + comment.getId() + "@onedev>";
- EmailAddress emailAddress = user.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()), Lists.newArrayList(),
- Lists.newArrayList(), subject,
- getHtmlBody(event, summary, processedMarkdown, url, false, null),
- getTextBody(event, summary, markdown, url, false, null),
- null, threadingReferences);
- }
- }
+ mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
+ Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, processedMarkdown, url, false, null),
+ getTextBody(event, summary, markdown, url, false, null),
+ null, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index 1b9ce6e493..de05ba78da 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -17,6 +17,7 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
@@ -63,6 +64,11 @@ public class DefaultUrlManager implements UrlManager {
return urlFor(reply.getComment(), reply.getCompareContext()) + "#" + reply.getAnchor();
}
+ @Override
+ public String urlFor(CodeCommentStatusChange change) {
+ return urlFor(change.getComment(), change.getCompareContext()) + "#" + change.getAnchor();
+ }
+
private String urlFor(CodeComment comment, CompareContext compareContext) {
Project project = comment.getProject();
PullRequest request = compareContext.getPullRequest();
@@ -111,7 +117,7 @@ public class DefaultUrlManager implements UrlManager {
ProjectBlobPage.fillParams(params, state);
- return url + "/blob/" + paramsEncoder.encodePageParameters(params);
+ return url + "/files/" + paramsEncoder.encodePageParameters(params);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
index 70a305353d..ae5b5163c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
@@ -25,15 +25,12 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="commentOrReplyEditFrag">
- <div class="user-avatar flex-shrink-0"><a wicket:id="userAvatar"></a></div>
- <div class="detail ml-3 flex-grow-1">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="content" class="mb-3"></div>
- <button wicket:id="save" class="btn btn-sm btn-primary mr-1"><span wicket:id="label"/></button>
- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
- </form>
- </div>
+ <form wicket:id="form" class="leave-confirm flex-grow-1">
+ <div wicket:id="feedback" class="feedback"></div>
+ <div wicket:id="content" class="mb-3"></div>
+ <button wicket:id="save" class="btn btn-sm btn-primary mr-1"><span wicket:id="label"/></button>
+ <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
+ </form>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
<a wicket:id="reply" class="btn btn-sm btn-outline-secondary mr-2">Reply</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 9c470baab3..c90049fa94 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -3,8 +3,6 @@ package io.onedev.server.web.component.codecomment;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -58,7 +56,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.UrlUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.asset.caret.CaretResourceReference;
+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.MarkdownViewer;
@@ -155,7 +153,6 @@ public abstract class CodeCommentPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
Fragment editFragment = new Fragment(viewFragment.getId(), "commentOrReplyEditFrag", CodeCommentPanel.this);
- editFragment.add(new UserIdentPanel("userAvatar", getComment().getUser(), Mode.AVATAR));
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
@@ -439,43 +436,16 @@ public abstract class CodeCommentPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new CaretResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));
}
private void onAddReply(AjaxRequestTarget target, @Nullable Boolean resolved) {
Fragment editFragment = new Fragment("actions", "commentOrReplyEditFrag", CodeCommentPanel.this);
- editFragment.add(new UserIdentPanel("userAvatar", SecurityUtils.getUser(), Mode.AVATAR));
Form<?> form = new Form<Void>("form");
- String initialContent = "";
-
- if (getComment().getCompareContext().getPullRequest() == null) {
- // automatically adds mentioning if the code comment is not associated with any pull requests,
- // as otherwise no one will be aware of our comment
- List<CodeCommentReply> replies = new ArrayList<>(getComment().getReplies());
- Collections.sort(replies, new Comparator<CodeCommentReply>() {
-
- @Override
- public int compare(CodeCommentReply o1, CodeCommentReply o2) {
- return o2.getDate().compareTo(o1.getDate());
- }
-
- });
- for (CodeCommentReply reply: replies) {
- if (reply.getUser() != null && !reply.getUser().equals(SecurityUtils.getUser())) {
- initialContent = "@" + reply.getUser().getName() + " ";
- break;
- }
- }
- if (initialContent.length() == 0
- && getComment().getUser() != null
- && !getComment().getUser().equals(SecurityUtils.getUser())) {
- initialContent = "@" + getComment().getUser().getName() + " ";
- }
- }
- CommentInput contentInput = new CommentInput("content", Model.of(initialContent), true) {
+ CommentInput contentInput = new CommentInput("content", Model.of(""), true) {
@Override
protected AttachmentSupport getAttachmentSupport() {
@@ -583,8 +553,11 @@ public abstract class CodeCommentPanel extends Panel {
get("actions").replaceWith(editFragment);
target.add(editFragment);
- String script = String.format("$('#%s textarea').caret(%d);",
- form.getMarkupId(), initialContent.length());
+ String script = String.format(""
+ + "setTimeout(function() {"
+ + " $('#%s').scrollIntoView();"
+ + "}, 0);",
+ saveButton.getMarkupId());
target.appendJavaScript(script);
}
@@ -646,6 +619,7 @@ public abstract class CodeCommentPanel extends Panel {
fragment.add(new WebMarkupContainer("context").setVisible(false));
}
fragment.add(AttributeAppender.append("class", "status-change"));
+ fragment.setMarkupId(getChange().getAnchor());
fragment.setOutputMarkupId(true);
@@ -749,7 +723,6 @@ public abstract class CodeCommentPanel extends Panel {
Fragment editFragment = new Fragment(viewFragment.getId(),
"commentOrReplyEditFrag", CodeCommentPanel.this,
Model.of(replyId));
- editFragment.add(new UserIdentPanel("userAvatar", getReply().getUser(), Mode.AVATAR));
Form<?> form = new Form<Void>("form");
CommentInput contentInput = new CommentInput("content", Model.of(getReply().getContent()), true) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 53b2f500e3..ecbd4941c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -253,16 +253,6 @@ public abstract class IssueActivitiesPanel extends Panel {
input.clearMarkdown();
- @SuppressWarnings("deprecation")
- Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new IssueCommentedActivity(comment));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
- target.prependJavaScript(script);
- target.add(newActivityRow);
-
target.add(fragment);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index a1388389f1..2af2515f8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -167,11 +167,7 @@
resize: none;
padding: 0.6rem;
border-radius: 0;
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 4px;
+ margin-bottom: 4px;
}
.markdown-editor>.body>.preview>.markdown-rendered>.message {
color: var(--gray);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 87d45373cf..1461316299 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -312,16 +312,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
input.clearMarkdown();
target.add(fragment);
-
- @SuppressWarnings("deprecation")
- Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new PullRequestCommentedActivity(comment));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
- target.prependJavaScript(script);
- target.add(newActivityRow);
}
@Override