decidim-forms 0.29.4 → 0.29.6

data/config/locales/gl.yml

@@ -32,20 +32,16 @@ gl:
             add_answer_option: Engadir unha opción de resposta
             any: Calquera
             description: Descrición
-            down: Baixo
             question: Pregunta
             remove: Quitar
             statement: Declaración
-            up: Arriba
           title_and_description:
             collapse: Contraer
             description: Descrición
-            down: Abaixo
             expand: Expandir
             remove: Eliminar
             title: Título
             title_and_description: Título e descrición
-            up: Arriba
           update:
             invalid: Produciuse un erro ao gardar o cuestionario.
       images:

data/config/locales/hu.yml

@@ -35,21 +35,17 @@ hu:
             any: Bármilyen
             collapse: Összecsukás
             description: Leírás
-            down: Le
             expand: Kibontás
             question: Kérdés
             remove: Eltávolít
             statement: Nyilatkozat
-            up: Fel
           title_and_description:
             collapse: Összecsuk
             description: Leírás
-            down: Le
             expand: Kibont
             remove: Eltávolít
             title: Cím
             title_and_description: Cím és leírás
-            up: Fel
           update:
             invalid: Hiba történt a kérdőív mentésekor.
       images:

data/config/locales/id-ID.yml

@@ -32,11 +32,9 @@ id:
             add_answer_option: Tambahkan opsi jawaban
             any: Apa saja
             description: Deskripsi
-            down: Turun
             question: Pertanyaan
             remove: Menghapus
             statement: Pernyataan
-            up: Naik
           update:
             invalid: Terjadi masalah saat menyimpan formulir.
       question_types:

data/config/locales/it.yml

@@ -74,17 +74,13 @@ it:
             any: Qualunque
             collapse: Comprimi
             description: Descrizione
-            down: Giù
             expand: Espandi
             question: Domanda
             remove: Rimuovere
             statement: dichiarazione
-            up: Su
           separator:
-            down: Giù
             remove: Elimina
             separator: Separatore
-            up: Su
           update:
             invalid: Si sono verificati errori durante il salvataggio del questionario.
             success: Modulo salvato correttamente.

data/config/locales/ja.yml

@@ -101,26 +101,20 @@ ja:
             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/lb.yml

@@ -72,17 +72,13 @@ lb:
             any: Irgendein
             collapse: Zouklappen
             description: Beschreiwung
-            down: Runter
             expand: Ausklappen
             question: Fro
             remove: Löschen
             statement: Aussage
-            up: Hoch
           separator:
-            down: Runter
             remove: Löschen
             separator: Trennzeichen
-            up: Hoch
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.

data/config/locales/lt.yml

@@ -76,26 +76,20 @@ lt:
             any: Bet koks
             collapse: Suskleisti
             description: Aprašymas
-            down: Žemyn
             expand: Išplėsti
             question: Klausimas
             remove: Pašalinti
             statement: Pareiškimas
-            up: Į viršų
           separator:
-            down: Žemyn
             remove: Pašalinti
             separator: Skirtukas
-            up: Į viršų
           title_and_description:
             collapse: Suskleisti
             description: Aprašymas
-            down: Žemyn
             expand: Išplėsti
             remove: Pašalinti
             title: Pavadinimas
             title_and_description: Pavadinimas ir aprašymas
-            up: Aukštyn
           update:
             invalid: Išsaugant šią formą iškilo problema.
             success: Forma sėkmingai išsaugota.

data/config/locales/lv.yml

@@ -38,17 +38,13 @@ lv:
             any: Jebkura
             collapse: Sakļaut
             description: Apraksts
-            down: Lejup
             expand: Izvērst
             question: Jautājums
             remove: Noņemt
             statement: Paziņojums
-            up: Augšup
           separator:
-            down: Lejup
             remove: Noņemt
             separator: Atdalītājs
-            up: Augšup
           update:
             invalid: Saglabājot veidlapu, radās problēma.
       images:

data/config/locales/nl.yml

@@ -70,26 +70,20 @@ nl:
             any: Ieder
             collapse: Samenvouwen
             description: Omschrijving
-            down: naar beneden
             expand: Uitklappen
             question: Vraag
             remove: Verwijderen
             statement: Uitspraak
-            up: omhoog
           separator:
