decidim-forms 0.29.1 → 0.30.0.rc1

data/app/packs/src/decidim/forms/admin/publish_answers_buttons.js

@@ -0,0 +1,72 @@
+/**
+ * Initializes event listeners for a button to toggle the publication status of question answers.
+ *
+ * The button's `data-publish-question-answer-action` attribute determines whether the action is
+ * to "publish" or "unpublish." Based on this attribute, the function makes an AJAX request using
+ * Rails' AJAX helper and updates the button's state and associated labels.
+ *
+ * @param {HTMLButtonElement} button - The button element that triggers the publication toggle action.
+ *
+ * @returns {void}
+ *
+ * Button element must have the following data attributes:
+ * - `data-publish-question-answer-action`: Specifies the current action ("publish" or "unpublish").
+ * - `data-publish-question-answer-question-url`: Specifies the endpoint URL for the AJAX request.
+ *
+ * The DOM structure must include:
+ * - A parent element with the class `toggle__switch-toggle`.
+ * - A child element with the class `toggle__switch-trigger-text`.
+ * - Two labels within `toggle__switch-trigger-text`:
+ *   - One with the class `label success` to indicate the "published" state.
+ *   - One with the class `label success` to indicate the "unpublished" state.
+ *
+ * Example usage:
+ * ```html
+ *  <label class="toggle__switch-toggle">
+ *   <span class="toggle__switch-trigger-text">
+ *     <span class="label success">Published</span>
+ *     <span class="label alert hidden">Unpublished</span>
+ *   <span>
+ *     <input
+ *     data-publish-question-answer-action="unpublish"
+ *     data-publish-question-answer-question-url="/path/to/publish/or/unpublish">
+ *   </span>
+ *  </label>
+ * ```
+ */
+export default function createPublicableQuestionAnswersButtons(button) {
+  button.addEventListener("click", () => {
+    const action = button.dataset.publishQuestionAnswerAction;
+    const url = button.dataset.publishQuestionAnswerQuestionUrl;
+    const buttonText = button.closest(".toggle__switch-toggle").querySelector(".toggle__switch-trigger-text");
+    const publishedLabel = buttonText.querySelector(".label.success");
+    const unpublishedLabel = buttonText.querySelector(".label.alert");
+
+    switch (action) {
+    case "publish":
+      Rails.ajax({
+        url: url,
+        type: "PUT",
+        success: function() {
+          button.setAttribute("data-publish-question-answer-action", "unpublish")
+          publishedLabel.classList.remove("hidden");
+          unpublishedLabel.classList.add("hidden");
+        }
+      });
+      break;
+    case "unpublish":
+      Rails.ajax({
+        url: url,
+        type: "DELETE",
+        success: function() {
+          button.setAttribute("data-publish-question-answer-action", "publish")
+          unpublishedLabel.classList.remove("hidden");
+          publishedLabel.classList.add("hidden");
+        }
+      });
+      break;
+    default:
+      console.log(`Publish questions answers: Unknown action ${action}`);
+    }
+  });
+}

data/app/packs/src/decidim/forms/forms.js

@@ -11,6 +11,7 @@ import "dragula/dist/dragula.css";
 import createOptionAttachedInputs from "src/decidim/forms/option_attached_inputs.component"
 import createDisplayConditions from "src/decidim/forms/display_conditions.component"
 import createMaxChoicesAlertComponent from "src/decidim/forms/max_choices_alert.component"
