decidim-forms 0.23.1 → 0.24.0.rc2

data/config/locales/si-LK.yml

@@ -0,0 +1 @@
+si:

data/config/locales/sv.yml

@@ -76,7 +76,6 @@ sv:
             collapse: Komprimera alla frågor
             expand: Expandera alla frågor
             preview: Förhandsgranska
-            title: Redigera formulär
             unpublished_warning: Formuläret är inte publicerat. Du kan ändra dess frågor, men det kommer att ta bort aktuella svar.
           matrix_row:
             matrix_row: Rad
@@ -107,7 +106,7 @@ sv:
         answer:
           body: Kroppen kan inte vara to
       files:
-        extension_whitelist: 'Godkända format:'
+        extension_allowlist: 'Godkända format:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Denna bild kommer att vara:'

data/config/locales/sw-KE.yml

@@ -0,0 +1 @@
+sw:

data/config/locales/tr-TR.yml

@@ -3,6 +3,8 @@ tr:
     attributes:
       answer:
         body: Cevap
+        choices: Seçenekler
+        selected_choices: Seçilmiş seçenekler
       question:
         max_choices: Maksimum seçenek sayısı
         question_type: tip
@@ -15,6 +17,8 @@ tr:
             choices:
               missing: tamamlanmadı
               too_many: çok fazla
+        questionnaire:
+          request_invalid: İsteği işlerken bir hata oluştu. Lütfen tekrar deneyin
   decidim:
     forms:
       admin:
@@ -23,42 +27,108 @@ tr:
             description: Açıklama
             tos: Kullanım Şartları
         questionnaires:
+          actions:
+            back: Sorulara geri dön
+            show: Yanıtları göster
           answer_option:
             answer_option: Cevap seçeneği
             free_text: Ücretsiz Metin
             remove: Kaldır
             statement: Beyan
+          answers:
+            actions:
+              back: Yanıtlara dön
+              export: Dışa aktar
+              show: Cevapları göster
+            empty: Henüz cevap bulunmuyor
+            export:
+              answer:
+                title: '#%{number} yanıt'
+            export_response:
+              title: survey_user_answers _%{token}
+            index:
+              title: "%{total} toplam yanıt"
+            show:
+              title: '%{number} cevap'
+          display_condition:
+            answer_option: Cevap seçeneği
+            condition_question: Soru
+            condition_type: Durum
+            condition_types:
+              answered: Cevaplanmış
+              equal: Eşittir
+              match: Metin içerir
+              not_answered: Cevaplanmadı
+              not_equal: Eşit değil
+            condition_value: Metin içerir
+            display_condition: Görüntüleme koşulları
+            mandatory: Bu koşul, diğer koşulların durumuna bakılmaksızın her zaman yerine getirilmelidir
+            remove: Kaldır
+            save_warning: Görüntüleme koşullarını yapılandırmadan önce formu kaydetmeyi unutmayın
+            select_answer_option: Cevap seçeneğini seçin
+            select_condition_question: Bir soru seçin
+            select_condition_type: Bir koşul türü seçin
           edit:
             save: Kayıt etmek
+            title: Anketi düzenleyin
           form:
             add_question: Soru ekle
+            add_separator: Ayırıcı ekle
             already_answered_warning: Form, bazı kullanıcılar tarafından zaten yanıtlandı, bu nedenle sorularını değiştiremezsiniz.
+            collapse: Tüm soruları daraltın
+            expand: Tüm soruları genişletin
+            preview: Önizleme
+            title: '%{questionnaire_for} için formu düzenleyin'
+            unpublished_warning: Form yayınlanmadı. Sorularını değiştirebilirsiniz, ancak bunu yapmak mevcut cevapları silecektir.
           matrix_row:
+            matrix_row: Satır
             remove: Kaldır
             statement: Beyan
           question:
             add_answer_option: Cevap seçeneği ekle
+            add_display_condition: Görüntü koşulu ekle
+            add_display_condition_info: Görüntüleme koşullarını yapılandırmak için formu kaydedin
+            add_matrix_row: Satır ekle
             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.
       errors:
         answer:
           body: Vücut boş olamaz
