decidim-forms 0.30.6 → 0.30.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4833c74613c8d16b6bbade14419e6e39193d7901df029b05b6538844069f5896
-  data.tar.gz: 65db6d6754772c6c50eaca64761148dabe9fb750039e0b7b8afe489b188071d2
+  metadata.gz: c7f2281f858b81bfc82836d8d4b6ae6941f5a3fe7c3f10082ec8dc4081617a6d
+  data.tar.gz: 00fefb51de81521205f3082be6b7f6bd10e5657e630c7f08e7f1188f4d6685c2
 SHA512:
-  metadata.gz: 8ef7634a363120baa38df490d1880b406dd5c75b1fc63bdd8419871dc0c73f645c641cdbed7003e9c2d05cc900165cd57ddabf0fc7101515a4e5832eae12740b
-  data.tar.gz: 9ec192a91faf8eddf9bdaedad80b0bf9ca9cbec537cec3750b31cdb833cf5498f75fdc81e113de1b9e84da450e8de040b63bd1def1c16ab70e582903c21aa1a2
+  metadata.gz: a5aba7ebe49e5ce098ea8eed16af98409617eac6c5b23fa792b3d984faa67060f37c664d25f7c22e2ac871efa1aa12e3d60b51a411fe806a2b6427ea0f9ed234
+  data.tar.gz: 22c4677cc60bd3538156b57752226857a15ad831f4adcc5b2bda67aa2432af8f0949bd9ae61d18df9d55ff9ae38f3ce18fe82c1a012c15f8ca3932e0bcf1aa55

data/app/models/decidim/forms/questionnaire.rb

@@ -43,6 +43,11 @@ module Decidim
         Decidim::Forms::QuestionnaireParticipants.new(self).count_participants
       end
 
+      # Public: Returns only the actual question types (excludes separators and title_and_description)
+      def question_types
+        questions.not_separator.not_title_and_description
+      end
+
       private
 
       # salt is used to generate secure hash in anonymous answers

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

