Reply button is not removed when deleting a code review comment (#13824)

Backport #13774

templates/repo/diff/box.tmpl

@@ -166,6 +166,7 @@
 																<td class="lines-num"></td>
 																<td class="lines-type-marker"></td>
 																<td class="add-comment-left">
+																	<div class="conversation-holder">
 																		{{if and $resolved  (eq $line.GetCommentSide "previous")}}
 																			<div class="ui top attached header">
 																				<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span>
@@ -198,10 +199,12 @@
 																				{{end}}
 																			</div>
 																		{{end}}
+																	</div>
 																</td>
 																<td class="lines-num"></td>
 																<td class="lines-type-marker"></td>
 																<td class="add-comment-right">
+																	<div class="conversation-holder">
 																		{{if and $resolved (eq $line.GetCommentSide "proposed")}}
 																			<div class="ui top attached header">
 																				<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span>
@@ -234,6 +237,7 @@
 																				{{end}}
 																			</div>
 																		{{end}}
+																	</div>
 																</td>
 															</tr>
 														{{end}}

templates/repo/diff/section_unified.tmpl

@@ -39,6 +39,7 @@
 				<tr>
 					<td colspan="2" class="lines-num"></td>
 					<td class="add-comment-left add-comment-right" colspan="2">
+						<div class="conversation-holder">
 							{{if $resolved}}
 								<div class = "ui attached header">
 									<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span>
@@ -69,6 +70,7 @@
 									</button>
 								{{end}}
 							</div>
+						</div>
 					</td>
 				</tr>
 			{{end}}

web_src/js/index.js

@@ -1055,7 +1055,11 @@ async function initRepository() {
         $.post($this.data('url'), {
           _csrf: csrf
         }).done(() => {
+          const $conversationHolder = $this.closest('.conversation-holder');
           $(`#${$this.data('comment-id')}`).remove();
+          if ($conversationHolder.length && !$conversationHolder.find('.comment').length) {
+            $conversationHolder.remove();
+          }
         });
       }
       return false;