+      files:
+        extension_allowlist: 'Kabul edilen biçimler:'
+      images:
+        dimensions: "%{width} x %{height} px"
+        dimensions_info: 'Bu resim:'
+        processors:
+          resize_and_pad: Yeniden boyutlandırıldı ve dolduruldu
+          resize_to_fit: Sığacak şekilde yeniden boyutlandırıldı
       question_types:
         long_answer: Uzun cevap
+        matrix_multiple: Matris (Çoklu seçenek)
+        matrix_single: Matris (Tek seçenek)
         multiple_option: Çoklu seçenek
         short_answer: Kısa cevap
         single_option: Tek seçenek
-        sorting: sınıflandırma
+        sorting: Sıralama
       questionnaires:
         answer:
           invalid: Formu yanıtlarken bir sorun oluştu.
+          max_choices_alert: Çok fazla seçenek seçilmiş
           success: Form başarıyla cevaplandı.
         question:
           max_choices: 'Maksimum seçenek: %{n}'
@@ -66,6 +136,8 @@ tr:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Formu yanıtlamak için</a> veya <a href="%{sign_up_link}">hesabınızla giriş yapın</a>.
             title: Formu cevapla
+          current_step: '%{step} adım'
+          of_total_steps: '%{total_steps}'
           questionnaire_answered:
             body: Bu formu zaten cevapladınız.
             title: Zaten cevaplandı
@@ -75,11 +147,26 @@ tr:
           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ışı
+          questionnaire_not_published:
+            body: Bu form henüz yayınlanmadı.
           tos_agreement: Katılarak Hizmet Şartlarını kabul etmiş olursunuz.
       step_navigation:
         show:
           are_you_sure: Bu işlem geri alınamaz ve cevaplarınızı düzenleyemezsiniz. Emin misiniz?
+          back: Geri
+          continue: Devam et
           submit: Gönder
       user_answers_serializer:
+        body: Cevap
+        completion: Tamamlanma
         created_at: Yanıtlandı
         id: Cevap kimliği
+        ip_hash: IP Hash
+        question: Soru
+        registered: Kayıtlı
+        session_token: Kullanıcı tanımlayıcı
+        unregistered: Kayıtlı değil
+        user_status: Kullanıcı durumu

data/config/locales/zh-CN.yml

@@ -78,7 +78,6 @@ zh-CN:
             collapse: 收起所有问题
             expand: 展开所有问题
             preview: 预览
-            title: 编辑表单
             unpublished_warning: 表单未发布。您可以修改它的问题，但这样做将删除当前答案。
           matrix_row:
             matrix_row: 行
@@ -110,7 +109,7 @@ zh-CN:
         answer:
           body: 主体不能为空
       files:
-        extension_whitelist: '接受的格式：'
+        extension_allowlist: '接受的格式：'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: '这张图片将是：'

data/db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddSaltToDecidimFormsQuestionnaires < ActiveRecord::Migration[5.2]
+  class Questionnaire < ApplicationRecord
+    self.table_name = :decidim_forms_questionnaires
+  end
+
+  def change
+    add_column :decidim_forms_questionnaires, :salt, :string
+
+    Questionnaire.find_each do |questionnaire|
+      questionnaire.salt = Decidim::Tokenizer.random_salt
+      questionnaire.save!
+    end
+  end
+end

data/db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMaxCharactersToDecidimFormsQuestions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_forms_questions, :max_characters, :integer, default: 0
+  end
+end

data/lib/decidim/api/answer_option_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class AnswerOptionType < Decidim::Api::Types::BaseObject
+      description "An answer option for a multi-choice question in a questionnaire"
+
+      field :id, GraphQL::Types::ID, "ID of this answer option", null: false
+      field :body, Decidim::Core::TranslatedFieldType, "The text answer response option.", null: false
+      field :free_text, GraphQL::Types::Boolean, "Whether if this answer accepts any free text from the user.", null: false
+    end
+  end
+end

