From e132eea9c288b7391e64666cebe27e6976bfe7ba Mon Sep 17 00:00:00 2001
From: Jimmy Praet <jimmy.praet@telenet.be>
Date: Sun, 27 Jun 2021 16:53:02 +0200
Subject: [PATCH 1/3] Add buttons to navigate to previous / next review comment

---
 templates/repo/diff/conversation.tmpl |  4 ++++
 web_src/js/index.js                   | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl
index ea268c5c170e3..1b47d88ee6821 100644
--- a/templates/repo/diff/conversation.tmpl
+++ b/templates/repo/diff/conversation.tmpl
@@ -27,6 +27,10 @@
 			</ui>
 		</div>
 		<div class="df je ac fw mt-3">
+			<div class="ui buttons mr-2">
+				<button class="ui icon tiny basic button previous-conversation">{{$.i18n.Tr "repo.issues.previous"}}</button>
+				<button class="ui icon tiny basic button next-conversation">{{$.i18n.Tr "repo.issues.next"}}</button>
+			</div>
 			{{if and $.CanMarkConversation $isNotPending}}
 				<button class="ui icon tiny basic button resolve-conversation" data-origin="diff" 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}}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 67548f5d9d82d..f1f41ce7477bf 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -942,6 +942,28 @@ async function initRepository() {
       action: 'hide'
     });
 
+    // Previous/Next code review conversation
+    $(document).on('click', '.previous-conversation', (e) => {
+      const $conversation = $(e.currentTarget).closest('.comment-code-cloud');
+      const $conversations = $('.comment-code-cloud:not(.hide)');
+      const index = $conversations.index($conversation);
+      if (index !== 0) {
+        const $previousConversation = $conversations.eq(index - 1);
+        const anchor = $previousConversation.find('.comment').first().attr('id');
+        window.location.href = `#${anchor}`;
+      }
+    });
+    $(document).on('click', '.next-conversation', (e) => {
+      const $conversation = $(e.currentTarget).closest('.comment-code-cloud');
+      const $conversations = $('.comment-code-cloud:not(.hide)');
+      const index = $conversations.index($conversation);
+      if (index !== $conversations.length - 1) {
+        const $nextConversation = $conversations.eq(index + 1);
+        const anchor = $nextConversation.find('.comment').first().attr('id');
+        window.location.href = `#${anchor}`;
+      }
+    });
+
     // Quote reply
     $(document).on('click', '.quote-reply', function (event) {
       $(this).closest('.dropdown').find('.menu').toggle('visible');

From 42c7121efac00976e9babf58faf9efbb573b9e84 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 27 Jun 2021 19:39:13 +0100
Subject: [PATCH 2/3] Apply suggestions from code review

Co-authored-by: Norwin <noerw@users.noreply.github.com>
---
 templates/repo/diff/conversation.tmpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl
index 1b47d88ee6821..be9e25ca1a4f7 100644
--- a/templates/repo/diff/conversation.tmpl
+++ b/templates/repo/diff/conversation.tmpl
@@ -28,8 +28,12 @@
 		</div>
 		<div class="df je ac fw mt-3">
 			<div class="ui buttons mr-2">
-				<button class="ui icon tiny basic button previous-conversation">{{$.i18n.Tr "repo.issues.previous"}}</button>
-				<button class="ui icon tiny basic button next-conversation">{{$.i18n.Tr "repo.issues.next"}}</button>
+				<button class="ui icon tiny basic button previous-conversation">
+				  {{svg "octicon-arrow-up"}} {{$.i18n.Tr "repo.issues.previous"}}
+				</button>
+				<button class="ui icon tiny basic button next-conversation">
+				  {{svg "octicon-arrow-down"}} {{$.i18n.Tr "repo.issues.next"}}
+				</button>
 			</div>
 			{{if and $.CanMarkConversation $isNotPending}}
 				<button class="ui icon tiny basic button resolve-conversation" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">

From 164c31f5d8d7dd292817efbb579344442a764e65 Mon Sep 17 00:00:00 2001
From: Andrew Thornton <art27@cantab.net>
Date: Sun, 27 Jun 2021 20:15:32 +0100
Subject: [PATCH 3/3] fix indentation

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 templates/repo/diff/conversation.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl
index be9e25ca1a4f7..5ae44e600e395 100644
--- a/templates/repo/diff/conversation.tmpl
+++ b/templates/repo/diff/conversation.tmpl
@@ -29,10 +29,10 @@
 		<div class="df je ac fw mt-3">
 			<div class="ui buttons mr-2">
 				<button class="ui icon tiny basic button previous-conversation">
-				  {{svg "octicon-arrow-up"}} {{$.i18n.Tr "repo.issues.previous"}}
+					{{svg "octicon-arrow-up"}} {{$.i18n.Tr "repo.issues.previous"}}
 				</button>
 				<button class="ui icon tiny basic button next-conversation">
-				  {{svg "octicon-arrow-down"}} {{$.i18n.Tr "repo.issues.next"}}
+					{{svg "octicon-arrow-down"}} {{$.i18n.Tr "repo.issues.next"}}
 				</button>
 			</div>
 			{{if and $.CanMarkConversation $isNotPending}}