decidim-forms 0.31.3 → 0.32.0.rc1

data/config/locales/lv.yml

@@ -1,4 +1,3 @@
----
 lv:
   activemodel:
     attributes:
@@ -56,9 +55,6 @@ lv:
           of_total_steps: no %{total_steps}
           questionnaire_closed:
             title: Veidlapa slēgta
-          questionnaire_for_private_users:
-            body: Veidlapa ir pieejama tikai privātiem lietotājiem
-            title: Veidlapa slēgta
           tos_agreement: Piedaloties jūs piekrītat pakalpojumu sniegšanas noteikumiem.
       step_navigation:
         show:

data/config/locales/nl.yml

@@ -1,4 +1,3 @@
----
 nl:
   activemodel:
     attributes:
@@ -85,9 +84,6 @@ nl:
           of_total_steps: van %{total_steps}
           questionnaire_closed:
             title: Vragenlijst gesloten
-          questionnaire_for_private_users:
-            body: De vragenlijst is alleen beschikbaar voor privé-gebruikers
-            title: Vragenlijst gesloten
           questionnaire_js_disabled:
             body: Sommige functies van dit formulier worden uitgeschakeld. Schakel JavaScript in in uw browser om uw ervaring te verbeteren.
             title: JavaScript is uitgeschakeld

data/config/locales/no.yml

@@ -1,4 +1,3 @@
----
 "no":
   activemodel:
     attributes:
@@ -88,9 +87,6 @@
           of_total_steps: av %{total_steps}
           questionnaire_closed:
             title: Skjema lukket
-          questionnaire_for_private_users:
-            body: Skjemaet er bare tilgjengelig for private brukere
-            title: Skjema lukket
           questionnaire_js_disabled:
             body: Noen av funksjonene i dette skjemaet vil bli deaktivert. For å forbedre opplevelsen, må du aktivere JavaScript i nettleseren.
             title: JavaScript deaktivert

data/config/locales/pl.yml

@@ -1,4 +1,3 @@
----
 pl:
   activemodel:
     attributes:
@@ -95,9 +94,6 @@ pl:
           of_total_steps: z %{total_steps}
           questionnaire_closed:
             title: Formularz został zamknięty
-          questionnaire_for_private_users:
-            body: Formularz jest dostępny tylko dla użytkowników prywatnych
-            title: Formularz został zamknięty
           questionnaire_js_disabled:
             body: Niektóre funkcje tego formularza zostaną wyłączone. Aby strona dostarczała lepszych doświadczeń, włącz obsługę JavaScript w przeglądarce.
             title: JavaScript jest wyłączony

data/config/locales/pt-BR.yml

@@ -1,4 +1,3 @@
----
 pt-BR:
   activemodel:
     attributes:
@@ -189,9 +188,9 @@ pt-BR:
           questionnaire_closed:
             body: O formulário está fechado e não pode ser respondido.
             title: Questionário fechado
-          questionnaire_for_private_users:
-            body: O questionário está disponível apenas para usuários particulares
-            title: Questionário fechado
+          questionnaire_for_members:
+            body: O formulário está disponível apenas para membros
+            title: Formulário fechado
           questionnaire_js_disabled:
             body: Algumas das funcionalidades deste formulário serão desativadas. Para melhorar sua experiência, por favor ative o JavaScript no seu navegador.
             title: JavaScript está desativado

data/config/locales/pt.yml

@@ -1,4 +1,3 @@
----
 pt:
   activemodel:
     attributes:
@@ -80,9 +79,6 @@ pt:
           of_total_steps: de %{total_steps}
           questionnaire_closed:
             title: Questionário encerrado
-          questionnaire_for_private_users:
-            body: O questionário está disponível apenas para utilizadores privados
-            title: Questionário encerrado
           questionnaire_js_disabled:
             body: Algumas características deste questionário serão desativadas. Para melhorar a sua experiência, por favor ative o JavaScript no seu navegador.
             title: JavaScript está desativado

data/config/locales/ro-RO.yml

@@ -1,4 +1,3 @@
----
 ro:
   activemodel:
     attributes:
@@ -122,9 +121,6 @@ ro:
           of_total_steps: din %{total_steps}
           questionnaire_closed:
             title: Formular închis
-          questionnaire_for_private_users:
-            body: Chestionarul este disponibil doar pentru utilizatorii privați
-            title: Formular închis
           questionnaire_js_disabled:
             body: Unele dintre funcționalitățile acestui chestionar vor fi dezactivate. Pentru a îți îmbunătăți experiența, te rugăm să activezi JavaScript în browser-ul tău.
             title: JavaScript este dezactivat