-            down: Omlaag
             remove: Verwijderen
             separator: Scheidingsteken
-            up: Omhoog
           title_and_description:
             collapse: Inklappen
             description: Beschrijving
-            down: Naar beneden
             expand: Uitklappen
             remove: Verwijderen
             title: Titel
             title_and_description: Titel en beschrijving
-            up: Naar boven
           update:
             invalid: Er zijn fouten opgetreden bij het opslaan van de vragenlijst.
             success: Formulier succesvol opgeslagen.

data/config/locales/no.yml

@@ -72,26 +72,20 @@
             any: Alle
             collapse: Skjul
             description: Beskrivelse
-            down: Ned
             expand: Utvid
             question: Spørsmål
             remove: Fjern
             statement: Uttalelse
-            up: Opp
           separator:
-            down: Ned
             remove: Fjern
             separator: Skilletegn
-            up: Opp
           title_and_description:
             collapse: Kollaps
             description: Beskrivelse
-            down: Ned
             expand: Utvid
             remove: Fjern
             title: Tittel
             title_and_description: Tittel og beskrivelse
-            up: Opp
           update:
             invalid: Det oppstod et problem med å lagre dette skjema.
             success: Skjemaet ble lagret.

data/config/locales/pl.yml

@@ -76,26 +76,20 @@ pl:
             any: Dowolny
             collapse: Zwiń
             description: Opis
-            down: Na dół
             expand: Rozwiń
             question: Pytanie
             remove: Usuń
             statement: Komunikat
-            up: W górę
           separator:
-            down: Na dół
             remove: Usuń
             separator: Separator
-            up: W górę
           title_and_description:
             collapse: Zwiń
             description: Opis
-            down: W dół
             expand: Rozwiń
             remove: Usuń
             title: Tytuł
             title_and_description: Tytuł i opis
-            up: W górę
           update:
             invalid: Podczas zapisywania formularza wystąpił błąd.
             success: Formularz został zapisany.

data/config/locales/pt-BR.yml

@@ -72,26 +72,20 @@ pt-BR:
             any: Qualquer
             collapse: Recolher
             description: Descrição
-            down: Baixa
             expand: Expandir
             question: Questão
             remove: Remover
             statement: Declaração
-            up: Acima
           separator:
-            down: Para Baixo
             remove: Remover
             separator: Separador
-            up: Para Cima
           title_and_description:
             collapse: Recolher
             description: Descrição
-            down: Abaixo
             expand: Expandir
             remove: Excluir
             title: Título
             title_and_description: Título e descrição
-            up: Acima
           update:
             invalid: Houve erros ao salvar o questionário.
             success: Formulário salvo com sucesso.

data/config/locales/pt.yml

@@ -72,17 +72,13 @@ pt:
             any: Qualquer
             collapse: Colapsar
             description: Descrição
-            down: Abaixo
             expand: Expandir
             question: Questão
             remove: Remover
             statement: Declaração
-            up: Acima
           separator:
-            down: Abaixo
             remove: Remover
             separator: Separador
-            up: Acima
           update:
             invalid: Ocorreu um problema ao guardar o questionário.
             success: Formulário guardado com êxito

data/config/locales/ro-RO.yml

@@ -89,26 +89,20 @@ ro:
             any: Oricare
             collapse: Restrângeți
             description: Descriere
-            down: Mergi în jos
             expand: Extindeți
             question: Întrebare
             remove: Eliminați
             statement: Declarație
-            up: Mergi în sus
           separator:
-            down: Mergi în jos
             remove: Elimină
             separator: Separator
-            up: Mergi în sus
           title_and_description:
             collapse: Restrângeți
             description: Descriere
-            down: Mergi în jos
             expand: Extindeți
             remove: Șterge
             title: Titlu
             title_and_description: Titlu și descriere
-            up: Mergi în sus
           update:
             invalid: A apărut o eroare la salvarea chestionarului.
             success: Chestionarul a fost salvat cu succes.

data/config/locales/ru.yml

@@ -20,10 +20,8 @@ ru:
           question:
             add_answer_option: Добавить вариант ответа
             any: Любые
-            down: Вниз
             question: Вопрос
             remove: Удалить
-            up: Вверх
           update:
             invalid: При попытке сохранить форму произошли ошибки.
       question_types:

