Comment & resolve button text is done through VueJS

2 files changed, 32 insertions, 1 deletions

diff --git a/app/assets/javascripts/diff_notes/components/resolve_comment_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_comment_btn.js.es6
new file mode 100644
index 00000000000..1ffe4cf99d6
--- /dev/null
+++ b/app/assets/javascripts/diff_notes/components/resolve_comment_btn.js.es6
@@ -0,0 +1,31 @@
+((w) => {
+  w.ResolveCommentBtn = Vue.extend({
+    props: {
+      discussionId: String
+    },
+    computed: {
+      isDiscussionResolved: function () {
+        const notes = CommentsStore.notesForDiscussion(this.discussionId),
+              discussion = CommentsStore.state[this.discussionId];
+        let allResolved = true;
+
+        for (const noteId of notes) {
+          const note = discussion[noteId];
+
+          if (!note.resolved) {
+            allResolved = false;
+          }
+        }
+
+        return allResolved;
+      },
+      buttonText: function () {
+        if (this.isDiscussionResolved) {
+          return "Comment & unresolve discussion";
+        } else {
+          return "Comment & resolve discussion";
+        }
+      }
+    }
+  });
+}(window));
diff --git a/app/assets/javascripts/diff_notes/components/resolve_count.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_count.js.es6
index dc9256b2d13..7e099fbee8d 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_count.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_count.js.es6
@@ -15,7 +15,7 @@
           let resolved = true;
 
           for (const noteId in comments) {
-            const commentResolved = comments[noteId];
+            const commentResolved = comments[noteId].resolved;
 
             if (!commentResolved) {
               resolved = false;