data/config/locales/ru.yml

@@ -1,4 +1,3 @@
----
 ru:
   decidim:
     forms:
@@ -27,9 +26,6 @@ ru:
         show:
           questionnaire_closed:
             title: Форма закрыта
-          questionnaire_for_private_users:
-            body: Форма доступна только для частных пользователей
-            title: Форма закрыта
       step_navigation:
         show:
           submit: Отправить

data/config/locales/sk.yml

@@ -1,4 +1,3 @@
----
 sk:
   activemodel:
     attributes:
@@ -40,9 +39,6 @@ sk:
         show:
           questionnaire_closed:
             title: Formulár je uzavretý.
-          questionnaire_for_private_users:
-            body: Formulár je otvorený len pre súkromných používateľov
-            title: Formulár je uzavretý.
           tos_agreement: Účasťou súhlasíte s našimi Podmienkami použitia
       step_navigation:
         show:

data/config/locales/sv.yml

@@ -1,4 +1,3 @@
----
 sv:
   activemodel:
     attributes:
@@ -181,6 +180,7 @@ sv:
         response:
           invalid: Det gick inte att besvara formuläret.
           max_choices_alert: Du har valt för många alternativ
+          spam_detected: Det gick inte att svara på formuläret. Kanske har du varit för snabb, kan du försöka igen?
           success: Formuläret har besvarats.
         show:
           current_step: Steg %{step}
@@ -189,8 +189,8 @@ sv:
           questionnaire_closed:
             body: Formuläret är stängt och kan inte besvaras.
             title: Formuläret är stängt
-          questionnaire_for_private_users:
-            body: Formuläret är endast tillgängligt för privata användare
+          questionnaire_for_members:
+            body: Formuläret är endast tillgängligt för medlemmar
             title: Formuläret är stängt
           questionnaire_js_disabled:
             body: Vissa av formulärets funktioner kommer att inaktiveras. Aktivera JavaScript i webbläsaren för att förbättra upplevelsen.

data/config/locales/tr-TR.yml

@@ -1,4 +1,3 @@
----
 tr:
   activemodel:
     attributes:
@@ -79,9 +78,6 @@ tr:
           of_total_steps: '%{total_steps}'
           questionnaire_closed:
             title: Form kapatıldı
-          questionnaire_for_private_users:
-            body: Form yalnızca özel kullanıcılar tarafından kullanılabilir
-            title: Form kapatıldı
           questionnaire_js_disabled:
             body: Bu formun bazı özellikleri devre dışı bırakılacak. Deneyiminizi iyileştirmek için lütfen tarayıcınızda JavaScript'i etkinleştirin.
             title: JavaScript devre dışı

data/config/locales/val-ES.yml

@@ -1,4 +1,3 @@
----
 val:
   decidim:
     forms:

data/config/locales/zh-CN.yml

@@ -1,4 +1,3 @@
----
 zh-CN:
   activemodel:
     attributes:
@@ -77,9 +76,6 @@ zh-CN:
           of_total_steps: '%{total_steps}'
           questionnaire_closed:
             title: 表单已关闭
-          questionnaire_for_private_users:
-            body: 表单仅供私人用户使用
-            title: 表单已关闭
           questionnaire_js_disabled:
             body: 此表单的一些功能将被禁用。为了改善您的体验，请在您的浏览器中启用 JavaScript。
             title: JavaScript 已禁用

data/config/locales/zh-TW.yml

@@ -1,4 +1,3 @@
----
 zh-TW:
   activemodel:
     attributes:
@@ -94,9 +93,6 @@ zh-TW:
           of_total_steps: 的%{total_steps}
           questionnaire_closed:
             title: 表單已關閉
-          questionnaire_for_private_users:
-            body: 此表單僅適用於私人使用者
-            title: 表單已關閉
           questionnaire_js_disabled:
             body: 此表單的某些功能將被禁用。為了改善您的體驗，請在您的瀏覽器中啟用JavaScript。
             title: JavaScript已停用

data/decidim-forms.gemspec

@@ -2,12 +2,10 @@
 
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
-# Maintain your gem's version:
-require "decidim/forms/version"
-
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.version = Decidim::Forms.version
+  version = "0.32.0.rc1"
+  s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Rubén González Valero"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
   s.license = "AGPL-3.0-or-later"
@@ -19,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.3.0"
+  s.required_ruby_version = "~> 3.4.0"
 
   s.name = "decidim-forms"
   s.summary = "Decidim forms"
@@ -32,8 +30,8 @@ Gem::Specification.new do |s|
     end
   end
 
