decidim-forms 0.31.0.rc1 → 0.31.0.rc2

data/config/locales/ru.yml

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

data/config/locales/sk.yml

@@ -25,11 +25,9 @@ sk:
           question:
             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

@@ -43,8 +43,8 @@ sv:
           components:
             allow_editing_responses: Tillåt registrerade användare att redigera egna enkätsvar
             allow_responses: Tillåt svar
-            allow_unregistered: Tillåt ej registrerade användare att besvara enkäten
-            allow_unregistered_help: Om aktiv kommer ingen inloggning att krävas för att besvara enkäten. Detta kan leda till dålig eller opålitlig data och det kommer att vara mer sårbart för automatiserade attacker. Använd med försiktighet! Tänk på att en deltagare kunde svara på samma enkät flera gånger, genom att använda olika webbläsare eller "privat surfning" i sin webbläsare.
+            allow_unregistered: Tillåt oregistrerade användare att besvara enkäten
+            allow_unregistered_help: Om aktiv kommer ingen inloggning att krävas för att besvara enkäten. Detta kan leda till dålig eller opålitlig data och det kommer att vara mer sårbart för automatiserade attacker. Använd med försiktighet! Tänk på att en deltagare kan svara på samma enkät flera gånger, genom att använda olika webbläsare eller "privat surfning" i sin webbläsare.
             announcement: Meddelande
             clean_after_publish: Ta bort svar vid publicering av enkäten
             description: Beskrivning
@@ -55,7 +55,7 @@ sv:
             tos: Användarvillkor
         questionnaires:
           actions:
-            back: Tillbaka till frågor
+            back: Tillbaka till svar
             publish_responses: Publicera svar
             show: Svar
           display_condition:
@@ -103,12 +103,10 @@ sv:
             any: Valfritt
             collapse: Dölj
             description: Beskrivning
-            down: Ner
             expand: Visa
             question: Fråga
             remove: Ta bort
             statement: Titel
-            up: Upp
           questions_form:
             already_responded_warning: Formuläret har redan besvarats av en användare, så du kan inte längre redigera frågorna.
             collapse: Dölj alla frågor
@@ -139,19 +137,15 @@ sv:
             show:
               title: 'Svar #%{number}'
           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.

data/config/locales/tr-TR.yml

@@ -15,8 +15,6 @@ tr:
             description: Açıklama
             tos: Kullanım Şartları
         questionnaires:
-          actions:
-            back: Sorulara geri dön
           display_condition:
             condition_question: Soru
             condition_type: Durum
@@ -51,20 +49,16 @@ tr:
             any: herhangi
             collapse: Daralt
             description: Açıklama
-            down: Aşağı
             expand: Genişlet
             question: Soru
             remove: Kaldır
             statement: Beyan
-            up: yukarı
           responses:
             actions:
               show: Yanıtları göster
           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

@@ -15,8 +15,6 @@ zh-CN:
             description: 描述
             tos: 服务条款
         questionnaires:
-          actions:
-            back: 返回问题
           display_condition:
             condition_question: 问
             condition_type: 条件
@@ -50,20 +48,16 @@ zh-CN:
             any: 任何
             collapse: 收起
             description: 描述
-            down: 向下
             expand: 扩展
             question: 问
             remove: 删除
             statement: 声明
-            up: 上移
           responses:
             actions:
               show: 显示回复
           separator:
-            down: 向下
             remove: 删除
             separator: 分隔符
-            up: 上移
           update:
             invalid: 保存表单时出错。
             success: 表单保存成功。

data/config/locales/zh-TW.yml

@@ -16,8 +16,6 @@ zh-TW:
             description: 說明
             tos: 服務條款
         questionnaires:
-          actions:
-            back: 返回問題
           display_condition:
             condition_question: 問題
             condition_type: 條件
@@ -52,29 +50,23 @@ zh-TW:
             any: 任何
             collapse: 收回
             description: 說明
-            down: 向下
             expand: 展開
             question: 問題
             remove: 移除
             statement: 聲明
-            up: 往上
           responses:
             actions:
               show: 顯示回應
           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/manage_questionnaires/update_questions.rb

@@ -317,6 +317,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
@@ -325,6 +329,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
       click_on "Save"
       visit_manage_questions_and_expand_all
@@ -344,26 +352,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
@@ -459,16 +447,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
@@ -512,6 +521,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

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.0.rc1"
+      "0.31.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.31.0.rc1
+  version: 0.31.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2025-10-28 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.0.rc1
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com