decidim-forms 0.29.4 → 0.29.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14b16d19fcc94b2efb57354638870b2ddf616b5e2ca9d00a8fc98a785a2ffd8
-  data.tar.gz: 8c0727b7df66bba9d36cd805a0989275bc862b97648d3ad6b6af18be70080474
+  metadata.gz: 2ce738212e0b63facce1af0be9fc9a1a3d9ed6e0613f164a4a31df4fca52c853
+  data.tar.gz: b8ad317420fcdf8c42a0edce7198a1954e932e87cb8ab25657785389ac3ab2bb
 SHA512:
-  metadata.gz: e4faae5d6735abf2eb7bcd00502490cbf416b8105d3154e44b7dd4b4473918295353b873e755ae492ebb2a7d46aff5b3a04743f1fb4f731b4e4955ba6e6b5d19
-  data.tar.gz: 60165760b527d12dab0ae631f9594bcf123d8e164e1d38cb2060cc26e3ae2a68ae8de385b5cc9a9752f241dc78b25134f1fb3ae85ed9dcbc2231e0cb2a3839c0
+  metadata.gz: 2f08bbd067838b1f501aee2ae1061df4a33733cdc5a41e62b867082c687981e6ed3598f5d76e722de90a327d4d771d966a1948114f47296cff662a5d0d659e18
+  data.tar.gz: 4293241ee42c78de0f5d5a429b3281c8c0bc1de953dca13eb67ad7c4720d758c9a36b7759d5fb24c6e956edb1cfcfcb2f52a2ffec8684ed22df283ec50475afa

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) => {
@@ -34,10 +35,31 @@ $(() => {
     }
   });
 
