decidim-forms 0.31.2 → 0.31.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533c98f5bea9b27f56b1b38e31f566288c01c47d811c5ccd3b7ede29743162d5
-  data.tar.gz: b5f8f7382b27174aec69cbbef6f114ebe11d72d0e3db13d51037d369f3dd404f
+  metadata.gz: 181f8efb5bbf6cad3d063b4b9db3f0ddf0092a89677a98a8764c787ba7e72cb6
+  data.tar.gz: b54651be0bde86cb03f32c34e1f435f3e98fea0f77b7d06ee89416dcd9b1858f
 SHA512:
-  metadata.gz: a041e17927a8135ccaf698d1572598969e5998f3627a24b08291cc495672fb46a4238e42e70a4e06a04a5431a319f0781b2a8ddb6704e47358e2a4b8e5a1029b
-  data.tar.gz: dac22d94c860656ba92a5461bb594a819a924627df74f3f654739fae8c529ff5e1a44979e7ae031bb08135273e03ccd21f93287aed5164d7fe198132674809ca
+  metadata.gz: baca11153797c7ef3247ef82a3ab2040e21d7dce54fc1b755d35126640d56971ff9d21bd2377b70b1d83decb887300fb98a22f2a503254d8a9d0521bda25b2fb
+  data.tar.gz: e1bf97e034df11d10fab37347e12858b46f52eefadf3ac4c5124a503950a96fbd4afa4a462fa528c6b0b420180bae40ba129ee08920cad3827ed7d3fe8dd593d

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

@@ -48,6 +48,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 responses

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

@@ -9,6 +9,7 @@ import AutoButtonsByPositionComponent from "src/decidim/admin/auto_buttons_by_po
 import AutoLabelByPositionComponent from "src/decidim/admin/auto_label_by_position.component"
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
+import sortable from "html5sortable/dist/html5sortable.es"
 
 export default function createEditableForm() {
   const wrapperSelector = ".questionnaire-questions";
@@ -22,6 +23,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-response-option-free-text";
 
   const displayConditionFieldSelector = ".questionnaire-question-display-condition";
   const displayConditionsWrapperSelector = ".questionnaire-question-display-conditions";
@@ -335,7 +337,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(responseOptionFieldSelector).length;
 
         if (nOptions === 0) {
@@ -352,6 +357,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);
@@ -396,6 +407,15 @@ export default function createEditableForm() {
         });
       }
 
+      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-response-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/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-controller="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") %>
               <span class="hidden md:block"><%= t(".remove") %></span>
             </button>
           <% end %>
           </span>
       </h2>
-    </div>
+    <% end %>
 
     <div id="panel-<%= id %>-question-card" class="panel-question-card card-section collapsible <%= "panel-error" if is_expanded %>" aria-hidden="<%= is_expanded ? "false" : "true" %>">
       <div class="row column">

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

@@ -40,7 +40,15 @@
     <%= cell("decidim/announcement", t(".already_responded_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? %>
@@ -67,7 +75,7 @@
         <% end %>
       <% end %>
     <% end %>
-  </div>
+  <% end %>
 </div>
 
 <%= append_javascript_pack_tag "decidim_forms_admin" %>

data/app/views/decidim/forms/admin/questionnaires/_response_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-response-option-free-text">
+        <%=
+          form.check_box(
+            :free_text,
+            label: t(".free_text"),
+            disabled: !questionnaire.questions_editable?
+          )
+        %>
+      </div>
   </div>
 
   <% if response_option.persisted? %>

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 flex-row-reverse 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

@@ -3,11 +3,11 @@
 
 <div class="card questionnaire-question" id="accordion-<%= id %>-field">
   <div data-controller="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(".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") %>
               <span class="hidden md:block"><%= t(".remove") %></span>
             </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/_questionnaire.html.erb

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

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

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

data/config/locales/ca-IT.yml

@@ -50,7 +50,7 @@ ca-IT:
             description: Descripció
             ends_at: Respostes acceptades fins a
             ends_at_help: Deixar en blanc si no hi ha cap data específica
-            starts_at: Respostes acceptades fins a
+            starts_at: Respostes acceptades des de
             starts_at_help: Deixar en blanc si no hi ha cap data específica
             tos: Termes del servei
         questionnaires:

data/config/locales/ca.yml

@@ -50,7 +50,7 @@ ca:
             description: Descripció
             ends_at: Respostes acceptades fins a
             ends_at_help: Deixar en blanc si no hi ha cap data específica
-            starts_at: Respostes acceptades fins a
+            starts_at: Respostes acceptades des de
             starts_at_help: Deixar en blanc si no hi ha cap data específica
             tos: Termes del servei
         questionnaires:

data/config/locales/es-MX.yml

@@ -50,7 +50,7 @@ es-MX:
             description: Descripción
             ends_at: Respuestas aceptadas hasta
             ends_at_help: Dejar en blanco si no hay ninguna fecha específica
-            starts_at: Respuestas aceptadas hasta
+            starts_at: Respuestas aceptadas desde
             starts_at_help: Dejar en blanco si no hay ninguna fecha específica
             tos: Términos y condiciones de uso
         questionnaires:

data/config/locales/es-PY.yml

@@ -50,7 +50,7 @@ es-PY:
             description: Descripción
             ends_at: Respuestas aceptadas hasta
             ends_at_help: Dejar en blanco si no hay ninguna fecha específica
-            starts_at: Respuestas aceptadas hasta
+            starts_at: Respuestas aceptadas desde
             starts_at_help: Dejar en blanco si no hay ninguna fecha específica
             tos: Términos y condiciones de uso
         questionnaires:

data/config/locales/es.yml

@@ -50,7 +50,7 @@ es:
             description: Descripción
             ends_at: Respuestas aceptadas hasta
             ends_at_help: Dejar en blanco si no hay ninguna fecha específica
-            starts_at: Respuestas aceptadas hasta
+            starts_at: Respuestas aceptadas desde
             starts_at_help: Dejar en blanco si no hay ninguna fecha específica
             tos: Términos y condiciones de uso
         questionnaires:

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-response-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!(:response) { create(:response, 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 responded" 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.31.2"
+      "0.31.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.31.3
 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.31.2
+        version: 0.31.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.31.3
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.31.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.31.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.31.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.31.3
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -284,6 +284,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_responses_serializer.rb