decidim-forms 0.25.1 → 0.26.0

data/config/locales/sv.yml

@@ -79,6 +79,7 @@ sv:
           form:
             add_question: Lägg till fråga
             add_separator: Lägg till separator
+            add_title_and_description: Lägg till titel och beskrivning
             already_answered_warning: Frågeformuläret har redan besvarats av vissa användare så du inte kan ändra dess frågor.
             collapse: Komprimera alla frågor
             expand: Expandera alla frågor
@@ -108,8 +109,18 @@ sv:
             remove: Radera
             separator: Avgränsare
             up: Upp
+          title_and_description:
+            collapse: Kollapsa
+            description: Beskrivning
+            down: Ner
+            expand: Expandera
+            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.
       errors:
         answer:
           body: Kroppen kan inte vara to
@@ -130,6 +141,7 @@ sv:
         short_answer: Kort svar
         single_option: Ett alternativ
         sorting: Sortering
+        title_and_description: Titel och beskrivning
       questionnaires:
         answer:
           invalid: Det gick inte att besvara formuläret.

data/config/locales/val-ES.yml

@@ -0,0 +1,18 @@
+val:
+  decidim:
+    forms:
+      admin:
+        questionnaires:
+          form:
+            add_title_and_description: Afig títol i descripció
+          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/lib/decidim/forms/test/factories.rb

@@ -123,6 +123,10 @@ FactoryBot.define do
     trait :separator do
       question_type { :separator }
     end
+
+    trait :title_and_description do
+      question_type { :title_and_description }
+    end
   end
 
   factory :answer, class: "Decidim::Forms::Answer" do
@@ -144,6 +148,14 @@ FactoryBot.define do
     question { create(:questionnaire_question) }
     body { generate_localized_title }
     free_text { false }
+
+    trait :free_text_enabled do
+      free_text { true }
+    end
+
+    trait :free_text_disabled do
+      free_text { false }
+    end
   end
 
   factory :answer_choice, class: "Decidim::Forms::AnswerChoice" do

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

@@ -69,6 +69,24 @@ shared_examples_for "manage questionnaire answers" do
           expect(page).to have_content("User identifier")
         end
       end
+
+      context "when multiple answer choice" do
+        let(:first_type) { "multiple_option" }
+        let!(:answer1) { create :answer, questionnaire: questionnaire, question: first, body: nil }
+        let!(:answer_option) { create :answer_option, question: first }
+        let!(:answer_choice) { create :answer_choice, answer: answer1, answer_option: answer_option, body: translated(answer_option.body, locale: I18n.locale) }
+
+        before do
+          find_all("a.action-icon.action-icon--eye").first.click
+        end
+
+        it "shows the answers page with custom body" do
+          within "#answers" do
+            expect(page).to have_css("dt", text: translated(first.body))
+            expect(page).to have_css("li", text: translated(answer_option.body))
+          end
+        end
+      end
     end
 
     context "and managing individual answer page" do

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

@@ -4,20 +4,21 @@ require "spec_helper"
 
 shared_examples_for "add questions" do
   it "adds a few questions and separators to the questionnaire" do
-    questions_body = ["This is the first question", "This is the second question"]
+    fields_body = ["This is the first question", "This is the second question", "This is the first title and description"]
 
     within "form.edit_questionnaire" do
       click_button "Add question"
       click_button "Add separator"
+      click_button "Add title and description"
       click_button "Add question"
 
-      expect(page).to have_selector(".questionnaire-question", count: 3)
+      expect(page).to have_selector(".questionnaire-question", count: 4)
 
       expand_all_questions
 
-      page.all(".questionnaire-question .collapsible").each_with_index do |question, idx|
-        within question do
-          fill_in find_nested_form_field_locator("body_en"), with: questions_body[idx]
+      page.all(".questionnaire-question .collapsible").each_with_index do |field, idx|
+        within field do
+          fill_in find_nested_form_field_locator("body_en"), with: fields_body[idx]
         end
       end
 
@@ -30,6 +31,7 @@ shared_examples_for "add questions" do
 
     expect(page).to have_selector("input[value='This is the first question']")
     expect(page).to have_selector("input[value='This is the second question']")
+    expect(page).to have_selector("input[value='This is the first title and description']")
     expect(page).to have_content("Separator #2")
   end
 
@@ -62,6 +64,35 @@ shared_examples_for "add questions" do
     expect(page).to have_selector("strong", text: "Superkalifragilistic description")
   end
 