data/config/locales/sk.yml

@@ -32,11 +32,9 @@ sk:
             add_answer_option: Pridať možnosť odpovede
             any: Akékoľvek
             description: Popis
-            down: Nadol
             question: Otázka
             remove: Odstrániť
             statement: Prehlásenie
-            up: Hore
           update:
             invalid: Vyskytol sa problém s ukladaním formulára.
       question_types:

data/config/locales/sv.yml

@@ -100,26 +100,20 @@ sv:
             any: Valfritt
             collapse: Dölj
             description: Beskrivning
-            down: Ner
             expand: Visa
             question: Fråga
             remove: Ta bort
             statement: Titel
-            up: Upp
           separator:
-            down: Ner
             remove: Ta bort
             separator: Avgränsare
-            up: Upp
           title_and_description:
             collapse: Dölj
             description: Beskrivning
-            down: Ner
             expand: Visa
             remove: Ta bort
             title: Titel
             title_and_description: Titel och beskrivning
-            up: Upp
           update:
             invalid: Det gick inte att spara formuläret.
             success: Formuläret har sparats.
@@ -177,10 +171,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/config/locales/tr-TR.yml

@@ -71,17 +71,13 @@ tr:
             any: herhangi
             collapse: Daralt
             description: Açıklama
-            down: Aşağı
             expand: Genişlet
             question: Soru
             remove: Kaldır
             statement: Beyan
-            up: yukarı
           separator:
-            down: Aşağı
             remove: Kaldır
             separator: Ayraç
-            up: Yukarı
           update:
             invalid: Formu kaydederken bir sorun oluştu.
             success: Başarıyla kaydedildi.

data/config/locales/val-ES.yml

@@ -7,11 +7,9 @@ val:
           title_and_description:
             collapse: Redueix
             description: Descripció
-            down: Baixar
             expand: Expandeix
             remove: Elimina
             title: Títol
             title_and_description: Títol i descripció
-            up: Pujar
       question_types:
         title_and_description: Títol i descripció

data/config/locales/zh-CN.yml

@@ -70,17 +70,13 @@ zh-CN:
             any: 任何
             collapse: 收起
             description: 描述
-            down: 向下
             expand: 扩展
             question: 问
             remove: 删除
             statement: 声明
-            up: 上移
           separator:
-            down: 向下
             remove: 删除
             separator: 分隔符
-            up: 上移
           update:
             invalid: 保存表单时出错。
             success: 表单保存成功。

data/config/locales/zh-TW.yml

@@ -76,26 +76,20 @@ zh-TW:
             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/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/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -352,6 +352,10 @@ shared_examples_for "update questions" do
       create(:questionnaire_question, questionnaire:, body: second_body, position: 1)
     end
 
+    let!(:question3) do
+      create(:questionnaire_question, questionnaire:, body: third_body, position: 2)
+    end
+
     let(:first_body) do
       { en: "First", ca: "Primera", es: "Primera" }
     end
@@ -360,6 +364,10 @@ shared_examples_for "update questions" do
       { en: "Second", ca: "Segona", es: "Segunda" }
     end
 
+    let(:third_body) do
+      { en: "Third", ca: "Tercera", es: "Tercera" }
+    end
+
     before do
       visit questionnaire_edit_path
       expand_all_questions
@@ -379,26 +387,6 @@ shared_examples_for "update questions" do
       end
     end
 
-    context "when moving a question up" do
-      before do
-        within ".questionnaire-question:last-of-type" do
-          click_on "Up"
-        end
-      end
-
-      it_behaves_like "switching questions order"
-    end
-
-    context "when moving a question down" do
-      before do
-        within ".questionnaire-question:first-of-type" do
-          click_on "Down"
-        end
-      end
-
-      it_behaves_like "switching questions order"
-    end
-
     describe "collapsible questions" do
       context "when clicking on Expand all button" do
         it "expands all questions" do
@@ -494,16 +482,37 @@ shared_examples_for "update questions" do
       click_on "Add question"
       expand_all_questions
 
