612: Fixes questionnaire form for edit (#644)

* 612: Fixes questionnaire form for edit

* 612: Fixes questionnaire edit form - fix

* 612: test fixes

* 612: Requested fixes

---------

Co-authored-by: Lucas Boeira <lucas.boeira@protonmail.ch>

app/controllers/new_admin/questionnaires_controller.rb

@@ -31,7 +31,8 @@ def edit
     def update
       @questionnaire = Questionnaire.find(params[:id])
 
-      if @questionnaire.update(questionnaire_params)
+      if @questionnaire.update(questionnaire_params) &&
+        @questionnaire.questions.destroy_by(id: questions_to_be_destroyed_ids)
         redirect_on_success new_admin_show_questionnaire_path(id: @questionnaire.id), message_scope: 'update'
       else
         render_on_failure :edit
@@ -67,6 +68,15 @@ def questionnaire_params
                                             questions_attributes: %i[title kind raw_answer_options _destroy id])
     end
 
+    def questions_to_be_destroyed_ids
+      return unless questionnaire_params[:questions_attributes]
+      questionnaire_params[:questions_attributes].values.filter_map do |question|
+        if question["_destroy"] != 'false'
+          question["id"]
+        end
+      end
+    end
+
     def redirect_on_success(url, message_scope:)
       flash[:notice] = I18n.t(:notice, scope: "flash.actions.#{message_scope}",
                                        resource_name: Questionnaire.model_name.human)

app/views/new_admin/questionnaires/_question_form.html.erb

@@ -1,4 +1,5 @@
-<div class="w-full overflow-hidden rounded-lg ring-1 ring-black ring-opacity-5" data-new-record="<%= form.object.new_record? %>">
+<div class="mt-6 w-full overflow-hidden rounded-lg ring-1 ring-black ring-opacity-5"
+     data-new-record="<%= form.object.new_record? %>">
   <div class="w-full overflow-x-auto">
     <table class="w-full whitespace-no-wrap" id="form_questionnaire">
       <thead>
@@ -53,10 +54,13 @@
       </tbody>
     </table>
   </div>
-
-  <div class="flex mt-4">
-    <button type="button" class="px-4 py-2 cursor-pointer font-semibold text-sm text-white transition-colors duration-150 rounded-lg bg-primary-600 hover:bg-primary-700" data-action="click->nested-form#remove"> <%= t 'questionnaires.remove_question' %> </button>
-  </div>
 
+  <div class="flex mt-2">
+    <button type="button"
+            class="px-4 py-2 cursor-pointer font-semibold text-sm text-white transition-colors duration-150 rounded-lg bg-primary-600 hover:bg-primary-700"
+            data-action="click->nested-form#remove">
+      <%= t 'questionnaires.remove_question' %>
+    </button>
+  </div>
   <%= form.hidden_field :_destroy %>
 </div>

app/views/new_admin/questionnaires/edit.html.erb

@@ -1,3 +1,7 @@
+<% content_for :assets do %>
+  <%= javascript_pack_tag 'questionnaire' %>
+<% end %>
+
 <% content_for :page_title do %>
   <%= t 'questionnaires.edit' %>
 <% end %>