decidim-forms 0.29.4 → 0.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14b16d19fcc94b2efb57354638870b2ddf616b5e2ca9d00a8fc98a785a2ffd8
-  data.tar.gz: 8c0727b7df66bba9d36cd805a0989275bc862b97648d3ad6b6af18be70080474
+  metadata.gz: 202c3358cbfb1e02e80c1f616a7e153c9e111e614038189f5f957abaff46fdcc
+  data.tar.gz: 408fc4f21eedc9917f9a53c1ce4441fd2c50ece4a4282ee6795f9e5280c6fb78
 SHA512:
-  metadata.gz: e4faae5d6735abf2eb7bcd00502490cbf416b8105d3154e44b7dd4b4473918295353b873e755ae492ebb2a7d46aff5b3a04743f1fb4f731b4e4955ba6e6b5d19
-  data.tar.gz: 60165760b527d12dab0ae631f9594bcf123d8e164e1d38cb2060cc26e3ae2a68ae8de385b5cc9a9752f241dc78b25134f1fb3ae85ed9dcbc2231e0cb2a3839c0
+  metadata.gz: ec3e4a3d75dd117f6bd4837e5ee12e8a3fe73406c64e13e8911aafc5312e51118ccfbce4b690cdf551ef0e0f9add6b60ebbe4ce1a973c36619c07e31c04b5886
+  data.tar.gz: 43d4d6b33a4246edf67731e2799c177e2a0165fb9adaf55e65e0eb83310819f553fd64a47f4fd7d41f241bea226d89aafbfef51a314a5e7581ee4a984e2cb156

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/views/decidim/forms/questionnaires/_answer.html.erb

@@ -50,7 +50,7 @@
       <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
     <% end %>
 
-    <% answer.errors.full_messages.each do |msg| %>
+    <% %w(short_answer long_answer).exclude?(answer&.question&.question_type) && answer.errors.full_messages.each do |msg| %>
       <small class="form-error is-visible"><%= msg %></small>
     <% end %>
 

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

@@ -1,3 +1,3 @@
 <div>
-  <%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled:, maxlength:, class: "w-full" %>
+  <%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled:, maxlength:, class: "w-full", required: false %>
 </div>

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

@@ -1,3 +1,3 @@
 <div>
-  <%= answer_form.text_field :body, label: false, id: field_id, disabled:, maxlength:, class: "w-full" %>
+  <%= answer_form.text_field :body, label: false, id: field_id, disabled:, maxlength:, class: "w-full", required: false %>
 </div>

data/config/locales/eu.yml

@@ -78,7 +78,7 @@ eu:
             select_condition_type: Hautatu baldintza mota bat
           edit:
             save: Gorde
-            title: Editatu galdetegia
+            title: Galdetegia editau
           form:
             add_question: Gehitu galdera
             add_separator: Gehitu banatzailea

data/config/locales/sv.yml

@@ -177,10 +177,10 @@ sv:
             title: JavaScript är inaktiverat
           questionnaire_not_published:
             body: Formulär är ännu inte publicerat.
-          tos_agreement: Genom att fortsätta godkänner du användarvillkoren
+          tos_agreement: Genom att fortsätta godkänner du villkoren för anmälan
       step_navigation:
         show:
-          are_you_sure: Den här åtgärden kan inte ångras och du kommer inte att kunna redigera dina svar. Vill du fortsätta?
+          are_you_sure: Efter att du har skickat in anmälan kan du inte ändra i den. Vill du fortsätta?
           back: Tillbaka
           continue: Fortsätt
           submit: Skicka

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

@@ -271,8 +271,9 @@ shared_examples_for "has questionnaire" do
         accept_confirm { click_on "Submit" }
       end
 
-      it "shows errors without submitting the form" do
-        expect(page).to have_no_css ".alert.flash"
+      it "submits the form and shows errors" do
+        expect(page).to have_css ".alert.flash"
+        expect(page).to have_admin_callout(callout_failure)
         different_error = I18n.t("decidim.forms.questionnaires.answer.max_choices_alert")
         expect(different_error).to eq("There are too many choices selected")
         expect(page).to have_no_content(different_error)

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.29.4
+  version: 0.29.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com