-      expect(page.find(".questionnaire-question:nth-of-type(1)")).to look_like_first_question
-      expect(page.find(".questionnaire-question:nth-of-type(2)")).to look_like_intermediate_question
-      expect(page.find(".questionnaire-question:nth-of-type(3)")).to look_like_last_question
+      question_cards = page.all(".questionnaire-question")
+      expect(question_cards.size).to eq(4)
+
+      within question_cards[1] do
+        expect(find("input[name*='[body_en]']").value).to eq("Second")
+      end
+      within question_cards[2] do
+        expect(find("input[name*='[body_en]']").value).to eq("Third")
+      end
 
       within ".questionnaire-question:first-of-type" do
         click_on "Remove"
       end
 
-      expect(page.all(".questionnaire-question").first).to look_like_first_question
-      expect(page.all(".questionnaire-question").last).to look_like_last_question
+      remaining_cards = page.all(".questionnaire-question")
+      expect(remaining_cards.size).to eq(3)
+
+      # Check that the first question is now what was previously the second
+      within remaining_cards.first do
+        expect(find("input[name*='[body_en]']").value).to eq("Second")
+      end
+
+      # Check that the second question is now what was previously the third
+      within remaining_cards[1] do
+        expect(find("input[name*='[body_en]']").value).to eq("Third")
+      end
+
+      # The last question should be the new empty question
+      within remaining_cards.last do
+        expect(find("input[name*='[body_en]']").value).to eq("")
+      end
     end
 
     it "does not duplicate editors when adding new questions" do
@@ -547,6 +556,94 @@ shared_examples_for "update questions" do
       end
     end
 
+    context "when reordering questions with drag and drop", :js do
+      before do
+        expand_all_questions
+      end
+
+      it "allows moving questions using drag and drop" do
+        question_cards = all(".questionnaire-question")
+
+        # Verify initial order by checking the body field values
+        within question_cards[0] do
+          expect(find("input[name*='[body_en]']").value).to eq("First")
+        end
+        within question_cards[1] do
+          expect(find("input[name*='[body_en]']").value).to eq("Second")
+        end
+        within question_cards[2] do
+          expect(find("input[name*='[body_en]']").value).to eq("Third")
+        end
+
+        # JavaScript to simulate drag and drop.
+        page.execute_script(<<~JS)
+          var questions = document.querySelectorAll('.questionnaire-question');
+          var container = questions[0].parentNode;
+          var second = questions[1];
+          var first = questions[0];
+
+          // Move second question before first
+          container.insertBefore(second, first);
+
+          // Update position values
+          var updatedQuestions = container.querySelectorAll('.questionnaire-question');
+          updatedQuestions.forEach(function(question, index) {
+            var positionInput = question.querySelector('input[name$="[position]"]');
+            if (positionInput) positionInput.value = index;
+          });
+        JS
+
+        sleep 0.5
+
+        question_cards = all(".questionnaire-question")
+        within question_cards[0] do
+          expect(find("input[name*='[body_en]']").value).to eq("Second")
+        end
+        within question_cards[1] do
+          expect(find("input[name*='[body_en]']").value).to eq("First")
+        end
+        within question_cards[2] do
+          expect(find("input[name*='[body_en]']").value).to eq("Third")
+        end
+      end
+
+      it "persists drag and drop changes when saving" do
+        # Move second question to last position
+        page.execute_script(<<~JS)
+          var questions = document.querySelectorAll('.questionnaire-question');
+          var container = questions[0].parentNode;
+          var second = questions[1];
+
+          container.appendChild(second);
+
+          // Update the positions of questions
+          var updatedQuestions = container.querySelectorAll('.questionnaire-question');
+          updatedQuestions.forEach(function(question, index) {
+            var positionInput = question.querySelector('input[name$="[position]"]');
+            if (positionInput) positionInput.value = index;
+          });
+        JS
+
+        sleep 0.5
+
+        click_on "Save"
+        expect(page).to have_admin_callout("successfully")
+
+        visit_manage_questions_and_expand_all
+
+        question_cards = all(".questionnaire-question")
+        within question_cards[0] do
+          expect(find("input[name*='[body_en]']").value).to eq("First")
+        end
+        within question_cards[1] do
+          expect(find("input[name*='[body_en]']").value).to eq("Third")
+        end
+        within question_cards[2] do
+          expect(find("input[name*='[body_en]']").value).to eq("Second")
+        end
+      end
+    end
+
     private
 
     def look_like_first_question