+  it "adds a title-and-description" do
+    within "form.edit_questionnaire" do
+      click_button "Add title and description"
+      expand_all_questions
+
+      within ".questionnaire-question" do
+        fill_in find_nested_form_field_locator("body_en"), with: "Body"
+
+        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<strong>Superkalifragilistic description</strong>"
+      end
+
+      click_button "Save"
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    component.update!(
+      step_settings: {
+        component.participatory_space.active_step.id => {
+          allow_answers: true
+        }
+      }
+    )
+
+    visit questionnaire_public_path
+
+    expect(page).to have_selector("strong", text: "Superkalifragilistic description")
+  end
+
   it "adds a question with answer options" do
     question_body = ["This is the first question", "This is the second question"]
     answer_options_body = [

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

@@ -118,6 +118,104 @@ shared_examples_for "update questions" do
     end
   end
 
+  context "when a questionnaire has a title and description" do
+    let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire: questionnaire, body: title_and_description_body) }
+
+    before do
+      visit questionnaire_edit_path
+      expand_all_questions
+    end
+
+    it "modifies the question when the information is valid" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified title and description"
+        end
+
+        click_button "Save"
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      visit_questionnaire_edit_path_and_expand_all
+
+      expect(page).to have_selector("input[value='Modified title and description']")
+      expect(page).to have_no_selector("input[value='This is the first title and description']")
+    end
+
+    it "re-renders the form when the information is invalid and displays errors" do
+      expand_all_questions
+
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
+        end
+
+        click_button "Save"
+      end
+
+      expand_all_questions
+
+      expect(page).to have_admin_callout("There was a problem saving")
+      expect(page).to have_content("can't be blank", count: 1)
+      expect(page).to have_selector("input[value='']")
+      expect(page).to have_no_selector("input[value='This is the first title and description']")
+    end
+
+    it "preserves deleted status across submission failures" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          click_button "Remove"
+        end
+      end
+
+      click_button "Add question"
+
+      click_button "Save"
+
+      expect(page).to have_selector(".questionnaire-question", count: 1)
+
+      within ".questionnaire-question" do
+        expect(page).to have_selector(".card-title", text: "#1")
+        expect(page).to have_no_button("Up")
+      end
+    end
+
+    it "removes the question" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          click_button "Remove"
+        end
+
+        click_button "Save"
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      visit questionnaire_edit_path
+
+      within "form.edit_questionnaire" do
+        expect(page).to have_selector(".questionnaire-question", count: 0)
+      end
+    end
+
+    it "cannot be moved up" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          expect(page).to have_no_button("Up")
+        end
+      end
+    end
+
+    it "cannot be moved down" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          expect(page).to have_no_button("Down")
+        end
+      end
+    end
+  end
+
   context "when a questionnaire has an existing question with answer options" do
     let!(:question) do
       create(

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

@@ -16,6 +16,14 @@ shared_examples_for "manage questionnaires" do
     }
   end
 
+  let(:title_and_description_body) do
+    {
+      en: "Este es el primer separador de texto",
+      ca: "Aquest és el primer separador de text",
+      es: "Esta es la primera pregunta"
+    }
+  end
+
   it "updates the questionnaire" do
     visit questionnaire_edit_path
 

data/lib/decidim/forms/user_answers_serializer.rb

@@ -73,7 +73,7 @@ module Decidim
           normalize_matrix_choices(answer, choices)
         else
           choices.map do |choice|
-            choice.try(:custom_body) || choice.try(:body)
+            format_free_text_for choice
           end
         end
       end
@@ -94,6 +94,12 @@ module Decidim
       def answer_translated_attribute_name(attribute)
         I18n.t(attribute.to_sym, scope: "decidim.forms.user_answers_serializer")
       end
+
+      def format_free_text_for(choice)
+        return choice.try(:body) if choice.try(:custom_body).blank?
+
+        "#{choice.try(:body)} (#{choice.try(:custom_body)})"
+      end
     end
   end
 end

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
 - Rubén González Valero
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-02-22 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.25.1
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.26.0
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -165,6 +165,7 @@ files:
 - app/views/decidim/forms/admin/questionnaires/_matrix_row_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_question.html.erb
 - app/views/decidim/forms/admin/questionnaires/_separator.html.erb
+- app/views/decidim/forms/admin/questionnaires/_title_and_description.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/export/_answer.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/export/pdf.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/index.html.erb
@@ -180,6 +181,7 @@ files:
 - app/views/decidim/forms/questionnaires/answers/_short_answer.html.erb
 - app/views/decidim/forms/questionnaires/answers/_single_option.html.erb
 - app/views/decidim/forms/questionnaires/answers/_sorting.html.erb
+- app/views/decidim/forms/questionnaires/answers/_title_and_description.html.erb
 - app/views/decidim/forms/questionnaires/show.html.erb
 - app/views/layouts/decidim/forms/admin/questionnaires/questionnaire_answers.html.erb
 - config/assets.rb
@@ -250,6 +252,7 @@ files:
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/val-ES.yml
 - config/locales/vi-VN.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
@@ -294,7 +297,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -309,8 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Decidim forms
 test_files: []