@@ -10,6 +10,7 @@ import AutoLabelByPositionComponent from "src/decidim/admin/auto_label_by_positi
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 import initLanguageChangeSelect from "src/decidim/admin/choose_language"
+import sortable from "html5sortable/dist/html5sortable.es"
 
 export default function createEditableForm() {
   const wrapperSelector = ".questionnaire-questions";
@@ -23,6 +24,7 @@ export default function createEditableForm() {
   const matrixRowRemoveFieldButtonSelector = ".remove-matrix-row";
   const addMatrixRowButtonSelector = ".add-matrix-row";
   const maxChoicesWrapperSelector = ".questionnaire-question-max-choices";
+  const responseOptionFreeTextSelector = ".questionnaire-question-answer-option-free-text";
 
   const displayConditionFieldSelector = ".questionnaire-question-display-condition";
   const displayConditionsWrapperSelector = ".questionnaire-question-display-conditions";
@@ -336,7 +338,10 @@ export default function createEditableForm() {
     const dynamicFieldsMatrixRows = dynamicFieldsForMatrixRows[fieldId];
 
     const onQuestionTypeChange = () => {
-      if (isMultipleChoiceOption($fieldQuestionTypeSelect.val())) {
+      const $currentField = $fieldQuestionTypeSelect.parents(fieldSelector);
+      const questionType = $fieldQuestionTypeSelect.val();
+
+      if (isMultipleChoiceOption(questionType)) {
         const nOptions = $fieldQuestionTypeSelect.parents(fieldSelector).find(answerOptionFieldSelector).length;
 
         if (nOptions === 0) {
@@ -353,6 +358,12 @@ export default function createEditableForm() {
           dynamicFieldsMatrixRows._addField();
         }
       }
+
+      if (questionType === "sorting") {
+        $currentField.find(responseOptionFreeTextSelector).addClass("hidden");
+      } else {
+        $currentField.find(responseOptionFreeTextSelector).removeClass("hidden");
+      }
     };
 
     $fieldQuestionTypeSelect.on("change", onQuestionTypeChange);
@@ -392,6 +403,15 @@ export default function createEditableForm() {
 
       initLanguageChangeSelect($field.find("select.language-change").toArray());
 
+      const sortableContainer = document.querySelector(".questionnaire-questions-list[data-draggable-table]");
+      if (sortableContainer) {
+        sortable(sortableContainer, {
+          forcePlaceholderSize: true,
+          items: ".questionnaire-question",
+          handle: sortableContainer.dataset.draggableHandle || ".card-divider"
+        });
+      }
+
       // instead of initialize specific stuff, we send an event, with the DOM fragment we wanna update/refresh/bind
       document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $field[0] }));
     },

data/app/packs/stylesheets/decidim/forms/forms.scss

@@ -22,7 +22,7 @@
   }
 
   &__question-label {
-    @apply text-black text-xl font-semibold relative before:content-[attr(data-answer-idx)] before:w-6 before:h-6 md:before:absolute md:before:-left-4 md:before:-translate-x-full before:inline-flex before:justify-center before:rounded-full before:bg-background before:text-lg before:text-gray-2 before:font-semibold;
+    @apply text-black text-xl font-semibold;
   }
 
   &__question-description {

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

@@ -28,13 +28,32 @@ module Decidim
           return attachments if answer.attachments.any?
           return "-" if answer.choices.empty?
 
-          choices = answer.choices.map do |choice|
+          choices = build_choices
+
+          render_choices_list(choices)
+        end
+
+        private
+
+        def build_choices
+          answer.choices.map do |choice|
+            matrix_row_body = matrix_row_body_for(choice)
             {
               answer_option_body: choice.try(:answer_option).try(:translated_body),
-              choice_body: body_or_custom_body(choice)
+              choice_body: body_or_custom_body(choice),
+              matrix_row_body:
             }
           end
+        end
+
+        def matrix_row_body_for(choice)
+          return unless answer.question.matrix?
+          return unless choice.matrix_row&.body
 
+          translated_attribute(choice.matrix_row.body)
+        end
+
+        def render_choices_list(choices)
           content_tag(:ul) do
             if answer.question.question_type == "single_option"
               choice(choices.first)
@@ -50,8 +69,6 @@ module Decidim
           end
         end
 
-        private
-
         def pretty_attachment(attachment)
           # rubocop:disable Style/StringConcatenation
           # Interpolating strings that are `html_safe` is problematic with Rails.
@@ -70,7 +87,11 @@ module Decidim
 
         def choice(choice_hash)
           content_tag :li do
-            render_body_for choice_hash
+            if choice_hash[:matrix_row_body].present?
+              content_tag(:strong, choice_hash[:matrix_row_body]) + ": " + render_body_for(choice_hash) # rubocop:disable Style/StringConcatenation
+            else
+              render_body_for choice_hash
+            end
           end
         end
 

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

@@ -26,15 +26,15 @@
       %>
     </div>
 
-    <div class="row column">
-      <%=
-        form.check_box(
-          :free_text,
-          label: t(".free_text"),
-          disabled: !questionnaire.questions_editable?
-        )
-      %>
-    </div>
+    <div class="row column questionnaire-question-answer-option-free-text">
+        <%=
+          form.check_box(
+            :free_text,
+            label: t(".free_text"),
+            disabled: !questionnaire.questions_editable?
+          )
+        %>
+      </div>
   </div>
 
   <% if answer_option.persisted? %>

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

@@ -2,11 +2,11 @@
 <% is_expanded = question.errors.any? %>
 <div class="card questionnaire-question" id="accordion-<%= id %>-field">
   <div class="form__wrapper" data-component="accordion">
-    <div class="card-divider">
+    <%= content_tag :div, class: ["card-divider", ("hover:cursor-grab" if editable)] do %>
       <h2 class="card-title flex items-center">
         <span>
           <% if editable %>
-            <%== icon("drag-move-2-fill") %>
+            <%= icon("draggable", class: "dragger") %>
           <% end %>
           <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".question")) %>
         </span>
@@ -23,14 +23,14 @@
           </button>
 
           <% if editable %>
-            <button class="button button__xs button__transparent-secondary small alert remove-question button--title">
+            <button type="button" class="button button__xs button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>
           <% end %>
           </span>
       </h2>
-    </div>
+    <% end %>
 
     <div id="panel-<%= id %>-question-card" class="panel-question-card card-section collapsible <%= "panel-error" if is_expanded %>">
       <div class="row column">

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

@@ -39,7 +39,15 @@
     <%= 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" data-draggable-table data-sort-url="#" data-draggable-handle=".card-divider" id="questionnaire-questions-list">
+  <% list_attributes = {
+       class: "questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0",
+       id: "questionnaire-questions-list"
+     }
+     list_attributes[:"data-draggable-table"] = true if questionnaire.questions_editable?
+     list_attributes[:"data-sort-url"] = "#" if questionnaire.questions_editable?
+     list_attributes[:"data-draggable-handle"] = ".card-divider" if questionnaire.questions_editable? %>
+
+  <%= content_tag :div, list_attributes do %>
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questions[questions][]", question do |question_form| %>
         <% if question.separator? %>
@@ -66,7 +74,7 @@
         <% end %>
       <% end %>
     <% end %>
-  </div>
+  <% end %>
 </div>
 
 <%= append_javascript_pack_tag "decidim_forms_admin" %>

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

