Review updatenew-resolvable-discussion-frontend

5 files changed, 18 insertions, 9 deletions

diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js
index c07753f2e4b..6b98dfe9398 100644
--- a/app/assets/javascripts/comment_type_toggle.js
+++ b/app/assets/javascripts/comment_type_toggle.js
@@ -2,11 +2,13 @@
 /* global droplabInputSetter */
 
 class CommentTypeToggle {
-  constructor(trigger, list, input, button) {
+  constructor(trigger, list, input, button, secondaryButton) {
     this.trigger = trigger;
     this.list = list;
     this.input = input;
     this.button = button;
+    this.secondaryButton = secondaryButton;
+    console.log(secondaryButton)
   }
 
   initDroplab() {
@@ -19,6 +21,10 @@ class CommentTypeToggle {
       {
         input: this.button,
         valueAttribute: 'data-button-text',
+      },
+      {
+        input: this.secondaryButton,
+        valueAttribute: 'data-secondary-button-text',
       }],
     });
   }
diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js
index b2fb8fd582c..71a57553b8c 100644
--- a/app/assets/javascripts/gl_form.js
+++ b/app/assets/javascripts/gl_form.js
@@ -53,6 +53,7 @@ GLForm.prototype.initCommentTypeToggle = function () {
     this.form[0].querySelector('.js-comment-type-dropdown .dropdown-menu'),
     document.getElementById('note_noteable_type'),
     this.form[0].querySelector('.js-comment-type-dropdown .js-comment-submit-button'),
+    document.querySelector('.js-note-target-close'),
   );
 
   this.commentTypeToggle.initDroplab();
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 143fce9aae5..eb910e14a09 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -363,7 +363,9 @@
     padding-top: 2px;
   }
 
-  hr {
-    margin: 8px;
+  .divider {
+    margin: 0 8px;
+    padding: 0;
+    border-top: $gray-darkest;
   }
 }
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 762048e0d93..007a468de9f 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -32,16 +32,16 @@
     .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown
       = f.submit "#{ new_discussion && @note.can_be_discussion_note? ? 'Start discussion' : 'Comment' }", class: "btn btn-nr btn-create comment-btn js-comment-button js-comment-submit-button"
       - if @note.can_be_discussion_note?
-        = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-comment-button js-note-new-discussion', data: { 'dropdown-trigger' => '.dropdown-menu' } do
+        = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-comment-button js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do
           = icon('caret-down')
-        %ul.dropdown-menu{ data: { dropdown: true } }
-          %li#comment{ data: { value: '', 'button-text' => 'Comment' }, class: "#{ 'droplab-item-selected' unless new_discussion }" }
+        %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } }
+          %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: "#{ 'droplab-item-selected' unless new_discussion }" }
             = icon('check')
             .description
               %strong Comment
               %p Add a general comment to this merge request.
-          %hr
-          %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion' }, class: "#{ 'droplab-item-selected' if new_discussion }" }
+          %li.divider
+          %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' }, class: "#{ 'droplab-item-selected' if new_discussion }" }
             = icon('check')
             .description
               %strong Start discussion
diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js
index c9f24112890..09d80e58648 100644
--- a/spec/javascripts/comment_type_toggle_spec.js
+++ b/spec/javascripts/comment_type_toggle_spec.js
@@ -3,7 +3,7 @@ import '~/droplab/droplab';
 import '~/droplab/plugins/input_setter';
 
 describe('CommentTypeToggle', function () {
-  describe('constructor', function () {
+  describe('class constructor', function () {
     beforeEach(function () {
       this.trigger = {};
       this.list = {};