+import { preventUnload } from "src/decidim/utilities/dom"
 
 $(() => {
   $(".js-radio-button-collection, .js-check-box-collection").each((idx, el) => {
@@ -45,30 +46,33 @@ $(() => {
     });
   });
 
-  const $form = $("form.answer-questionnaire");
-  if ($form.length > 0) {
-    $form.find("input, textarea, select").on("change", () => {
-      $form.data("changed", true);
+  const form = document.querySelector("form.answer-questionnaire");
+  if (form) {
+    const safePath = form.dataset.safePath.split("?")[0];
+    let exitUrl = "";
+    document.addEventListener("click", (event) => {
+      const link = event.target?.closest("a");
+      if (link) {
+        exitUrl = link.href;
+      }
     });
 
-    const safePath = $form.data("safe-path").split("?")[0];
-    $(document).on("click", "a", (event) => {
-      window.exitUrl = event.currentTarget.href;
-    });
+    // The submit listener has to be registered through jQuery because the
+    // custom confirm dialog does not dispatch the "submit" event normally.
     $(document).on("submit", "form", (event) => {
-      window.exitUrl = event.currentTarget.action;
+      exitUrl = event.currentTarget.action;
     });
 
-    window.addEventListener("beforeunload", (event) => {
-      const exitUrl = window.exitUrl;
-      const hasChanged = $form.data("changed");
-      window.exitUrl = null;
+    let hasChanged = false;
+    const controls = form.querySelectorAll("input, textarea, select");
+    const changeListener = () => {
+      if (!hasChanged) {
+        hasChanged = true;
+        controls.forEach((control) => control.removeEventListener("change", changeListener));
 
-      if (!hasChanged || (exitUrl && exitUrl.includes(safePath))) {
-        return;
+        preventUnload(() => !exitUrl.includes(safePath));
       }
-
-      event.returnValue = true;
-    });
+    };
+    controls.forEach((control) => control.addEventListener("change", changeListener));
   }
 })

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -45,7 +45,7 @@ module Decidim
         def completion
           with_body = siblings.where(decidim_forms_questions: { question_type: %w(short_answer long_answer) })
                               .where.not(body: "").count
-          with_choices = siblings.where.not("decidim_forms_questions.question_type in (?)", %w(short_answer long_answer))
+          with_choices = siblings.where.not(decidim_forms_questions: { question_type: %w(short_answer long_answer) })
                                  .where("decidim_forms_answers.id IN (SELECT decidim_answer_id FROM decidim_forms_answer_choices)").count
 
           (with_body + with_choices).to_f / questionnaire.questions.not_separator.not_title_and_description.count * 100

data/app/presenters/decidim/forms/admin_log/question_presenter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Forms::Question`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionPresenter.new(action_log, view_helpers).present
+      class QuestionPresenter < Decidim::Log::BasePresenter
+        private
+
+        # i18n-tasks-use t("decidim.forms.admin_log.question.publish_answers")
+        # i18n-tasks-use t("decidim.forms.admin_log.question.unpublish_answers")
+        def action_string
+          case action
+          when "publish_answers", "unpublish_answers"
+            "decidim.forms.admin_log.question.#{action}"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -25,7 +25,7 @@ module Decidim
                         .joins(:question)
                         .where(questionnaire: @questionnaire)
 
-        answers.sort_by { |answer| answer.question.position }.group_by { |a| a.user || a.session_token }.values
+        answers.sort_by { |answer| answer.question.position.to_i }.group_by { |a| a.user || a.session_token }.values
       end
     end
   end

data/app/views/decidim/forms/admin/questionnaires/_answer_option_template.html.erb

@@ -1,7 +1,7 @@
 <% question = form.object %>
 
 <script type="text/template" class="decidim-answer-option-template decidim-template" id="<%= template_id %>">
-  <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
+  <%= fields_for "questions[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
     <%= render "decidim/forms/admin/questionnaires/answer_option", form: answer_option_form, question:, editable: %>
   <% end %>
 </script>

data/app/views/decidim/forms/admin/questionnaires/_display_condition_template.html.erb

@@ -1,7 +1,7 @@
 <% question = form.object %>
 
 <script type="text/template" class="decidim-template" id="<%= template_id %>">
-  <%= fields_for "questionnaire[questions][#{question.to_param}][display_conditions][]", blank_display_condition do |display_condition_form| %>
+  <%= fields_for "questions[questions][#{question.to_param}][display_conditions][]", blank_display_condition do |display_condition_form| %>
     <%= render "decidim/forms/admin/questionnaires/display_condition", form: display_condition_form, question:, editable: %>
   <% end %>
 </script>

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -13,92 +13,3 @@
     </div>
   </div>
 </div>
-
-<div class="questionnaire-questions form__wrapper">
-  <div class="row column text-center my-4">
-    <button type="button" class="button button__sm button__secondary collapse-all"><%= t(".collapse") %></button>
-    <button type="button" class="button button__sm button__secondary expand-all"><%= t(".expand") %></button>
-  </div>
-
-  <% if questionnaire.questions_editable? %>
-    <% if questionnaire.answers.any? && !questionnaire.published? %>
-      <%= cell("decidim/announcement", t(".unpublished_warning"), callout_class: "warning" ) %>
-    <% end %>
-
-    <%= fields_for "questionnaire[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
-      <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
-        <%= render "decidim/forms/admin/questionnaires/question",
-                   form: question_form,
-                   id: tabs_id_for_question(blank_question),
-                   editable: questionnaire.questions_editable?,
-                   answer_option_template_selector: "#answer-option-template-dummy",
-                   display_condition_template_selector: "#display-condition-template-dummy",
-                   matrix_row_template_selector: "#matrix-row-template-dummy" %>
-      </script>
-      <script type="text/template" class="decidim-separator-template decidim-template" id="separator-template">
-        <%= render "decidim/forms/admin/questionnaires/separator",
-                   form: question_form,
-                   id: tabs_id_for_question(blank_question),
-                   editable: questionnaire.questions_editable? %>
-      </script>
-      <script type="text/template" class="decidim-title-and-description-template decidim-template" id="title-and-description-template">
-        <%= render "decidim/forms/admin/questionnaires/title_and_description",
-                   form: question_form,
-                   id: tabs_id_for_question(blank_question),
-                   editable: questionnaire.questions_editable? %>
-      </script>
-      <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
-      <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-dummy" %>
-      <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-dummy" %>
-    <% end %>
-  <% else %>
-    <%= cell("decidim/announcement", t(".already_answered_warning"), callout_class: "warning" ) %>
-  <% end %>
-
-  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
-    <% @form.questions.each_with_index do |question, index| %>
-      <%= fields_for "questionnaire[questions][]", question do |question_form| %>
-        <% if question.separator? %>
-          <%= render "decidim/forms/admin/questionnaires/separator",
-                     form: question_form,
-                     id: tabs_id_for_question(question),
-                     editable: questionnaire.questions_editable? %>
-        <% elsif question.title_and_description? %>
-          <%= render "decidim/forms/admin/questionnaires/title_and_description",
-                     form: question_form,
-                     id: tabs_id_for_question(question),
-                     editable: questionnaire.questions_editable? %>
-        <% else %>
-          <%= render "decidim/forms/admin/questionnaires/question",
-                     form: question_form,
-                     id: tabs_id_for_question(question),
-                     editable: questionnaire.questions_editable?,
-                     display_condition_template_selector: "#display-condition-template-#{index}",
-                     answer_option_template_selector: "#answer-option-template-#{index}",
-                     matrix_row_template_selector: "#matrix-row-template-#{index}" %>
-          <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-#{index}" %>
-          <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
-          <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-#{index}" %>
-        <% end %>
-      <% end %>
-    <% end %>
-  </div>
-
-  <% if questionnaire.questions_editable? %>
-    <div class="mt-4">
-      <button class="button button__sm button__secondary add-question"><%= t(".add_question") %></button>
-      <button class="button button__sm button__secondary add-separator"><%= t(".add_separator") %></button>
-      <button class="button button__sm button__secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
-    </div>
-  <% end %>
-</div>
-
-<%= append_javascript_pack_tag "decidim_forms_admin" %>
-
-<% if questionnaire.questions_editable? %>
-  <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      window.Decidim.createEditableForm();
-    });
-  </script>
-<% end %>

data/app/views/decidim/forms/admin/questionnaires/_matrix_row_template.html.erb

@@ -1,7 +1,7 @@
 <% question = form.object %>
 
 <script type="text/template" class="decidim-matrix-row-template decidim-template" id="<%= template_id %>">
-  <%= fields_for "questionnaire[questions][#{question.to_param}][matrix_rows][]", blank_matrix_row do |matrix_row_form| %>
+  <%= fields_for "questions[questions][#{question.to_param}][matrix_rows][]", blank_matrix_row do |matrix_row_form| %>
     <%= render "decidim/forms/admin/questionnaires/matrix_row", form: matrix_row_form, question:, editable: %>
   <% end %>
 </script>

data/app/views/decidim/forms/admin/questionnaires/_question.html.erb

@@ -111,7 +111,7 @@
         <div class="questionnaire-question-matrix-rows" data-template="<%= matrix_row_template_selector %>">
           <div class="questionnaire-question-matrix-rows-list">
             <% question.matrix_rows_by_position.each do |matrix_row| %>
-              <%= fields_for "questionnaire[questions][#{question.to_param}][matrix_rows][]", matrix_row do |matrix_row_form| %>
+              <%= fields_for "questions[questions][#{question.to_param}][matrix_rows][]", matrix_row do |matrix_row_form| %>
                 <%= render "decidim/forms/admin/questionnaires/matrix_row", form: matrix_row_form, question:, editable: %>
               <% end %>
             <% end %>
@@ -126,7 +126,7 @@
       <div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
         <div class="questionnaire-question-answer-options-list">
           <% question.answer_options.each do |answer_option| %>
-            <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
+            <%= fields_for "questions[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
               <%= render "decidim/forms/admin/questionnaires/answer_option", form: answer_option_form, question:, editable: %>
             <% end %>
           <% end %>
@@ -153,7 +153,7 @@
       <div class="questionnaire-question-display-conditions" data-template="<%= display_condition_template_selector %>">
         <div class="questionnaire-question-display-conditions-list">
           <% question.display_conditions.each do |display_condition| %>
-            <%= fields_for "questionnaire[questions][#{question.to_param}][display_conditions][]", display_condition do |display_condition_form| %>
+            <%= fields_for "questions[questions][#{question.to_param}][display_conditions][]", display_condition do |display_condition_form| %>
               <%= render "decidim/forms/admin/questionnaires/display_condition", form: display_condition_form, question:, editable: %>
             <% end %>
           <% end %>

data/app/views/decidim/forms/admin/questionnaires/_questions_form.html.erb

@@ -0,0 +1,80 @@
+<div class="questionnaire-questions form__wrapper">
+  <div class="row column text-center my-4">
+    <button type="button" class="button button__sm button__secondary collapse-all"><%= t(".collapse") %></button>
+    <button type="button" class="button button__sm button__secondary expand-all"><%= t(".expand") %></button>
+  </div>
+
+  <% if questionnaire.questions_editable? %>
+    <% if questionnaire.answers.any? && !questionnaire.published? %>
+      <%= cell("decidim/announcement", t(".unpublished_warning"), callout_class: "warning" ) %>
+    <% end %>
+
+    <%= fields_for "questions[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
+      <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
+        <%= render "decidim/forms/admin/questionnaires/question",
+                   form: question_form,
+                   id: tabs_id_for_question(blank_question),
+                   editable: questionnaire.questions_editable?,
+                   answer_option_template_selector: "#answer-option-template-dummy",
+                   display_condition_template_selector: "#display-condition-template-dummy",
+                   matrix_row_template_selector: "#matrix-row-template-dummy" %>
+      </script>
+      <script type="text/template" class="decidim-separator-template decidim-template" id="separator-template">
+        <%= render "decidim/forms/admin/questionnaires/separator",
+                   form: question_form,
+                   id: tabs_id_for_question(blank_question),
+                   editable: questionnaire.questions_editable? %>
+      </script>
+      <script type="text/template" class="decidim-title-and-description-template decidim-template" id="title-and-description-template">
+        <%= render "decidim/forms/admin/questionnaires/title_and_description",
+                   form: question_form,
+                   id: tabs_id_for_question(blank_question),
+                   editable: questionnaire.questions_editable? %>
+      </script>
+      <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
+      <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-dummy" %>
+      <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-dummy" %>
+    <% end %>
+  <% else %>
+    <%= cell("decidim/announcement", t(".already_answered_warning"), callout_class: "warning" ) %>
+  <% end %>
+
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
+    <% @form.questions.each_with_index do |question, index| %>
+      <%= fields_for "questions[questions][]", question do |question_form| %>
+        <% if question.separator? %>
+          <%= render "decidim/forms/admin/questionnaires/separator",
+                     form: question_form,
+                     id: tabs_id_for_question(question),
+                     editable: questionnaire.questions_editable? %>
+        <% elsif question.title_and_description? %>
+          <%= render "decidim/forms/admin/questionnaires/title_and_description",
+                     form: question_form,
+                     id: tabs_id_for_question(question),
+                     editable: questionnaire.questions_editable? %>
+        <% else %>
+          <%= render "decidim/forms/admin/questionnaires/question",
+                     form: question_form,
+                     id: tabs_id_for_question(question),
+                     editable: questionnaire.questions_editable?,
+                     display_condition_template_selector: "#display-condition-template-#{index}",
+                     answer_option_template_selector: "#answer-option-template-#{index}",
+                     matrix_row_template_selector: "#matrix-row-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-#{index}" %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
+<%= append_javascript_pack_tag "decidim_forms_admin" %>
+
+<% if questionnaire.questions_editable? %>
+  <script>
+    document.addEventListener("DOMContentLoaded", function () {
+      window.Decidim.createEditableForm();
+    });
+  </script>
+<% end %>

data/app/views/decidim/forms/admin/questionnaires/edit.html.erb

@@ -4,26 +4,6 @@
   <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
 <% else %>
 
-<div class="item_show__header">
-  <h1 class="item_show__header-title">
-    <%= edit_questionnaire_title %>
-
-    <% unless template? questionnaire.questionnaire_for %>
-      <% if allowed_to? :preview, :questionnaire %>
-        <%= link_to t("preview", scope: "decidim.forms.admin.questionnaires.form"), public_url, class: "button button__sm button__secondary", target: :_blank, data: { "external-link": false } %>
-      <% end %>
-      <% if questionnaire.answers.any? %>
-        <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
-        <% if allowed_to? :show, :questionnaire_answers %>
-          <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button button__sm button__secondary new whitespace-nowrap" %>
-        <% end %>
-      <% else %>
-        <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
-      <% end %>
-    <% end %>
-  </h1>
-</div>
-
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form-defaults form edit_questionnaire" }) do |form| %>

data/app/views/decidim/forms/admin/questionnaires/edit_questions.html.erb

@@ -0,0 +1,47 @@
+<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.title")) %>
+
+<% if templates_defined? && choose_template? %>
+  <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
+<% else %>
+
+<div class="questionnaire-questions">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t("decidim.forms.admin.questionnaires.edit_questions.title") %>
+
+      <% unless template? questionnaire.questionnaire_for %>
+        <% if questionnaire.questions_editable? %>
+          <button class="button button__sm button__secondary add-question"><%= t(".add_question") %></button>
+          <button class="button button__sm button__secondary add-separator"><%= t(".add_separator") %></button>
+          <button class="button button__sm button__secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
+        <% end %>
+        <% if allowed_to? :preview, :questionnaire %>
+          <%= link_to t("preview", scope: "decidim.forms.admin.questionnaires.form"), public_url, class: "button button__sm button__transparent-secondary", target: :_blank, data: { "external-link": false } %>
+        <% end %>
+        <% if questionnaire.answers.any? %>
+          <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
+          <% if allowed_to? :show, :questionnaire_answers %>
+            <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button button__sm button__secondary new whitespace-nowrap" %>
+          <% end %>
+        <% else %>
+          <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
+        <% end %>
+      <% end %>
+    </h1>
+  </div>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form-defaults form edit_questionnaire" }) do |form| %>
+      <%= render partial: "decidim/forms/admin/questionnaires/questions_form", object: form %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<% end %>

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -29,7 +29,17 @@
     }
     label_options[:for] = nil if %w(matrix_single matrix_multiple single_option multiple_option).include?(answer.question.question_type)
     %>
-    <%= label_tag field_id, answer.label, **label_options %>
+
+    <%= label_tag field_id, **label_options do %>
+      <%= translated_attribute(answer.question.body) %>
+      <% if answer.question.mandatory? %>
+        <%= answer_form.send(:required_indicator) %>
+      <% end %>
+      <% if answer.question.max_choices %>
+        <%= " (#{answer.send(:max_choices_label)})" %>
+      <% end %>
+    <% end %>
+
     <% if translated_attribute(answer.question.description).present? %>
       <div class="answer-questionnaire__question-description">
         <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>

data/app/views/decidim/forms/questionnaires/_questionnaire.html.erb

@@ -6,9 +6,15 @@
   <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_for_private_users.title"), body: t("decidim.forms.questionnaires.show.questionnaire_for_private_users.body") }, callout_class: "alert") %>
 <% end %>
 
+<% if questionnaire_for.respond_to?(:announcement) and questionnaire_for.announcement.present? %>
+  <%= cell("decidim/announcement", translated_attribute(questionnaire_for.announcement), callout_class: "warning") %>
+<% end %>
+
 <%= decidim_form_for(@form, url: update_url, method: :post, html: { multipart: true, class: "form answer-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
   <%= form_required_explanation %>
 
+  <%= form.hidden_field :allow_editing_answers %>
+
   <%= invisible_captcha %>
   <% answer_idx = 0 %>
   <% cleaned_answer_idx = 1 %>
@@ -70,7 +76,8 @@
           step_index,
           total_steps: @form.total_steps,
           button_disabled: !current_participatory_space.can_participate?(current_user),
-          form:
+          form:,
+          allow_editing_answers: questionnaire_for.try(:allow_editing_answers?)
         ) %>
       </div>
     </div>

data/app/views/decidim/forms/questionnaires/answers/_files.html.erb

@@ -1 +1 @@
-<%= answer_form.upload :add_documents, label: false, multiple: true, id: field_id, disabled:, button_class: "button button__lg button__transparent-secondary w-full" %>
+<%= answer_form.upload :add_documents, attachments: answer.documents, label: false, multiple: true, id: field_id, disabled:, button_class: "button button__lg button__transparent-secondary w-full" %>

data/app/views/decidim/forms/questionnaires/answers/_sorting.html.erb

@@ -1,13 +1,19 @@
 <div class="answer-questionnaire__sorting-container js-sortable-check-box-collection">
-  <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
-    <% choice = answer.selected_choices.find { |choice| choice.answer_option_id == answer_option.id } %>
+  <%
+    # This is a block that aims to identify the order to the answer questions, and if there is an user answer, use that
+    # to order the date that needs to be displayed. It is done like this to help with edit user answer form
+  %>
+  <% ordering = answer.question.answer_options.pluck(:id) %>
+  <% if answer.selected_choices.present? %>
+    <% ordering = answer.selected_choices.map(&:answer_option_id) %>
+  <% end %>
 
-    <div class="answer-questionnaire__sorting js-collection-input" role="button">
+  <% ids_for_order = ordering.map.with_index { |id, index| "#{id}=#{index + 1}" }.join(", ") %>
 
-      <%#= check_box_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][body]",
-                          translated_attribute(answer_option.body),
-                          choice.present?, disabled: disabled %>
+  <% answer.question.reload.answer_options.reorder(Arel.sql("POSITION(id::text in '#{ids_for_order}')")).each_with_index do |answer_option, idx| %>
+    <% choice = answer.selected_choices.find { |choice| choice.answer_option_id == answer_option.id } %>
 
+    <div class="answer-questionnaire__sorting js-collection-input" role="button">
       <%= translated_attribute(answer_option.body) %>
 
       <%= icon "drag-move-2-line" %>

data/app/views/decidim/forms/questionnaires/edit.html.erb

@@ -0,0 +1,47 @@
+<% add_decidim_meta_tags({
+                           title: translated_attribute(questionnaire.title),
+                           description: translated_attribute(questionnaire.description)
+                         }) %>
+
+<%= append_stylesheet_pack_tag "decidim_forms" %>
+<%= append_javascript_pack_tag "decidim_forms" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <div class="text-center py-10">
+    <% if questionnaire.title.present? %>
+      <h1 class="title-decorator inline-block text-left mb-12">
+        <%= translated_attribute questionnaire.title %>
+      </h1>
+    <% end %>
+
+    <% if questionnaire.description.present? %>
+      <div class="text-left editor-content">
+        <%= decidim_sanitize_editor_admin translated_attribute questionnaire.description %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
+
+  <% unless questionnaire_for.try(:component)&.try(:published?) %>
+    <%= cell("decidim/announcement", t("decidim.forms.questionnaires.show.questionnaire_not_published.body"), callout_class: "warning") %>
+  <% end %>
+
+  <section>
+    <% if allow_answers? %>
+      <% if visitor_can_answer? %>
+        <% if @form.responses_by_step.flatten.empty? %>
+          <%= cell("decidim/announcement", t("decidim.forms.questionnaires.show.empty")) %>
+        <% else %>
+          <%= render partial: "decidim/forms/questionnaires/questionnaire" %>
+        <% end %>
+      <% else %>
+        <%= render partial: "decidim/forms/questionnaires/questionnaire_readonly" %>
+      <% end %>
+    <% else %>
+      <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_closed.title"), body: t("decidim.forms.questionnaires.show.questionnaire_closed.body") }, callout_class: "warning") %>
+    <% end %>
+  </section>
+
+<% end %>