data/lib/decidim/api/question_type.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class QuestionType < Decidim::Api::Types::BaseObject
+      description "A question in a questionnaire"
+
+      implements Decidim::Core::TimestampsInterface
+
+      field :id, GraphQL::Types::ID, "ID of this question", null: false
+      field :body, Decidim::Core::TranslatedFieldType, "What is being asked in this question.", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this question.", null: true
+      field :mandatory, GraphQL::Types::Boolean, "Whether if this question is mandatory.", null: false
+      field :position, GraphQL::Types::Int, "Order position of the question in the questionnaire", null: true
+      field :max_choices, GraphQL::Types::Int, "On questions with answer options, maximum number of choices the user has", null: true
+      field :max_characters, GraphQL::Types::Int, "On questions with free text answers, maximum number of characters the answer can have (0 if no limit)", null: false
+      field :question_type, GraphQL::Types::String, "Type of question.", null: true
+      field :answer_options, [AnswerOptionType, { null: true }], "List of answer options in multi-choice questions.", null: false
+    end
+  end
+end

data/lib/decidim/api/questionnaire_entity_interface.rb

@@ -4,15 +4,15 @@ module Decidim
   module Forms
     # This interface should be implemented by any Type that can be linked to a questionnaire
     # The only requirement is to have an ID and the Type name be the class.name + Type
-    QuestionnaireEntityInterface = GraphQL::InterfaceType.define do
-      name "QuestionnaireEntityInterface"
+    module QuestionnaireEntityInterface
+      include Decidim::Api::Types::BaseInterface
       description "An interface that can be used in objects with questionnaires"
 
-      field :id, !types.ID, "ID of this entity"
+      field :id, GraphQL::Types::ID, "ID of this entity", null: false
 
-      resolve_type ->(obj, _ctx) {
+      def self.resolve_type(obj, _ctx)
         "#{obj.class.name}Type".constantize
-      }
+      end
     end
   end
 end

data/lib/decidim/api/questionnaire_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class QuestionnaireType < Decidim::Api::Types::BaseObject
+      description "A questionnaire"
+
+      implements Decidim::Core::TimestampsInterface
+
+      field :id, GraphQL::Types::ID, "ID of this questionnaire", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this questionnaire.", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this questionnaire.", null: true
+      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire.", null: true
+      field :for_type, GraphQL::Types::String, "Type of entity using this questionnaire.", method: :questionnaire_for_type, null: true
+      field :for_entity, QuestionnaireEntityInterface, "Entity using this questionnaire.", method: :questionnaire_for, null: true
+      field :questions, [Decidim::Forms::QuestionType, { null: true }], "Questions in this questionnaire.", null: false
+    end
+  end
+end

data/lib/decidim/exporters/form_pdf_controller_helper.rb

@@ -2,8 +2,10 @@
 
 module Decidim
   module Exporters
+    # rubocop: disable Rails/ApplicationController
     # A dummy controller to render views while exporting questionnaires
     class FormPDFControllerHelper < ActionController::Base
+      # rubocop: enable Rails/ApplicationController
       helper Decidim::TranslationsHelper
       helper Decidim::Forms::Admin::QuestionnaireAnswersHelper
     end

data/lib/decidim/forms.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "decidim/forms/admin"
+require "decidim/forms/api"
 require "decidim/forms/engine"
 require "decidim/forms/admin_engine"
-require "decidim/forms/api"
 
 module Decidim
   # This namespace holds the logic of the `Forms`.

data/lib/decidim/forms/api.rb

@@ -3,5 +3,8 @@
 module Decidim
   module Forms
     autoload :QuestionnaireEntityInterface, "decidim/api/questionnaire_entity_interface"
+    autoload :AnswerOptionType, "decidim/api/answer_option_type"
+    autoload :QuestionType, "decidim/api/question_type"
+    autoload :QuestionnaireType, "decidim/api/questionnaire_type"
   end
 end

data/lib/decidim/forms/data_portability_user_answers_serializer.rb

@@ -30,7 +30,13 @@ module Decidim
       private
 
       def normalize_body(resource)
-        resource.body || resource.choices.pluck(:body)
+        attachments_for(resource) || resource.body || resource.choices.pluck(:body)
+      end
+
+      def attachments_for(resource)
+        return if resource.attachments.blank?
+
+        resource.attachments.map(&:url)
       end
     end
   end

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

@@ -13,13 +13,17 @@ FactoryBot.define do
     end
     tos { generate_localized_title }
     questionnaire_for { build(:participatory_process) }
