Updates the text above discussions when resolving notes & discussions

2 files changed, 21 insertions, 0 deletions

diff --git a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
index 02294a5a763..031a94b9cd8 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
@@ -56,6 +56,8 @@
 
           if (response.status === 200) {
             CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, user);
+
+            ResolveService.updateUpdatedHtml(this.discussionId, data);
           }
 
           this.$nextTick(this.updateTooltip);
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index 28830f4af4e..012ea3769c1 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -58,6 +58,8 @@
         CommentsStore.loading[discussionId] = false;
 
         CommentsStore.updateCommentsForDiscussion(discussionId, true, user);
+
+        this.updateUpdatedHtml(discussionId, data);
       });
     }
 
@@ -71,11 +73,28 @@
         mergeRequestId,
         discussionId
       }, {}).then((response) => {
+        const data = response.data;
         CommentsStore.loading[discussionId] = false;
 
         CommentsStore.updateCommentsForDiscussion(discussionId, false);
+
+        this.updateUpdatedHtml(discussionId, data);
       });
     }
+
+    updateUpdatedHtml(discussionId, data) {
+      const $discussionHeadline = $(`.${discussionId} .js-discussion-headline`);
+
+      if (data.updated_html) {
+        if ($discussionHeadline.length) {
+          $discussionHeadline.replaceWith(data.updated_html);
+        } else {
+          $(`.${discussionId} .discussion-header`).append(data.updated_html);
+        }
+      } else {
+         $discussionHeadline.remove();
+      }
+    }
   }
 
   w.ResolveService = new ResolveServiceClass();