decidim-forms 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c435405600fe1cf3b00311da4834ac4ff2a83436beaf8c215cbd71bacadf0b02
-  data.tar.gz: 40bb6932e182d144fec4d4eda89ec544a29069ab62860f3ac9a26c6a080ec071
+  metadata.gz: b63c51b898c731a6ac659b9160f4b5bf5d2404cea0aec58cb5fdffff1a29a9b0
+  data.tar.gz: e4a6cf68a62b0188511ba30c3fceda43c30a93bca8ab4a917edf608b8c531e1a
 SHA512:
-  metadata.gz: 115beaf2e97ae428f6efa5d235d24b713483b7ac1e4afc4095603d3865ec0b2703e8c2f5e9817f4ac8c529c04dd2a04cace2a93ba8cbf19122122e1732ca9ae0
-  data.tar.gz: f12edcefe28f0440e5e2fdf90a582cb83f368856ca65b336d8fb8c02e126cad891e3fdda4ae411fcec6289f4a2526288223ea12422e39488394362bd4f7ca99b
+  metadata.gz: 305a8eb86bf0c9d3afa0b861174ff41c79519b4f5aadd84975cccfdc9c2fd2fa2c12d1a14159a9b0da674d81233900802d271b38d078956ebd8bdd119287cbb4
+  data.tar.gz: ed601e91289f962ac5f647b205dafd86c61429e63b3401d210ccd0c345308bfcfc4f7ab5da761056b7335e66d0b2fe95c62ef4189a0dbf5e38b79d8e446ebab2

data/app/commands/decidim/forms/admin/update_questionnaire.rb

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
         # questionnaire - The current instance of the questionnaire to be updated.
-        def initialize(form, questionnaire)
+        def initialize(form, questionnaire, user)
           @form = form
           @questionnaire = questionnaire
+          @user = user
         end
 
         # Updates the questionnaire if valid.
@@ -21,13 +22,17 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          Decidim::Forms::Questionnaire.transaction do
-            if @questionnaire.questions_editable?
-              update_questionnaire_questions
-              delete_answers unless @questionnaire.published?
-            end
+          Decidim.traceability.perform_action!("update",
+                                               @questionnaire,
+                                               @user) do
+            Decidim::Forms::Questionnaire.transaction do
+              if @questionnaire.questions_editable?
+                update_questionnaire_questions
+                delete_answers unless @questionnaire.published?
+              end
 
-            update_questionnaire
+              update_questionnaire
+            end
           end
 
           broadcast(:ok)

data/app/commands/decidim/forms/answer_questionnaire.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # This command is executed when the user answers a Questionnaire.
-    class AnswerQuestionnaire < Rectify::Command
+    class AnswerQuestionnaire < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
 
       # Initializes a AnswerQuestionnaire Command.

data/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb

@@ -20,9 +20,9 @@ module Decidim
             helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_answer_option, :blank_matrix_row,
                           :blank_display_condition, :question_types, :display_condition_types, :update_url, :public_url, :answer_options_url, :edit_questionnaire_title
 
-            if defined?(Decidim::Templates::Admin::Concerns::Templatable)
+            if defined? Decidim::Templates::Admin
               include Decidim::Templates::Admin::Concerns::Templatable
-              helper Decidim::Templates::Admin::TemplatesHelper
+              helper Decidim::DatalistSelectHelper
 
               def templatable_type
                 "Decidim::Forms::Questionnaire"
@@ -47,7 +47,7 @@ module Decidim
               params["published_at"] = Time.current if params.has_key? "save_and_publish"
               @form = form(Admin::QuestionnaireForm).from_params(params)
 
-              Admin::UpdateQuestionnaire.call(@form, questionnaire) do
+              Admin::UpdateQuestionnaire.call(@form, questionnaire, current_user) do
                 on(:ok) do
                   # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.success")
                   flash[:notice] = I18n.t("update.success", scope: i18n_flashes_scope)

data/app/forms/decidim/forms/admin/display_condition_form.rb

@@ -55,21 +55,21 @@ module Decidim
         #
         # Returns a Decidim::Forms::Question
         def question
-          @question ||= Question.find_by(id: @decidim_question_id)
+          @question ||= Question.find_by(id: decidim_question_id)
         end
 
         # Finds the Condition Question from the given decidim_condition_question_id
         #
         # Returns a Decidim::Forms::Question
         def condition_question
-          @condition_question ||= Question.find_by(id: @decidim_condition_question_id)
+          @condition_question ||= Question.find_by(id: decidim_condition_question_id)
         end
 
         # Finds the Answer Option from the given decidim_answer_option_id
         #
         # Returns a Decidim::Forms::AnswerOption
         def answer_option
-          @answer_option ||= AnswerOption.find_by(id: @decidim_answer_option_id)
+          @answer_option ||= AnswerOption.find_by(id: decidim_answer_option_id)
         end
 
         private