+    salt { SecureRandom.hex(32) }
 
     trait :with_questions do
       questions do
+        position = 0
         qs = %w(short_answer long_answer).collect do |text_question_type|
-          build(:questionnaire_question, question_type: text_question_type)
+          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+          position += 1
+          q
         end
-        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option)
+        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option, position: position)
         qs
       end
     end
@@ -90,6 +94,13 @@ FactoryBot.define do
     question { create(:questionnaire_question, questionnaire: questionnaire) }
     user { create(:user, organization: questionnaire.questionnaire_for.organization) }
     session_token { Digest::MD5.hexdigest(user.id.to_s) }
+
+    trait :with_attachments do
+      after(:create) do |answer, _evaluator|
+        create :attachment, :with_image, attached_to: answer
+        create :attachment, :with_pdf, attached_to: answer
+      end
+    end
   end
 
   factory :answer_option, class: "Decidim::Forms::AnswerOption" do

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

@@ -194,6 +194,28 @@ shared_examples_for "has questionnaire" do
       end
     end
 
+    shared_examples_for "question has a character limit" do
+      context "when max_characters value is positive" do
+        let(:max_characters) { 30 }
+
+        it "shows a message indicating number of characters left" do
+          visit questionnaire_public_path
+
+          expect(page).to have_content("30 characters left")
+        end
+      end
+
+      context "when max_characters value is 0" do
+        let(:max_characters) { 0 }
+
+        it "doesn't show message indicating number of characters left" do
+          visit questionnaire_public_path
+
+          expect(page).not_to have_content("characters left")
+        end
+      end
+    end
+
     describe "leaving a blank question (without js)", driver: :rack_test do
       include_context "when a non multiple choice question is mandatory"
 
@@ -268,12 +290,13 @@ shared_examples_for "has questionnaire" do
 
     describe "free text options" do
       let(:answer_option_bodies) { Array.new(3) { Decidim::Faker::Localized.sentence } }
-
+      let(:max_characters) { 0 }
       let!(:question) do
         create(
           :questionnaire_question,
           questionnaire: questionnaire,
           question_type: question_type,
+          max_characters: max_characters,
           position: 1,
           options: [
             { "body" => answer_option_bodies[0] },
@@ -346,6 +369,8 @@ shared_examples_for "has questionnaire" do
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
+
+        it_behaves_like "question has a character limit"
       end
 
       context "when question is multiple_option type" do
@@ -392,27 +417,35 @@ shared_examples_for "has questionnaire" do
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
+
+        it_behaves_like "question has a character limit"
       end
     end
 
     context "when question type is long answer" do
-      let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "long_answer") }
+      let(:max_characters) { 0 }
+      let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "long_answer", max_characters: max_characters) }
 
       it "renders the answer as a textarea" do
         visit questionnaire_public_path
 
         expect(page).to have_selector("textarea#questionnaire_responses_0")
       end
+
+      it_behaves_like "question has a character limit"
     end
 
     context "when question type is short answer" do
-      let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "short_answer") }
+      let(:max_characters) { 0 }
+      let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "short_answer", max_characters: max_characters) }
 
       it "renders the answer as a text field" do
         visit questionnaire_public_path
 
         expect(page).to have_selector("input[type=text]#questionnaire_responses_0")
       end
+
+      it_behaves_like "question has a character limit"
     end
 
     context "when question type is single option" do
@@ -665,7 +698,7 @@ shared_examples_for "has questionnaire" do
         end
 
         radio_buttons = page.all(".radio-button-collection input[type=radio]")
-        expect(radio_buttons.map { |b| b[:checked] }).to eq([nil, "true", nil, nil])
+        expect(radio_buttons.pluck(:checked)).to eq([nil, "true", nil, nil])
       end
 
       context "when the question is mandatory and the answer is not complete" do
@@ -830,7 +863,7 @@ shared_examples_for "has questionnaire" do
           end
 
           checkboxes = page.all(".check-box-collection input[type=checkbox]")
-          expect(checkboxes.map { |c| c[:checked] }).to eq(["true", "true", "true", nil, nil, "true"])
+          expect(checkboxes.pluck(:checked)).to eq(["true", "true", "true", nil, nil, "true"])
         end
       end
     end