-  document.querySelectorAll(".js-sortable-check-box-collection").forEach((el) => new DragonDrop(el, {
-    handle: false,
-    item: ".js-collection-input"
-  }));
+  document.querySelectorAll(".js-sortable-check-box-collection").forEach((el) =>  {
+
+    /**
+    * Due to a bug reported in https://github.com/decidim/decidim/issues/15191
+    * we have to listen to the `drag` event and prevent the scrolling
+    * and enabling it back again after it.
+    */
+
+    let preventScroll = function(event) {
+      event.preventDefault();
+    }
+
+    el.addEventListener("touchmove", (event) => {
+      preventScroll(event);
+    }, { passive: false });
+
+    el.addEventListener("touchend", () => {
+      el.removeEventListener("touchmove", preventScroll)
+    });
+
+    return new DragonDrop(el, {
+      handle: false,
+      item: ".js-collection-input"
+    });
+  });
 
   $(".answer-questionnaire .question[data-conditioned='true']").each((idx, el) => {
     createDisplayConditions({
@@ -45,30 +67,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/admin/questionnaires/_question.html.erb

@@ -23,17 +23,7 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent-secondary small alert move-up-question button--title">
-              <%= icon("arrow-up-line") %>
-              <%= t(".up") %>
-            </button>
-
-            <button class="button button__sm button__transparent-secondary small alert move-down-question button--title">
-              <%= icon("arrow-down-line") %>
-              <%= t(".down") %>
-            </button>
-
-            <button class="button button__sm button__transparent-secondary small alert remove-question button--title">
+            <button class="button button__xs button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

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

@@ -12,16 +12,9 @@
 
       <div class="flex items-center gap-x-4 ml-auto">
         <% if editable %>
-          <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
-            <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
-          </button>
-
-          <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
-            <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
-          </button>
-
-          <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
-            <%= t(".remove") %>
+          <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>
         <% end %>
       </div>

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

@@ -23,17 +23,7 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
-              <%= icon("arrow-up-line") %>
-              <%= t(".up") %>
-            </button>
-
-            <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
-              <%= icon("arrow-down-line") %>
-              <%= t(".down") %>
-            </button>
-
-            <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
+            <button class="button button__xs button__transparent button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

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/ar.yml

@@ -35,11 +35,9 @@ ar:
             add_answer_option: إضافة خيار الإجابة
             any: أي
             description: وصف
-            down: أسفل
             question: سؤال
             remove: إزالة
             statement: بيان
-            up: فوق
           title_and_description:
             description: الوصف
           update:

data/config/locales/bg.yml

@@ -76,26 +76,20 @@ bg:
             any: Някой
             collapse: Свий
             description: Описание
-            down: Надолу
             expand: Разтваряне
             question: Въпрос
             remove: Премахни
             statement: Изявление
-            up: Горе
           separator:
-            down: Долу
             remove: Премахни
             separator: Разделител
-            up: Горе
           title_and_description:
             collapse: Свий
             description: Описание
-            down: Долу
             expand: Разтваряне
             remove: Премахни
             title: Заглавие
             title_and_description: Заглавие и описание
-            up: Горе
           update:
             invalid: Възникна проблем при запазването на формуляра.
             success: Формулярите бяха запазени успешно.

data/config/locales/ca-IT.yml

@@ -101,26 +101,20 @@ ca-IT:
             any: Cap
             collapse: Redueix
             description: Descripció
-            down: Avall
             expand: Expandeix
             question: Pregunta
             remove: Eliminar
             statement: Declaració
-            up: Amunt
           separator:
-            down: Baixar
             remove: Eliminar
             separator: Separador
-            up: Pujar
           title_and_description:
             collapse: Replegar
             description: Descripció
-            down: Baixar
             expand: Expandir
             remove: Esborrar
             title: Títol
             title_and_description: Títol i descripció
-            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.

data/config/locales/ca.yml

@@ -101,26 +101,20 @@ ca:
             any: Cap
             collapse: Redueix
             description: Descripció
-            down: Avall
             expand: Expandeix
             question: Pregunta
             remove: Eliminar
             statement: Declaració
-            up: Amunt
           separator:
-            down: Baixar
             remove: Eliminar
             separator: Separador
-            up: Pujar
           title_and_description:
             collapse: Replegar
             description: Descripció
-            down: Baixar
             expand: Expandir
             remove: Esborrar
             title: Títol
             title_and_description: Títol i descripció
-            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.

data/config/locales/cs.yml

@@ -101,26 +101,20 @@ cs:
             any: Žádný
             collapse: Sbalit
             description: Popis
-            down: Dolů
             expand: Rozbalit
             question: Otázka
             remove: Odstranit
             statement: Prohlášení
-            up: Nahoru
           separator:
-            down: Dolů
             remove: Odebrat
             separator: Oddělovač
-            up: Nahoru
           title_and_description:
             collapse: Sbalit
             description: Popis
-            down: Dolů
             expand: Rozbalit
             remove: Odebrat
             title: Název
             title_and_description: Název a popis
-            up: Nahoru
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.

data/config/locales/de.yml

@@ -101,26 +101,20 @@ de:
             any: Irgendein
             collapse: Einklappen
             description: Beschreibung
-            down: Nach unten
             expand: Ausklappen
             question: Frage
             remove: Löschen
             statement: Aussage
-            up: Oben
           separator:
-            down: Runter
             remove: Löschen
             separator: Trennzeichen
-            up: Nach oben
           title_and_description:
             collapse: Einklappen
             description: Beschreibung
-            down: Runter
             expand: Ausklappen
             remove: Entfernen
             title: Titel
             title_and_description: Titel und Beschreibung
-            up: Hinauf
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.

data/config/locales/el.yml

@@ -76,26 +76,20 @@ el:
             any: Οποιαδήποτε
             collapse: Σύμπτυξη
             description: Περιγραφή
-            down: Κάτω
             expand: Ανάπτυξη
             question: Ερώτηση
             remove: Κατάργηση
             statement: Δήλωση
-            up: Επάνω
           separator:
-            down: Κάτω
             remove: Κατάργηση
             separator: Διαχωριστικό
-            up: Επάνω
           title_and_description:
             collapse: Σύμπτυξη
             description: Περιγραφή
-            down: Κάτω
             expand: Ανάπτυξη
             remove: Αφαίρεση
             title: Τίτλος
             title_and_description: Τίτλος και περιγραφή
-            up: Πάνω
           update:
             invalid: Υπήρξε ένα πρόβλημα κατά την αποθήκευση της φόρμας.
             success: Η φόρμα αποθηκεύτηκε επιτυχώς.

data/config/locales/en.yml

@@ -101,26 +101,20 @@ en:
             any: Any
             collapse: Collapse
             description: Description
-            down: Down
             expand: Expand
             question: Question
             remove: Remove
             statement: Statement
-            up: Up
           separator:
-            down: Down
             remove: Remove
             separator: Separator
-            up: Up
           title_and_description:
             collapse: Collapse
             description: Description
-            down: Down
             expand: Expand
             remove: Remove
             title: Title
             title_and_description: Title and description
-            up: Up
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.

data/config/locales/es-MX.yml

@@ -101,26 +101,20 @@ es-MX:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Borrar
             statement: Declaración
-            up: Arriba
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.

data/config/locales/es-PY.yml

@@ -101,26 +101,20 @@ es-PY:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Borrar
             statement: Declaración
-            up: Arriba
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.

data/config/locales/es.yml

@@ -101,26 +101,20 @@ es:
             any: Alguna
             collapse: Contraer
             description: Descripción
-            down: Abajo
             expand: Expandir
             question: Pregunta
             remove: Eliminar
             statement: Declaración
-            up: Arriba
           separator:
-            down: Bajar
             remove: Eliminar
             separator: Separador
-            up: Subir
           title_and_description:
             collapse: Contraer
             description: Descripción
-            down: Bajar
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título y descripción
-            up: Subir
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.

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
@@ -101,26 +101,20 @@ eu:
             any: Edozein
             collapse: Bildu
             description: Deskribapena
-            down: Behera
             expand: Zabaldu
             question: Galdera
             remove: Kendu
             statement: Adierazpena
-            up: Gora
           separator:
-            down: Behera
             remove: Kendu
             separator: Bereizlea
-            up: Gora
           title_and_description:
             collapse: Kolapsoa
             description: Deskribapena
-            down: Behera
             expand: Zabaldu
             remove: Kendu
             title: Izenburua
             title_and_description: Izenburua eta deskribapena
-            up: Gora
           update:
             invalid: Arazo bat egon da inprimakia gordetzean.
             success: Galdetegia zuzen gorde da.

data/config/locales/fi-plain.yml

@@ -101,26 +101,20 @@ fi-pl:
             any: Minkä tahansa
             collapse: Sulje
             description: Kuvaus
-            down: Alas
             expand: Avaa
             question: Kysymys
             remove: Poista
             statement: Selite
-            up: Ylös
           separator:
-            down: Alas
             remove: Poista
             separator: Erotin
-            up: Ylös
           title_and_description:
             collapse: Pienennä
             description: Kuvaus
-            down: Alas
             expand: Laajenna
             remove: Poista
             title: Otsikko
             title_and_description: Otsikko ja kuvaus
-            up: Ylös
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.

data/config/locales/fi.yml

@@ -101,26 +101,20 @@ fi:
             any: Minkä tahansa
             collapse: Sulje
             description: Kuvaus
-            down: Alas
             expand: Avaa
             question: Kysymys
             remove: Poista
             statement: Selite
-            up: Ylös
           separator:
-            down: Alas
             remove: Poista
             separator: Erotin
-            up: Ylös
           title_and_description:
             collapse: Pienennä
             description: Kuvaus
-            down: Alas
             expand: Laajenna
             remove: Poista
             title: Otsikko
             title_and_description: Otsikko ja kuvaus
-            up: Ylös
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomakkeen tallennus onnistui.

data/config/locales/fr-CA.yml

@@ -101,26 +101,20 @@ fr-CA:
             any: Tout
             collapse: Réduire
             description: Description
-            down: Descendre
             expand: Déveloper
             question: Question
             remove: Retirer
             statement: Déclaration
-            up: Monter
           separator:
-            down: Bas
             remove: Retirer
             separator: Séparateur
-            up: Haut
           title_and_description:
             collapse: Réduire
             description: Description
-            down: Descendre
             expand: Déveloper
             remove: Supprimer
             title: Titre
             title_and_description: Titre et description
-            up: Vers le haut
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le formulaire a bien été sauvegardé.

data/config/locales/fr.yml

@@ -101,26 +101,20 @@ fr:
             any: Tout
             collapse: Réduire
             description: Description
-            down: Descendre
             expand: Déveloper
             question: Question
             remove: Retirer
             statement: Déclaration
-            up: Monter
           separator:
-            down: Bas
             remove: Retirer
             separator: Séparateur
-            up: Haut
           title_and_description:
             collapse: Réduire
             description: Description
-            down: Descendre
             expand: Développer
             remove: Supprimer
             title: Titre
             title_and_description: Titre et description
-            up: Monter
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le questionnaire a bien été sauvegardé.

data/config/locales/ga-IE.yml

@@ -27,15 +27,11 @@ ga:
           question:
             add_matrix_row: Suimigh ró
             any: Ar Bith
-            down: Síos
             expand: Méadaigh
             question: Ceist
             remove: Bain as
-            up: Thuas
           separator:
-            down: Ísligh
             remove: Bain as
-            up: Ardaigh
       question_types:
         files: Comhaid
         sorting: Sórtáil