@@ -1,18 +1,18 @@
 <% question = form.object %>
 
 <div class="card questionnaire-question" id="<%= id %>-field">
-  <div class="card-divider">
+  <%= content_tag :div, class: ["card-divider", ("hover:cursor-grab" if editable)] do %>
     <h2 class="card-title flex items-center">
     <span>
       <% if editable %>
-        <%== icon("drag-move-2-fill") %>
+        <%= icon("draggable", class: "dragger") %>
       <% end %>
       <%= dynamic_title(t(".separator"), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".separator")) %>
     </span>
 
       <div class="flex items-center gap-x-4 ml-auto">
         <% if editable %>
-          <button class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
+          <button type="button" class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
             <%= icon("delete-bin-line") %>
             <span class="hidden md:block"><%= t(".remove") %></span>
           </button>
@@ -32,5 +32,5 @@
 
     <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
     <%= form.hidden_field :deleted, disabled: !editable %>
-  </div>
+  <% end %>
 </div>

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

@@ -2,12 +2,12 @@
 <% is_expanded = question.errors.any? %>
 
 <div class="card questionnaire-question" id="accordion-<%= id %>-field">
-  <div data-component="accordion">
-    <div class="card-divider">
+  <div data-controller="accordion">
+    <%= content_tag :div, class: ["card-divider", ("hover:cursor-grab" if editable)] do %>
       <h2 class="card-title flex items-center">
         <span>
           <% if editable %>
-            <%== icon("drag-move-2-fill") %>
+            <%= icon("draggable", class: "dragger") %>
           <% end %>
           <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".title_and_description")) %>
         </span>
@@ -23,7 +23,7 @@
           </button>
 
           <% if editable %>
-            <button class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
+            <button type="button" class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>
@@ -71,6 +71,6 @@
 
       <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
       <%= form.hidden_field :deleted, disabled: !editable %>
-    </div>
+    <% end %>
   </div>
 </div>

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

@@ -24,8 +24,7 @@
   <div class="answer-questionnaire__question">
     <%
     label_options = {
-      class: "answer-questionnaire__question-label questionnaire-question",
-      data: { "answer-idx": cleaned_answer_idx }
+      class: "answer-questionnaire__question-label questionnaire-question"
     }
     label_options[:for] = nil if %w(matrix_single matrix_multiple single_option multiple_option).include?(answer.question.question_type)
     %>

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

@@ -17,7 +17,6 @@
 
   <%= invisible_captcha %>
   <% answer_idx = 0 %>
-  <% cleaned_answer_idx = 1 %>
   <% @form.responses_by_step.each_with_index do |step_answers, step_index| %>
     <div id="step-<%= step_index %>" class="answer-questionnaire__step" <%= "hidden" if !step_index.zero? %>>
 
@@ -39,16 +38,11 @@
               answer_form:,
               answer:,
               answer_idx:,
-              cleaned_answer_idx:,
               disabled: !current_participatory_space.can_participate?(current_user)
             ) %>
           <% end %>
         </div>
 
-        <% if !(answer.question.separator? || answer.question.title_and_description?) %>
-          <% cleaned_answer_idx += 1 %>
-        <% end %>
-
         <% answer_idx += 1 %>
 
       <% end %>

data/lib/decidim/exporters/form_pdf.rb

@@ -12,7 +12,14 @@ module Decidim
 
       class QuestionnaireAnswerPresenter < Decidim::Forms::Admin::QuestionnaireAnswerPresenter
         def choice(choice_hash)
-          render_body_for choice_hash
+          if choice_hash[:matrix_row_body].present?
+            row_text = choice_hash[:matrix_row_body]
+            option_text = choice_hash[:answer_option_body]
+            custom_text = choice_hash[:choice_body].present? ? " (#{choice_hash[:choice_body]})" : ""
+            "#{row_text}: #{option_text}#{custom_text}"
+          else
+            render_body_for choice_hash
+          end
         end
 
         delegate :attachments, to: :answer
@@ -25,7 +32,8 @@ module Decidim
           choices = answer.choices.map do |choice|
             {
               answer_option_body: choice.try(:answer_option).try(:translated_body),
-              choice_body: body_or_custom_body(choice)
+              choice_body: body_or_custom_body(choice),
+              matrix_row_body: choice.try(:matrix_row).try(:body) ? translated_attribute(choice.matrix_row.body) : nil
             }
           end
 

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -192,9 +192,7 @@ shared_examples_for "has questionnaire" do
 
         expect(form_fields[0]).to have_i18n_content(question.body)
         expect(form_fields[1]).to have_i18n_content(other_question.body)