-  s.add_dependency "decidim-core", Decidim::Forms.version
+  s.add_dependency "decidim-core", version
 
-  s.add_development_dependency "decidim-admin", Decidim::Forms.version
-  s.add_development_dependency "decidim-dev", Decidim::Forms.version
+  s.add_development_dependency "decidim-admin", version
+  s.add_development_dependency "decidim-dev", version
 end

data/lib/decidim/api/questionnaire_entity_interface.rb

@@ -6,6 +6,7 @@ module Decidim
     # The only requirement is to have an ID and the Type name be the class.name + Type
     module QuestionnaireEntityInterface
       include Decidim::Api::Types::BaseInterface
+
       description "An interface that can be used in objects with questionnaires"
 
       field :id, GraphQL::Types::ID, "ID of this entity", null: false

data/lib/decidim/forms/download_your_data_user_responses_serializer.rb

@@ -4,6 +4,7 @@ module Decidim
   module Forms
     class DownloadYourDataUserResponsesSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
+
       # Serializes an user response for download your data
       def serialize
         {

data/lib/decidim/forms/test/factories.rb

@@ -117,14 +117,18 @@ FactoryBot.define do
     end
 
     trait :with_response_options do
-      response_options do
-        Array.new(3).collect { build(:response_option, skip_injection:) }
+      after(:build) do |question, evaluator|
+        question.response_options = Array.new(3).collect do
+          build(:response_option, question:, skip_injection: evaluator.skip_injection)
+        end
       end
     end
 
     trait :conditioned do
-      display_conditions do
-        Array.new(3).collect { build(:display_condition, skip_injection:) }
+      after(:build) do |question, evaluator|
+        question.display_conditions = Array.new(3).collect do
+          build(:display_condition, question:, skip_injection: evaluator.skip_injection)
+        end
       end
     end
 
@@ -194,7 +198,7 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
-    condition_question { create(:questionnaire_question, skip_injection:) }
+    condition_question { create(:questionnaire_question, questionnaire: question.questionnaire, skip_injection:) }
     question { create(:questionnaire_question, position: 1, skip_injection:) }
     condition_type { :responded }
     mandatory { true }

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

@@ -53,7 +53,7 @@ shared_examples_for "has questionnaire" do
         click_on "Submit"
       end
 
-      expect(page).to have_admin_callout(callout_success)
+      expect(page).to have_callout(callout_success)
 
       visit questionnaire_public_path
       see_questionnaire_questions
@@ -125,7 +125,7 @@ shared_examples_for "has questionnaire" do
         check "questionnaire_tos_agreement"
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
 
         visit questionnaire_public_path
         see_questionnaire_questions
@@ -269,7 +269,7 @@ shared_examples_for "has questionnaire" do
       end
 
       it "submits the form and shows errors" do
-        expect(page).to have_admin_callout(callout_failure)
+        expect(page).to have_callout(callout_failure)
         expect(page).to have_content("cannot be blank")
       end
     end
@@ -283,7 +283,7 @@ shared_examples_for "has questionnaire" do
 
       it "submits the form and shows errors" do
         expect(page).to have_css ".alert.flash"
-        expect(page).to have_admin_callout(callout_failure)
+        expect(page).to have_callout(callout_failure)
         different_error = I18n.t("decidim.forms.questionnaires.response.max_choices_alert")
         expect(different_error).to eq("There are too many choices selected")
         expect(page).to have_no_content(different_error)
@@ -317,7 +317,7 @@ shared_examples_for "has questionnaire" do
       end
 
       it "submits the form and shows errors" do
-        expect(page).to have_admin_callout(callout_failure)
+        expect(page).to have_callout(callout_failure)
         expect(page).to have_content("cannot be blank")
       end
     end
@@ -391,7 +391,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout(callout_success)
+          expect(page).to have_callout(callout_success)
           expect(Decidim::Forms::Response.first.choices.first.custom_body).to eq("Cacatua")
         end
 
@@ -406,7 +406,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
 
@@ -433,7 +433,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout(callout_success)
+          expect(page).to have_callout(callout_success)
           expect(Decidim::Forms::Response.first.choices.first.custom_body).to eq("Cacatua")
         end
 
@@ -448,7 +448,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
 
@@ -500,7 +500,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
 
         visit questionnaire_public_path
         see_questionnaire_questions
@@ -529,7 +529,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
 
         visit questionnaire_public_path
         see_questionnaire_questions
@@ -556,14 +556,14 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout("There was a problem responding")
+        expect(page).to have_callout("There was a problem responding")
         expect(page).to have_content("are too many")
 
         uncheck response_options[2]["body"][:en]
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
       end
     end
 
@@ -606,7 +606,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
         expect(Decidim::Forms::Response.first.choices.pluck(:position, :body)).to eq(
           [[0, "We"], [1, "all"], [2, "like"], [3, "dark"], [4, "chocolate"]]
         )
@@ -647,7 +647,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
 
         visit questionnaire_public_path
         see_questionnaire_questions
@@ -670,7 +670,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout("There was a problem responding")
+        expect(page).to have_callout("There was a problem responding")
 
         radio_buttons = page.all(".js-radio-button-collection input[type=radio]")
         expect(radio_buttons.pluck(:checked)).to eq([nil, "true", nil, nil])
@@ -689,7 +689,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
           expect(page).to have_content("Choices are not complete")
         end
       end
@@ -732,7 +732,7 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout(callout_success)
+        expect(page).to have_callout(callout_success)
 
         visit questionnaire_public_path
         see_questionnaire_questions
@@ -779,7 +779,7 @@ shared_examples_for "has questionnaire" do
 
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
           expect(page).to have_content("are too many")
 
           checkboxes = page.all(".js-check-box-collection input[type=checkbox]")
@@ -788,7 +788,7 @@ shared_examples_for "has questionnaire" do
 
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout(callout_success)
+          expect(page).to have_callout(callout_success)
         end
       end
 
@@ -805,7 +805,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
           expect(page).to have_content("Choices are not complete")
         end
       end
@@ -826,7 +826,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem responding")
+          expect(page).to have_callout("There was a problem responding")
 
           checkboxes = page.all(".js-check-box-collection input[type=checkbox]")
           expect(checkboxes.pluck(:checked)).to eq(["true", "true", "true", nil, nil, "true"])
@@ -1373,7 +1373,7 @@ shared_examples_for "has questionnaire" do
 
             accept_confirm { click_on "Submit" }
 
-            expect(page).to have_admin_callout(callout_success)
+            expect(page).to have_callout(callout_success)
           end
         end
       end

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions.rb

@@ -173,7 +173,7 @@ shared_examples_for "add display conditions" do
 
           click_on "Save"
 
-          expect(page).to have_admin_callout("successfully")
+          expect(page).to have_callout(callout_success)
         end
       end
     end

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb

@@ -54,7 +54,7 @@ shared_examples_for "add questions" do
 
     click_on "Save"
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout(callout_success)
 
     visit_manage_questions_and_expand_all
 
@@ -76,7 +76,7 @@ shared_examples_for "add questions" do
 
     click_on "Save"
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout(callout_success)
 
     update_component_settings_or_attributes
 
@@ -98,7 +98,7 @@ shared_examples_for "add questions" do
 
     click_on "Save"
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout(callout_success)
 
     update_component_settings_or_attributes
 
@@ -152,7 +152,7 @@ shared_examples_for "add questions" do
 
     click_on "Save"
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout(callout_success)
 
     visit_manage_questions_and_expand_all
 

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions.rb

@@ -80,7 +80,7 @@ shared_examples_for "update display conditions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       visit_manage_questions_and_expand_all
 

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -21,7 +21,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       visit_manage_questions_and_expand_all
 
@@ -47,7 +47,7 @@ shared_examples_for "update questions" do
       click_on "Save"
       click_on "Expand all questions"
 
-      expect(page).to have_admin_callout("There was a problem saving")
+      expect(page).to have_callout(callout_failure)
       expect(page).to have_content("cannot be blank", count: 5)
       expect(page).to have_content("must be greater than or equal to 0", count: 1)
 
@@ -83,7 +83,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       click_on "Questions"
 
@@ -118,7 +118,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       visit_manage_questions_and_expand_all
 
@@ -137,7 +137,7 @@ shared_examples_for "update questions" do
 
       expand_all_questions
 
-      expect(page).to have_admin_callout("There was a problem saving")
+      expect(page).to have_callout(callout_failure)
       expect(page).to have_content("cannot be blank", count: 1)
       expect(page).to have_css("input[value='']")
       expect(page).to have_no_css("input[value='This is the first title and description']")
@@ -167,7 +167,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       click_on "Questions"
 
@@ -237,7 +237,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       visit_manage_questions_and_expand_all
 
@@ -300,7 +300,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout(callout_success)
 
       visit_manage_questions_and_expand_all
 
@@ -592,7 +592,7 @@ shared_examples_for "update questions" do
         sleep 0.5
 
         click_on "Save"
-        expect(page).to have_admin_callout("successfully")
+        expect(page).to have_callout(callout_success)
 
         visit_manage_questions_and_expand_all
 

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.3"
+      "0.32.0.rc1"
     end
   end
 end