data/app/models/decidim/forms/answer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Forms
     # The data store for an Answer in the Decidim::Forms
     class Answer < Forms::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
       include Decidim::HasAttachments
 
@@ -29,7 +29,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Forms::DataPortabilityUserAnswersSerializer
+        Decidim::Forms::DownloadYourDataUserAnswersSerializer
       end
 
       def self.newsletter_participant_ids(component)

data/app/models/decidim/forms/display_condition.rb

@@ -33,7 +33,7 @@ module Decidim
         when "not_equal"
           answer_form.choices.pluck(:answer_option_id).exclude?(answer_option.id)
         when "match"
-          condition_value.values.reject(&:blank?).any? { |value| answer_form_matches?(answer_form, value) }
+          condition_value.values.compact_blank.any? { |value| answer_form_matches?(answer_form, value) }
         end
       end
 

data/app/models/decidim/forms/questionnaire.rb

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::Templates::Templatable if defined? Decidim::Templates::Templatable
       include Decidim::Publicable
       include Decidim::TranslatableResource
+      include Decidim::Traceable
 
       translatable_fields :title, :description, :tos
       belongs_to :questionnaire_for, polymorphic: true
@@ -16,6 +17,8 @@ module Decidim
 
       after_initialize :set_default_salt
 
+      attr_accessor :questionnaire_template_id
+
       # Public: returns whether the questionnaire questions can be modified or not.
       def questions_editable?
         has_component = questionnaire_for.respond_to? :component
@@ -32,6 +35,10 @@ module Decidim
         created_at.to_i == updated_at.to_i && questions.empty?
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Forms::AdminLog::QuestionnairePresenter
+      end
+
       private
 
       # salt is used to generate secure hash in anonymous answers

data/app/packs/src/decidim/forms/admin/forms.js

@@ -11,7 +11,6 @@ import createSortList from "src/decidim/admin/sort_list.component"
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 import createQuillEditor from "src/decidim/editor"
-import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 
 export default function createEditableForm() {
   const wrapperSelector = ".questionnaire-questions";
@@ -393,8 +392,6 @@ export default function createEditableForm() {
 
       autoLabelByPosition.run();
       autoButtonsByPosition.run();
-
-      initLanguageChangeSelect($field.find("select.language-change").toArray());
     },
     onRemoveField: ($field) => {
       autoLabelByPosition.run();

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -6,10 +6,18 @@ module Decidim
       #
       # Presenter for questionnaire answer
       #
-      class QuestionnaireAnswerPresenter < Rectify::Presenter
+      class QuestionnaireAnswerPresenter < SimpleDelegator
+        delegate :content_tag, :safe_join, to: :view_context
+
         include Decidim::TranslatableAttributes
 
-        attribute :answer, Decidim::Forms::Answer
+        def answer
+          __getobj__.fetch(:answer)
+        end
+
+        def view_context
+          __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+        end
 
         def question
           translated_attribute(answer.question.body)
@@ -46,14 +54,11 @@ module Decidim
           # rubocop:disable Style/StringConcatenation
           # Interpolating strings that are `html_safe` is problematic with Rails.
           content_tag :li do
-            link_to(attachment.url, target: "_blank", rel: "noopener noreferrer") do
-              content_tag(:span) do
-                translated_attribute(attachment.title).presence ||
-                  I18n.t("download_attachment", scope: "decidim.forms.questionnaire_answer_presenter")
-              end + " " + content_tag(:small) do
+            link_to(translated_attribute(attachment.title), attachment.url) +
+              " " +
+              content_tag(:small) do
                 "#{attachment.file_type} #{number_to_human_size(attachment.file_size)}"
               end
-            end
           end
           # rubocop:enable Style/StringConcatenation
         end

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -6,8 +6,10 @@ module Decidim
       #
       # Presenter for questionnaire response
       #
-      class QuestionnaireParticipantPresenter < Rectify::Presenter
-        attribute :participant, Decidim::Forms::Answer
+      class QuestionnaireParticipantPresenter < SimpleDelegator
+        def participant
+          __getobj__.fetch(:participant)
+        end
 
         def session_token
           participant.session_token || "-"
@@ -28,7 +30,7 @@ module Decidim
         end
 
         def status
-          t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
+          I18n.t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
         end
 
         def answers

data/app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Forms::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.forms.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/forms/questionnaire_participant.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipant < Rectify::Query
+    class QuestionnaireParticipant < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/queries/decidim/forms/questionnaire_participants.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipants < Rectify::Query
+    class QuestionnaireParticipants < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -31,7 +31,7 @@
       <%= form.translated :editor, :description, toolbar: :full, lines: 30, label: t("models.components.description", scope: "decidim.forms.admin") %>
     </div>
     <div class="row column">
-      <%= form.translated :editor, :tos, toolbar: :content, lines: 10, label: t("models.components.tos", scope: "decidim.forms.admin") %>
+      <%= form.translated :editor, :tos, toolbar: :full, lines: 10, label: t("models.components.tos", scope: "decidim.forms.admin") %>
     </div>
   </div>
 </div>

data/app/views/decidim/forms/admin/questionnaires/edit.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.title")) %>
-
 <% if templates_defined? && choose_template? %>
   <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
 <% else %>

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -7,7 +7,7 @@
   <%= label_tag field_id, translated_attribute(answer.question.body), class: "questionnaire-title_and_description" %>
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-title_and_description ">
-      <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
     </div>
   <% end %>
   <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
@@ -22,7 +22,7 @@
 
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-text">
-      <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
     </div>
   <% end %>
 

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -5,13 +5,13 @@
 
 <% columns = allow_answers? && visitor_can_answer? && @form.responses.map(&:question).any?(&:matrix?) ? 9 : 6 %>
 
-<%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
+<%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
   <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
-      <%= decidim_sanitize_editor_admin translated_attribute questionnaire.description %>
+      <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
     </div>
   </div>
 </div>
@@ -151,4 +151,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_forms" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_forms" %>
+<% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ ca:
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} ha actualitzat el qüestionari %{resource_name}"
       errors:
         answer:
           body: El camp no pot estar en blanc
@@ -128,10 +132,9 @@ ca:
         extension_allowlist: 'Formats d''arxiu acceptats:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Aquesta imatge medirà:'
         processors:
-          resize_and_pad: Redimensionat i ajustat a
-          resize_to_fit: Redimensionada per ajustar-la
+          resize_and_pad: Aquesta imatge serà redimensionada i ajustada a %{dimensions}.
+          resize_to_fit: Aquesta imatge serà redimensionada per ajustar-se a %{dimensions}.
       question_types:
         files: Arxius
         long_answer: Resposta llarga
@@ -142,8 +145,6 @@ ca:
         single_option: Opció única
         sorting: Ordenació
         title_and_description: Títol i descripció
-      questionnaire_answer_presenter:
-        download_attachment: Descarregar l'arxiu adjunt
       questionnaires:
         answer:
           invalid: S'han produït un error en respondre el formulari.
@@ -174,7 +175,7 @@ ca:
           tos_agreement: En participar acceptes els Termes i condicions d'ús
       step_navigation:
         show:
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Segur?
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Estàs segura?
           back: Enrere
           continue: Continuar
           submit: Enviar respostes

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ cs:
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} aktualizoval dotazník %{resource_name}"
       errors:
         answer:
           body: Tělo nemůže být prázdné
