From ee3e83eec154c906e8668a126bb39c56a053d49a Mon Sep 17 00:00:00 2001
From: Jimmy Praet <jimmy.praet@telenet.be>
Date: Wed, 24 Jan 2024 04:26:28 +0100
Subject: [PATCH] Don't reload timeline page when (un)resolving or replying
conversation (#28654)
Fixes #15981
---
routers/web/repo/pull_review.go | 32 ++---
.../repo/issue/view_content/comments.tmpl | 134 +-----------------
.../repo/issue/view_content/conversation.tmpl | 133 +++++++++++++++++
web_src/css/review.css | 2 +-
4 files changed, 151 insertions(+), 150 deletions(-)
create mode 100644 templates/repo/issue/view_content/conversation.tmpl
diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go
index 1359af9d3b..156b70a999 100644
--- a/routers/web/repo/pull_review.go
+++ b/routers/web/repo/pull_review.go
@@ -21,8 +21,9 @@ import (
)
const (
- tplConversation base.TplName = "repo/diff/conversation"
- tplNewComment base.TplName = "repo/diff/new_comment"
+ tplDiffConversation base.TplName = "repo/diff/conversation"
+ tplTimelineConversation base.TplName = "repo/issue/view_content/conversation"
+ tplNewComment base.TplName = "repo/diff/new_comment"
)
// RenderNewCodeCommentForm will render the form for creating a new review comment
@@ -97,11 +98,7 @@ func CreateCodeComment(ctx *context.Context) {
log.Trace("Comment created: %-v #%d[%d] Comment[%d]", ctx.Repo.Repository, issue.Index, issue.ID, comment.ID)
- if form.Origin == "diff" {
- renderConversation(ctx, comment)
- return
- }
- ctx.Redirect(comment.Link(ctx))
+ renderConversation(ctx, comment, form.Origin)
}
// UpdateResolveConversation add or remove an Conversation resolved mark
@@ -152,22 +149,21 @@ func UpdateResolveConversation(ctx *context.Context) {
return
}
- if origin == "diff" {
- renderConversation(ctx, comment)
- return
- }
- ctx.JSONOK()
+ renderConversation(ctx, comment, origin)
}
-func renderConversation(ctx *context.Context, comment *issues_model.Comment) {
+func renderConversation(ctx *context.Context, comment *issues_model.Comment, origin string) {
comments, err := issues_model.FetchCodeCommentsByLine(ctx, comment.Issue, ctx.Doer, comment.TreePath, comment.Line, ctx.Data["ShowOutdatedComments"].(bool))
if err != nil {
ctx.ServerError("FetchCodeCommentsByLine", err)
return
}
- ctx.Data["PageIsPullFiles"] = true
+ ctx.Data["PageIsPullFiles"] = (origin == "diff")
ctx.Data["comments"] = comments
- ctx.Data["CanMarkConversation"] = true
+ if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, comment.Issue, ctx.Doer); err != nil {
+ ctx.ServerError("CanMarkConversation", err)
+ return
+ }
ctx.Data["Issue"] = comment.Issue
if err = comment.Issue.LoadPullRequest(ctx); err != nil {
ctx.ServerError("comment.Issue.LoadPullRequest", err)
@@ -179,7 +175,11 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment) {
return
}
ctx.Data["AfterCommitID"] = pullHeadCommitID
- ctx.HTML(http.StatusOK, tplConversation)
+ if origin == "diff" {
+ ctx.HTML(http.StatusOK, tplDiffConversation)
+ } else if origin == "timeline" {
+ ctx.HTML(http.StatusOK, tplTimelineConversation)
+ }
}
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 817f20af20..ad7b836e9c 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -460,139 +460,7 @@
<div class="timeline-item event">
{{range $filename, $lines := .Review.CodeComments}}
{{range $line, $comms := $lines}}
- <div class="ui segments">
- <div class="ui segment collapsible-comment-box gt-py-3 gt-df gt-ac gt-sb">
- {{$invalid := (index $comms 0).Invalidated}}
- {{$resolved := (index $comms 0).IsResolved}}
- {{$resolveDoer := (index $comms 0).ResolveDoer}}
- {{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}}
- <div class="gt-df gt-ac">
- <a href="{{(index $comms 0).CodeCommentLink ctx}}" class="file-comment gt-ml-3 gt-word-break">{{$filename}}</a>
- {{if $invalid}}
- <span class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
- {{ctx.Locale.Tr "repo.issues.review.outdated"}}
- </span>
- {{end}}
- </div>
- <div>
- {{if or $invalid $resolved}}
- <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if not $resolved}}gt-hidden {{end}}ui compact labeled button show-outdated gt-df gt-ac">
- {{svg "octicon-unfold" 16 "gt-mr-3"}}
- {{if $resolved}}
- {{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
- {{else}}
- {{ctx.Locale.Tr "repo.issues.review.show_outdated"}}
- {{end}}
- </button>
- <button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if $resolved}}gt-hidden {{end}}ui compact labeled button hide-outdated gt-df gt-ac">
- {{svg "octicon-fold" 16 "gt-mr-3"}}
- {{if $resolved}}
- {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}}
- {{else}}
- {{ctx.Locale.Tr "repo.issues.review.hide_outdated"}}
- {{end}}
- </button>
- {{end}}
- </div>
- </div>
- {{$diff := (CommentMustAsDiff ctx (index $comms 0))}}
- {{if $diff}}
- {{$file := (index $diff.Files 0)}}
- <div id="code-preview-{{(index $comms 0).ID}}" class="ui table segment{{if $resolved}} gt-hidden{{end}}">
- <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
- <div class="file-body file-code code-view code-diff code-diff-unified unicode-escaped">
- <table>
- <tbody>
- {{template "repo/diff/section_unified" dict "file" $file "root" $}}
- </tbody>
- </table>
- </div>
- </div>
- </div>
- {{end}}
- <div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} gt-hidden{{end}}">
- <div class="ui comments gt-mb-0">
- {{range $comms}}
- {{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
- <div class="comment code-comment gt-pb-4" id="{{.HashTag}}">
- <div class="content">
- <div class="header comment-header">
- <div class="comment-header-left gt-df gt-ac">
- {{if not .OriginalAuthor}}
- <a class="avatar">
- {{ctx.AvatarUtils.Avatar .Poster 20}}
- </a>
- {{end}}
- <span class="text grey muted-links">
- {{if .OriginalAuthor}}
- <span class="text black gt-font-semibold">
- {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
- {{.OriginalAuthor}}
- </span>
- <span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
- <span class="text migrate">({{ctx.Locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
- {{else}}
- {{template "shared/user/authorlink" .Poster}}
- {{end}}
- {{ctx.Locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}}
- </span>
- </div>
- <div class="comment-header-right actions gt-df gt-ac">
- {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
- {{if not $.Repository.IsArchived}}
- {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
- {{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
- {{end}}
- </div>
- </div>
- <div class="text comment-content">
- <div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
- {{if .RenderedContent}}
- {{.RenderedContent|Str2html}}
- {{else}}
- <span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
- {{end}}
- </div>
- <div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div>
- <div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
- </div>
- {{$reactions := .Reactions.GroupByType}}
- {{if $reactions}}
- {{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
- {{end}}
- </div>
- </div>
- {{end}}
- </div>
- <div class="code-comment-buttons gt-df gt-ac gt-fw gt-mt-3 gt-mb-2 gt-mx-3">
- <div class="gt-f1">
- {{if $resolved}}
- <div class="ui grey text">
- {{svg "octicon-check" 16 "gt-mr-2"}}
- <b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
- </div>
- {{end}}
- </div>
- <div class="code-comment-buttons-buttons">
- {{if and $.CanMarkConversation $isNotPending}}
- <button class="ui tiny basic button resolve-conversation" data-origin="timeline" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $comms 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
- {{if $resolved}}
- {{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}}
- {{else}}
- {{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}}
- {{end}}
- </button>
- {{end}}
- {{if and $.SignedUserID (not $.Repository.IsArchived)}}
- <button class="comment-form-reply ui primary tiny labeled icon button gt-ml-2 gt-mr-0">
- {{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}}
- </button>
- {{end}}
- </div>
- </div>
- {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $comms 0).ReviewID "root" $ "comment" (index $comms 0)}}
- </div>
- </div>
+ {{template "repo/issue/view_content/conversation" dict "." $ "comments" $comms}}
{{end}}
{{end}}
</div>
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
new file mode 100644
index 0000000000..c9e5ee6275
--- /dev/null
+++ b/templates/repo/issue/view_content/conversation.tmpl
@@ -0,0 +1,133 @@
+{{$invalid := (index .comments 0).Invalidated}}
+{{$resolved := (index .comments 0).IsResolved}}
+{{$resolveDoer := (index .comments 0).ResolveDoer}}
+{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
+<div class="ui segments conversation-holder">
+ <div class="ui segment collapsible-comment-box gt-py-3 gt-df gt-ac gt-sb">
+ <div class="gt-df gt-ac">
+ <a href="{{(index .comments 0).CodeCommentLink ctx}}" class="file-comment gt-ml-3 gt-word-break">{{(index .comments 0).TreePath}}</a>
+ {{if $invalid}}
+ <span class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
+ {{ctx.Locale.Tr "repo.issues.review.outdated"}}
+ </span>
+ {{end}}
+ </div>
+ <div>
+ {{if or $invalid $resolved}}
+ <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if not $resolved}}gt-hidden {{end}}ui compact labeled button show-outdated gt-df gt-ac">
+ {{svg "octicon-unfold" 16 "gt-mr-3"}}
+ {{if $resolved}}
+ {{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
+ {{else}}
+ {{ctx.Locale.Tr "repo.issues.review.show_outdated"}}
+ {{end}}
+ </button>
+ <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if $resolved}}gt-hidden {{end}}ui compact labeled button hide-outdated gt-df gt-ac">
+ {{svg "octicon-fold" 16 "gt-mr-3"}}
+ {{if $resolved}}
+ {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}}
+ {{else}}
+ {{ctx.Locale.Tr "repo.issues.review.hide_outdated"}}
+ {{end}}
+ </button>
+ {{end}}
+ </div>
+ </div>
+ {{$diff := (CommentMustAsDiff ctx (index .comments 0))}}
+ {{if $diff}}
+ {{$file := (index $diff.Files 0)}}
+ <div id="code-preview-{{(index .comments 0).ID}}" class="ui table segment{{if $resolved}} gt-hidden{{end}}">
+ <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
+ <div class="file-body file-code code-view code-diff code-diff-unified unicode-escaped">
+ <table>
+ <tbody>
+ {{template "repo/diff/section_unified" dict "file" $file "root" $}}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ {{end}}
+ <div id="code-comments-{{(index .comments 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} gt-hidden{{end}}">
+ <div class="ui comments gt-mb-0">
+ {{range .comments}}
+ {{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+ <div class="comment code-comment gt-pb-4" id="{{.HashTag}}">
+ <div class="content">
+ <div class="header comment-header">
+ <div class="comment-header-left gt-df gt-ac">
+ {{if not .OriginalAuthor}}
+ <a class="avatar">
+ {{ctx.AvatarUtils.Avatar .Poster 20}}
+ </a>
+ {{end}}
+ <span class="text grey muted-links">
+ {{if .OriginalAuthor}}
+ <span class="text black gt-font-semibold">
+ {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
+ {{.OriginalAuthor}}
+ </span>
+ <span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
+ <span class="text migrate">({{ctx.Locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
+ {{else}}
+ {{template "shared/user/authorlink" .Poster}}
+ {{end}}
+ {{ctx.Locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}}
+ </span>
+ </div>
+ <div class="comment-header-right actions gt-df gt-ac">
+ {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
+ {{if not $.Repository.IsArchived}}
+ {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
+ {{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
+ {{end}}
+ </div>
+ </div>
+ <div class="text comment-content">
+ <div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
+ {{if .RenderedContent}}
+ {{.RenderedContent|Str2html}}
+ {{else}}
+ <span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
+ {{end}}
+ </div>
+ <div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div>
+ <div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
+ </div>
+ {{$reactions := .Reactions.GroupByType}}
+ {{if $reactions}}
+ {{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
+ {{end}}
+ </div>
+ </div>
+ {{end}}
+ </div>
+ <div class="code-comment-buttons gt-df gt-ac gt-fw gt-mt-3 gt-mb-2 gt-mx-3">
+ <div class="gt-f1">
+ {{if $resolved}}
+ <div class="ui grey text">
+ {{svg "octicon-check" 16 "gt-mr-2"}}
+ <b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
+ </div>
+ {{end}}
+ </div>
+ <div class="code-comment-buttons-buttons">
+ {{if and $.CanMarkConversation $isNotPending}}
+ <button class="ui tiny basic button resolve-conversation" data-origin="timeline" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
+ {{if $resolved}}
+ {{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}}
+ {{else}}
+ {{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}}
+ {{end}}
+ </button>
+ {{end}}
+ {{if and $.SignedUserID (not $.Repository.IsArchived)}}
+ <button class="comment-form-reply ui primary tiny labeled icon button gt-ml-2 gt-mr-0">
+ {{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}}
+ </button>
+ {{end}}
+ </div>
+ </div>
+ {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
+ </div>
+</div>
diff --git a/web_src/css/review.css b/web_src/css/review.css
index c831f38976..5336775547 100644
--- a/web_src/css/review.css
+++ b/web_src/css/review.css
@@ -67,7 +67,7 @@
position: relative;
}
-.conversation-holder .comment-code-cloud {
+.code-diff .conversation-holder .comment-code-cloud {
max-width: 820px;
}