decidim-forms 0.23.1 → 0.24.0.rc2

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

@@ -2,10 +2,10 @@
 
 require "spec_helper"
 
-require "decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb"
-require "decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb"
-require "decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions.rb"
-require "decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions.rb"
+require "decidim/forms/test/shared_examples/manage_questionnaires/add_questions"
+require "decidim/forms/test/shared_examples/manage_questionnaires/update_questions"
+require "decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions"
+require "decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions"
 
 shared_examples_for "manage questionnaires" do
   let(:body) do
@@ -63,6 +63,7 @@ shared_examples_for "manage questionnaires" do
       expect(page).to have_selector("input[value='This is the first question'][disabled]")
       expect(page).to have_selector("select[id$=question_type][disabled]")
       expect(page).to have_selector("select[id$=max_choices][disabled]")
+      expect(page).to have_selector("input[id$=max_characters][disabled]")
       expect(page).to have_selector(".ql-editor[contenteditable=false]")
     end
   end

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

@@ -39,18 +39,21 @@ shared_examples_for "add display conditions" do
     context "when questionnaire has more than one question" do
       let!(:question_short_answer) do
         create(:questionnaire_question,
+               position: 0,
                questionnaire: questionnaire,
                body: Decidim::Faker::Localized.sentence,
                question_type: "short_answer")
       end
       let!(:question_long_answer) do
         create(:questionnaire_question,
+               position: 1,
                questionnaire: questionnaire,
                body: Decidim::Faker::Localized.sentence,
                question_type: "long_answer")
       end
       let!(:question_single_option) do
         create(:questionnaire_question,
+               position: 2,
                questionnaire: questionnaire,
                body: Decidim::Faker::Localized.sentence,
                question_type: "single_option",
@@ -58,6 +61,7 @@ shared_examples_for "add display conditions" do
       end
       let!(:question_multiple_option) do
         create(:questionnaire_question,
+               position: 3,
                questionnaire: questionnaire,
                body: Decidim::Faker::Localized.sentence,
                question_type: "multiple_option",
@@ -101,7 +105,7 @@ shared_examples_for "add display conditions" do
 
             within "select[id$=decidim_condition_question_id]" do
               elements = page.all("option[data-type]")
-              expect(elements.map { |element| element[:"data-type"] }).to eq(questions.map(&:question_type))
+              expect(elements.map { |element| element[:"data-type"] }).to match_array(questions.map(&:question_type))
               expect(page.find("option[value='#{questions.last.id}']")).to be_disabled
             end
           end
@@ -117,7 +121,7 @@ shared_examples_for "add display conditions" do
               option_elements = page.all("select[id$=condition_type] option")
               option_elements = option_elements.to_a.reject { |option| option[:style].match? "display: none" }
 
-              expect(option_elements.map(&:text)).to eq(options)
+              expect(option_elements.map(&:text)).to match_array(options)
             end
           end
         end
@@ -132,7 +136,7 @@ shared_examples_for "add display conditions" do
               option_elements = page.all("select[id$=condition_type] option")
               option_elements = option_elements.to_a.reject { |option| option[:style].match? "display: none" }
 
-              expect(option_elements.map(&:text)).to eq(options)
+              expect(option_elements.map(&:text)).to match_array(options)
             end
           end
         end

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

@@ -41,7 +41,7 @@ shared_examples_for "add questions" do
       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: "<b>Superkalifragilistic description</b>"
+        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<strong>Superkalifragilistic description</strong>"
       end
 
       click_button "Save"

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

@@ -15,6 +15,7 @@ shared_examples_for "update questions" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
           fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified question"
+          fill_in "questionnaire_questions_#{question.id}_max_characters", with: 30
           check "Mandatory"
           select "Long answer", from: "Type"
         end
@@ -29,6 +30,7 @@ shared_examples_for "update questions" do
       expect(page).to have_selector("input[value='Modified question']")
       expect(page).to have_no_selector("input[value='This is the first question']")
       expect(page).to have_selector("input#questionnaire_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_max_characters[value='30']")
       expect(page).to have_selector("select#questionnaire_questions_#{question.id}_question_type option[value='long_answer'][selected]")
     end
 
@@ -39,6 +41,7 @@ shared_examples_for "update questions" do
         within ".questionnaire-question" do
           expect(page).to have_content("Statement*")
           fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
+          fill_in "questionnaire_questions_#{question.id}_max_characters", with: -3
           check "Mandatory"
           select "Matrix (Multiple option)", from: "Type"
           select "2", from: "Maximum number of choices"
@@ -51,10 +54,12 @@ shared_examples_for "update questions" do
 
       expect(page).to have_admin_callout("There was a problem saving")
       expect(page).to have_content("can't be blank", count: 5) # emtpy question, 2 empty default answer options, 2 empty default matrix rows
+      expect(page).to have_content("must be greater than or equal to 0", count: 1)
 
       expect(page).to have_selector("input[value='']")
       expect(page).to have_no_selector("input[value='This is the first question']")
       expect(page).to have_selector("input#questionnaire_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_max_characters[value='-3']")
       expect(page).to have_select("Maximum number of choices", selected: "2")
       expect(page).to have_selector("select#questionnaire_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
     end

data/lib/decidim/forms/user_answers_serializer.rb

@@ -16,7 +16,7 @@ module Decidim
       def serialize
         @answers.each_with_index.inject({}) do |serialized, (answer, idx)|
           serialized.update(
-            answer_translated_attribute_name(:id) => answer.id,
+            answer_translated_attribute_name(:id) => answer.session_token,
             answer_translated_attribute_name(:created_at) => answer.created_at.to_s(:db),
             answer_translated_attribute_name(:ip_hash) => answer.ip_hash,
             answer_translated_attribute_name(:user_status) => answer_translated_attribute_name(answer.decidim_user_id.present? ? "registered" : "unregistered"),
@@ -28,7 +28,15 @@ module Decidim
       private
 
       def normalize_body(answer)
-        answer.body || normalize_choices(answer, answer.choices)
+        answer.body ||
+          normalize_attachments(answer) ||
+          normalize_choices(answer, answer.choices)
+      end
+
+      def normalize_attachments(answer)
+        return if answer.attachments.blank?
+
+        answer.attachments.map(&:url)
       end
 
       def normalize_choices(answer, choices)

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0.rc2
 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: 2020-11-12 00:00:00.000000000 Z
+date: 2021-03-10 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.23.1
+        version: 0.24.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0.rc2
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0.rc2
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -156,9 +156,6 @@ files:
 - app/queries/decidim/forms/questionnaire_participant.rb
 - app/queries/decidim/forms/questionnaire_participants.rb
 - app/queries/decidim/forms/questionnaire_user_answers.rb
-- app/types/decidim/forms/answer_option_type.rb
-- app/types/decidim/forms/question_type.rb
-- app/types/decidim/forms/questionnaire_type.rb
 - app/views/decidim/forms/admin/questionnaires/_answer_option.html.erb
 - app/views/decidim/forms/admin/questionnaires/_answer_option_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_display_condition.html.erb
@@ -174,6 +171,7 @@ files:
 - app/views/decidim/forms/admin/questionnaires/answers/show.html.erb
 - app/views/decidim/forms/admin/questionnaires/edit.html.erb
 - app/views/decidim/forms/questionnaires/_answer.html.erb
+- app/views/decidim/forms/questionnaires/answers/_files.html.erb
 - app/views/decidim/forms/questionnaires/answers/_long_answer.html.erb
 - app/views/decidim/forms/questionnaires/answers/_matrix_multiple.html.erb
 - app/views/decidim/forms/questionnaires/answers/_matrix_single.html.erb
@@ -238,12 +236,14 @@ files:
 - config/locales/pt.yml
 - config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
 - config/locales/sk-SK.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -261,7 +261,12 @@ files:
 - db/migrate/20200130194123_create_decidim_forms_display_conditions.rb
 - db/migrate/20200225123810_create_decidim_forms_question_matrix_rows.rb
 - db/migrate/20200304152939_add_matrix_row_id_to_decidim_forms_answer_choices.rb
+- db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb
+- db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb
+- lib/decidim/api/answer_option_type.rb
+- lib/decidim/api/question_type.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
+- lib/decidim/api/questionnaire_type.rb
 - lib/decidim/exporters/form_pdf.rb
 - lib/decidim/exporters/form_pdf_controller_helper.rb
 - lib/decidim/forms.rb
@@ -285,7 +290,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -293,15 +298,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Decidim forms
 test_files: []

data/app/types/decidim/forms/answer_option_type.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    AnswerOptionType = GraphQL::ObjectType.define do
-      name "AnswerOption"
-      description "An answer option for a multi-choice question in a questionnaire"
-
-      field :id, !types.ID, "ID of this answer option"
-      field :body, !Decidim::Core::TranslatedFieldType, "The text answer response option."
-      field :freeText, !types.Boolean, "Whether if this answer accepts any free text from the user.", property: :free_text
-    end
-  end
-end

data/app/types/decidim/forms/question_type.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    QuestionType = GraphQL::ObjectType.define do
-      name "Question"
-      description "A question in a questionnaire"
-
-      interfaces [
-        -> { Decidim::Core::TimestampsInterface }
-      ]
-
-      field :id, !types.ID, "ID of this question"
-      field :body, !Decidim::Core::TranslatedFieldType, "What is being asked in this question."
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this question."
-      field :mandatory, !types.Boolean, "Whether if this question is mandatory."
-      field :position, types.Int, "Order position of the question in the questionnaire"
-      field :maxChoices, types.Int, "On questions with answer options, maximum number of choices the user has", property: :max_choices
-      field :questionType, types.String, "Type of question.", property: :question_type
-      field :answerOptions, !types[AnswerOptionType], "List of answer options in multi-choice questions.", property: :answer_options
-    end
-  end
-end

data/app/types/decidim/forms/questionnaire_type.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    QuestionnaireType = GraphQL::ObjectType.define do
-      name "Questionnaire"
-      description "A questionnaire"
-
-      interfaces [
-        -> { Decidim::Core::TimestampsInterface }
-      ]
-
-      field :id, !types.ID, "ID of this questionnaire"
-      field :title, !Decidim::Core::TranslatedFieldType, "The title of this questionnaire."
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this questionnaire."
-      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire."
-      field :forType, types.String, "Type of entity using this questionnaire.", property: :questionnaire_for_type
-      field :forEntity, QuestionnaireEntityInterface, "Entity using this questionnaire.", property: :questionnaire_for
-      field :questions, !types[QuestionType], "Questions in this questionnaire."
-    end
-  end
-end