@@ -128,10 +132,9 @@ cs:
         extension_allowlist: 'Akceptované formáty:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Tento obrázek bude:'
         processors:
-          resize_and_pad: Zmenšeno a odsazeno k
-          resize_to_fit: Upravena velikost na vyplnění
+          resize_and_pad: Tento obrázek bude změněn a vyplněn na %{dimensions}.
+          resize_to_fit: Tento obrázek bude změněn a vyplněn na %{dimensions}.
       question_types:
         files: Soubory
         long_answer: Dlouhá odpověď
@@ -142,8 +145,6 @@ cs:
         single_option: Jedna možnost
         sorting: Třídění
         title_and_description: Název a popis
-      questionnaire_answer_presenter:
-        download_attachment: Stáhnout přílohu
       questionnaires:
         answer:
           invalid: Při odpovědi na dotazník došlo k chybám.

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -128,10 +129,6 @@ de:
         extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Das Bild wird:'
-        processors:
-          resize_and_pad: in der Größe angepasst und gepolstert zu
-          resize_to_fit: in der Größe verändert, damit es passt
       question_types:
         files: Dateien
         long_answer: Lange Antwort
@@ -142,8 +139,6 @@ de:
         single_option: Einzelne Option
         sorting: Sortierung
         title_and_description: Titel und Beschreibung
-      questionnaire_answer_presenter:
-        download_attachment: Anhang herunterladen
       questionnaires:
         answer:
           invalid: Bei der Beantwortung des Fragebogens sind Fehler aufgetreten.
@@ -174,7 +169,7 @@ de:
           tos_agreement: Mit der Teilnahme stimmen Sie den Nutzungsbedingungen zu
       step_navigation:
         show:
-          are_you_sure: Diese Aktion kann nicht rückgängig gemacht werden und Sie können Ihre Antworten nicht bearbeiten. Sind Sie sich sicher?
+          are_you_sure: Diese Aktion kann nicht rückgängig gemacht werden und Sie können Ihre Antworten nicht bearbeiten. Bist du sicher?
           back: Zurück
           continue: Weiter
           submit: einreichen