Add changes to request decision component to support marksmith editor

Author: rubhanazeem

src/api/app/assets/javascripts/webui/canned_responses.js

@@ -12,5 +12,6 @@ function setupCannedResponses() { // jshint ignore:line
     }
     // we have to enable the submit button for the comments form
     $(e.target).closest('[class*="-comment-form"]').find('input[type="submit"]').prop('disabled', false);
+    $('.decision-add-comment').prop('disabled', false);
   });
 }

src/api/app/assets/javascripts/webui/comment.js

@@ -32,6 +32,7 @@ function handlingCommentEvents() {
   // Disable submit button if textarea is empty and enable otherwise
   $(document).on('input', '.write-and-preview textarea', function(e) {
     validateForm(e);
+    $('.decision-add-comment').prop('disabled', false);
     resizeTextarea(this);
   });
 

src/api/app/components/request_decision_component.html.haml

@@ -1,5 +1,5 @@
 .request-decision.mt-n1
-  = form_with(url: request_changerequest_path, html: { id: 'request_handle_form' }, local: true) do |form|
+  = form_with(model: @bs_request.reviews.new, url: request_changerequest_path, html: { id: 'request_handle_form' }, local: true) do |form|
     = hidden_field_tag(:number, @bs_request.number)
     .pb-2{ 'data-canned-controller': '' }
       - if policy(Comment.new(commentable: @bs_request)).locked?
@@ -10,12 +10,12 @@
       - decision_placeholder = "Write your comment or decision...(markdown is only supported for comments, not for decisions)"
       = render WriteAndPreviewComponent.new(form: form, preview_message_url: preview_comments_path, canned_responses_enabled: true,
                                             message_body_param: 'comment[body]',
-                                            text_area_attributes: { object_name: 'reason', id_suffix: 'new_comment',
+                                            text_area_attributes: { object_name: 'reason', id_suffix: 'new_comment', required: true,
                                             placeholder: decision_placeholder})
       .mt-2#decision-buttons-row
         %div
           - if policy(Comment.new(commentable:@bs_request)).create?
-            = submit_tag 'Add comment', class: 'btn btn-outline-primary me-2', data: { disable_with: 'Creating comment...' }, name: 'commented'
+            = submit_tag 'Add comment', class: 'btn btn-outline-primary me-2 decision-add-comment', data: { disable_with: 'Creating comment...' }, name: 'commented', disabled: true
         %div
           - if policy(@bs_request).revoke_request?
             = submit_tag('Revoke request', name: 'revoked', class: 'btn btn-danger me-2',

src/api/app/components/request_decision_component.rb

@@ -1,4 +1,7 @@
 class RequestDecisionComponent < ApplicationComponent
+  # This is required to help marksmith render the markdown editor
+  delegate :main_app, to: :helpers
+
   def initialize(bs_request:, package_maintainers:, show_project_maintainer_hint:)
     super
 

src/api/app/controllers/webui/request_controller.rb

@@ -214,7 +214,7 @@ def changerequest
 
     if changestate == 'commented'
 
-      build_new_comment(@bs_request, body: params[:reason])
+      build_new_comment(@bs_request, body: params.dig(:review, :reason))
 
     elsif change_state(changestate, params)
       # TODO: Make this work for each submit action individually
@@ -440,7 +440,7 @@ def change_state(newstate, params)
         newstate: newstate,
         force: true,
         user: User.session.login,
-        comment: params[:reason]
+        comment: params.dig(:review, :reason)
       }
       begin
         request.change_state(opts)