-        2.times do |index|
-          expect(form_fields[index]).to have_css("[data-answer-idx='#{index + 1}']")
-        end
+        expect(page.text.index(translated_attribute(other_question.body))).to be > page.text.index(translated_attribute(question.body))
       end
     end
 

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb

@@ -412,11 +412,57 @@ shared_examples_for "add questions" do
 
       select "Single option", from: "Type"
       expect(page).to have_css("input[type=checkbox][id$=_free_text]")
+
+      select "Sorting", from: "Type"
+      expect(page).to have_no_css("input[type=checkbox][id$=_free_text]", visible: :visible)
     end
 
     it_behaves_like "updating the max choices selector according to the configured options"
   end
 
+  context "when adding a sorting question" do
+    before do
+      click_on "Add question"
+
+      expand_all_questions
+
+      within ".questionnaire-question" do
+        fill_in find_nested_form_field_locator("body_en"), with: "This is a sorting question"
+        select "Single option", from: "Type"
+      end
+    end
+
+    it "does not display the free text option when switching to sorting type" do
+      within ".questionnaire-question" do
+        expect(page).to have_css("input[type=checkbox][id$=_free_text]")
+
+        select "Sorting", from: "Type"
+
+        expect(page).to have_no_css("input[type=checkbox][id$=_free_text]", visible: :visible)
+      end
+    end
+
+    it "shows the free text option when switching back from sorting to single option" do
+      within ".questionnaire-question" do
+        select "Sorting", from: "Type"
+        expect(page).to have_no_css("input[type=checkbox][id$=_free_text]", visible: :visible)
+
+        select "Single option", from: "Type"
+        expect(page).to have_css("input[type=checkbox][id$=_free_text]")
+      end
+    end
+
+    it "hides free text option when switching from multiple option to sorting" do
+      within ".questionnaire-question" do
+        select "Multiple option", from: "Type"
+        expect(page).to have_css("input[type=checkbox][id$=_free_text]")
+
+        select "Sorting", from: "Type"
+        expect(page).to have_no_css("input[type=checkbox][id$=_free_text]", visible: :visible)
+      end
+    end
+  end
+
   context "when adding a matrix question" do
     let(:multiple_option_string) { "Matrix (Multiple option)" }
     let(:single_option_string) { "Matrix (Single option)" }

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/draggable_behavior.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "manage questionnaire draggable behavior" do
+  let!(:question) { create(:questionnaire_question, body:, questionnaire:) }
+
+  context "when questionnaire has no responses (editable)" do
+    before do
+      visit current_path
+    end
+
+    it "shows draggable data attributes for questions list" do
+      expect(page).to have_css("[data-draggable-table]")
+      expect(page).to have_css("[data-draggable-handle]")
+    end
+
+    describe "when hovering over card divider" do
+      it "shows resize cursor for editable questions" do
+        within first(".questionnaire-question") do
+          expect(page).to have_css(".card-divider.hover\\:cursor-grab")
+        end
+      end
+    end
+  end
+
+  context "when questionnaire has responses (not editable)" do
+    let!(:answer) { create(:answer, question:, questionnaire:) }
+
+    before do
+      visit current_path
+    end
+
+    it "does not show draggable data attributes for questions list" do
+      expect(page).to have_no_css("[data-draggable-table]")
+      expect(page).to have_no_css("[data-draggable-handle]")
+    end
+
+    describe "when hovering over card divider" do
+      it "does not show resize cursor for non-editable questions" do
+        within first(".questionnaire-question") do
+          expect(page).to have_no_css(".card-divider.hover\\:cursor-grab")
+        end
+      end
+    end
+  end
+end

data/lib/decidim/forms/test/shared_examples/manage_questionnaires.rb

@@ -6,6 +6,7 @@ require "decidim/forms/test/shared_examples/manage_questionnaires/add_questions"
 require "decidim/forms/test/shared_examples/manage_questionnaires/update_questions"
 require "decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions"
 require "decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions"
+require "decidim/forms/test/shared_examples/manage_questionnaires/draggable_behavior"
 
 shared_examples_for "manage questionnaires" do
   let(:body) do
@@ -33,6 +34,7 @@ shared_examples_for "manage questionnaires" do
     it_behaves_like "update questions"
     it_behaves_like "add display conditions"
     it_behaves_like "update display conditions"
+    it_behaves_like "manage questionnaire draggable behavior"
   end
 
   context "when the questionnaire is already answered" do

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.30.6"
+      "0.30.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.30.6
+  version: 0.30.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-26 00:00:00.000000000 Z
+date: 2026-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.6
+        version: 0.30.7
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -281,6 +281,7 @@ files:
 - lib/decidim/forms/test/shared_examples/manage_questionnaires.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaires/draggable_behavior.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
 - lib/decidim/forms/user_answers_serializer.rb