decidim-forms 0.24.3 → 0.25.0.rc4

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

@@ -28,6 +28,42 @@ FactoryBot.define do
       end
     end
 
+    trait :with_all_questions do
+      questions do
+        position = 0
+        qs = %w(short_answer long_answer).collect do |text_question_type|
+          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+          position += 1
+          q
+        end
+
+        %w(single_option multiple_option).each do |option_question_type|
+          q = build(:questionnaire_question, :with_answer_options, question_type: option_question_type, position: position)
+          position += 1
+          qs << q
+          q.display_conditions.build(
+            condition_question: qs[q.position - 2],
+            question: q,
+            condition_type: :answered,
+            mandatory: true
+          )
+        end
+
+        %w(matrix_single matrix_multiple).collect do |matrix_question_type|
+          q = build(:questionnaire_question, :with_answer_options, question_type: matrix_question_type, position: position, body: generate_localized_title)
+          position += 1
+          qs << q
+          q.display_conditions.build(
+            condition_question: qs[q.position - 2],
+            question: q,
+            condition_type: :answered,
+            mandatory: true
+          )
+        end
+        qs
+      end
+    end
+
     trait :empty do
       title { {} }
       description { {} }
@@ -63,9 +99,10 @@ FactoryBot.define do
       end
 
       if question.matrix_rows.empty?
-        evaluator.rows.each do |row|
+        evaluator.rows.each_with_index do |row, idx|
           question.matrix_rows.build(
-            body: row["body"]
+            body: row["body"],
+            position: idx
           )
         end
       end

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

@@ -921,6 +921,7 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is long answer" do
             let!(:condition_question_type) { "long_answer" }
+            let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
@@ -1012,6 +1013,7 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is long answer" do
             let!(:condition_question_type) { "long_answer" }
+            let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(true)

data/lib/decidim/forms/user_answers_serializer.rb

@@ -27,6 +27,9 @@ module Decidim
 
       private
 
+      attr_reader :answers
+      alias resource answers
+
       def normalize_body(answer)
         answer.body ||
           normalize_attachments(answer) ||

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -95,24 +95,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_forms_manifest.css
-- app/assets/config/admin/decidim_forms_manifest.js
-- app/assets/config/decidim_forms_manifest.css
-- app/assets/config/decidim_forms_manifest.js
-- app/assets/images/decidim/surveys/icon.svg
-- app/assets/javascripts/decidim/forms/admin/auto_buttons_by_min_items.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/auto_select_options_by_total_items.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/auto_select_options_from_url.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/collapsible_questions.js.es6
-- app/assets/javascripts/decidim/forms/admin/forms.js.es6
-- app/assets/javascripts/decidim/forms/admin/live_text_update.component.js.es6
-- app/assets/javascripts/decidim/forms/autosortable_checkboxes.component.js.es6
-- app/assets/javascripts/decidim/forms/display_conditions.component.js.es6
-- app/assets/javascripts/decidim/forms/forms.js.es6
-- app/assets/javascripts/decidim/forms/max_choices_alert.component.js.es6
-- app/assets/javascripts/decidim/forms/option_attached_inputs.component.js.es6
-- app/assets/stylesheets/decidim/forms/forms.scss
-- app/assets/stylesheets/decidim/forms/questionnaire-answers-pdf.scss
 - app/cells/decidim/forms/answer_readonly/show.erb
 - app/cells/decidim/forms/answer_readonly_cell.rb
 - app/cells/decidim/forms/matrix_readonly/show.erb
@@ -149,6 +131,24 @@ files:
 - app/models/decidim/forms/question.rb
 - app/models/decidim/forms/question_matrix_row.rb
 - app/models/decidim/forms/questionnaire.rb
+- app/packs/entrypoints/decidim_forms.js
+- app/packs/entrypoints/decidim_forms_admin.js
+- app/packs/entrypoints/decidim_questionnaire_answers_pdf.js
+- app/packs/entrypoints/decidim_questionnaire_answers_pdf.scss
+- app/packs/images/decidim/surveys/decidim_surveys.svg
+- app/packs/src/decidim/forms/admin/auto_buttons_by_min_items.component.js
+- app/packs/src/decidim/forms/admin/auto_select_options_by_total_items.component.js
+- app/packs/src/decidim/forms/admin/auto_select_options_from_url.component.js
+- app/packs/src/decidim/forms/admin/collapsible_questions.js
+- app/packs/src/decidim/forms/admin/forms.js
+- app/packs/src/decidim/forms/admin/live_text_update.component.js
+- app/packs/src/decidim/forms/autosortable_checkboxes.component.js
+- app/packs/src/decidim/forms/display_conditions.component.js
+- app/packs/src/decidim/forms/forms.js
+- app/packs/src/decidim/forms/max_choices_alert.component.js
+- app/packs/src/decidim/forms/option_attached_inputs.component.js
+- app/packs/stylesheets/decidim/forms/forms.scss
+- app/packs/stylesheets/decidim/forms/questionnaire-answers-pdf.scss
 - app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
 - app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb
 - app/presenters/decidim/forms/answer_option_presenter.rb
@@ -182,6 +182,7 @@ files:
 - app/views/decidim/forms/questionnaires/answers/_sorting.html.erb
 - app/views/decidim/forms/questionnaires/show.html.erb
 - app/views/layouts/decidim/forms/admin/questionnaires/questionnaire_answers.html.erb
+- config/assets.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -209,6 +210,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -219,10 +221,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -263,6 +265,7 @@ files:
 - 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
+- db/migrate/20210616153042_set_position_to_question_matrix_rows.rb
 - lib/decidim/api/answer_option_type.rb
 - lib/decidim/api/question_type.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
@@ -301,9 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.1.2
 signing_key:

data/app/assets/config/admin/decidim_forms_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/forms/questionnaire-answers-pdf.scss
- */

data/app/assets/config/admin/decidim_forms_manifest.js

@@ -1,2 +0,0 @@
-//= link decidim/forms/admin/forms.js
-//= link decidim/forms/admin/collapsible_questions.js

data/app/assets/config/decidim_forms_manifest.css

@@ -1,4 +0,0 @@
-/*
- *= link decidim/forms/forms.scss
- *= link decidim/forms/questionnaire-answers-pdf.scss
- */

data/app/assets/config/decidim_forms_manifest.js

@@ -1 +0,0 @@
-// = link decidim/forms/forms.js

data/app/assets/javascripts/decidim/forms/admin/auto_buttons_by_min_items.component.js.es6

@@ -1,25 +0,0 @@
-((exports) => {
-  class AutoButtonsByMinItemsComponent {
-    constructor(options = {}) {
-      this.listSelector = options.listSelector;
-      this.minItems = options.minItems;
-      this.hideOnMinItemsOrLessSelector = options.hideOnMinItemsOrLessSelector;
-
-      this.run();
-    }
-
-    run() {
-      const $list = $(this.listSelector);
-      const $items = $list.find(this.hideOnMinItemsOrLessSelector);
-
-      if ($list.length <= this.minItems) {
-        $items.hide();
-      } else {
-        $items.show();
-      }
-    }
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.AutoButtonsByMinItemsComponent = AutoButtonsByMinItemsComponent;
-})(window);

data/app/assets/javascripts/decidim/forms/admin/auto_select_options_by_total_items.component.js.es6

@@ -1,23 +0,0 @@
-((exports) => {
-  class AutoSelectOptionsByTotalItemsComponent {
-    constructor(options = {}) {
-      this.wrapperSelector = options.wrapperSelector;
-      this.selectSelector = options.selectSelector;
-      this.listSelector = options.listSelector;
-    }
-
-    run() {
-      const $list = $(this.listSelector);
-      const $selectField = $list.parents(this.wrapperSelector).find(this.selectSelector);
-
-      $selectField.find("option").slice(1).remove();
-
-      for (let idx = 2; idx <= $list.length; idx += 1) {
-        $(`<option value="${idx}">${idx}</option>`).appendTo($selectField);
-      }
-    }
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.AutoSelectOptionsByTotalItemsComponent = AutoSelectOptionsByTotalItemsComponent;
-})(window);

data/app/assets/javascripts/decidim/forms/admin/auto_select_options_from_url.component.js.es6

@@ -1,40 +0,0 @@
-((exports) => {
-  class AutoSelectOptionsFromUrl {
-    constructor(options = {}) {
-      this.$source = options.source;
-      this.$select = options.select;
-      this.sourceToParams = options.sourceToParams;
-      this.run();
-    }
-
-    run() {
-      this.$source.on("change", this._onSourceChange.bind(this));
-      this._onSourceChange();
-    }
-
-    _onSourceChange() {
-      const select = this.$select;
-      const params = this.sourceToParams(this.$source);
-      const url = this.$source.data("url");
-
-      $.getJSON(url, params, function (data) {
-        select.find("option:not([value=''])").remove();
-        const selectedValue = select.data("selected");
-
-        data.forEach((option) => {
-          let optionElement = $(`<option value="${option.id}">${option.body}</option>`).appendTo(select);
-          if (option.id === selectedValue) {
-            optionElement.attr("selected", true);
-          }
-        });
-
-        if (selectedValue) {
-          select.val(selectedValue);
-        }
-      });
-    }
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.AutoSelectOptionsFromUrl = AutoSelectOptionsFromUrl;
-})(window);

data/app/assets/javascripts/decidim/forms/admin/live_text_update.component.js.es6

@@ -1,52 +0,0 @@
-/**
- * This component allows for an element's text value to be updated with the value
- * of an input whenever this input's value is changed.
- *
- * @param {object} options
- *
- * Available options:
- * {string} `inputSelector`:  The query selector to locate the input element
- * {string} `targetSelector`: The query selector to locate the target element
- * {number} `maxLength`: The maximum characters from the input value to be displayed in the target
- * {string} `omission`: The string used to shorten the value to the given maxLength (e.g. "...")
- * {string} `placeholder`: The string to be displayed in the target element when the input has no value
- */
-((exports) => {
-  class LiveTextUpdateComponent {
-    constructor(options = {}) {
-      this.inputSelector = options.inputSelector;
-      this.targetSelector = options.targetSelector;
-      this.maxLength = options.maxLength;
-      this.omission = options.omission;
-      this.placeholder = options.placeholder;
-      this._bindEvent();
-      this._run();
-    }
-
-    _run() {
-      const $input = $(this.inputSelector);
-      const $target = $(this.targetSelector);
-
-      let text = $input.val() || this.placeholder;
-
-      // truncate string
-      if (text.length > this.maxLength) {
-        text = text.substring(0, this.maxLength - this.omission.length) + this.omission;
-      }
-
-      $target.text(text);
-    }
-
-    _bindEvent() {
-      const $input = $(this.inputSelector);
-      $input.on("change", this._run.bind(this));
-    }
-
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.LiveTextUpdateComponent = LiveTextUpdateComponent;
-  exports.DecidimAdmin.createLiveTextUpdateComponent = (options) => {
-    return new LiveTextUpdateComponent(options);
-  }
-})(window);

data/app/assets/javascripts/decidim/forms/autosortable_checkboxes.component.js.es6

@@ -1,85 +0,0 @@
-/* eslint-disable no-ternary */
-
-((exports) => {
-  class AutosortableCheckboxesComponent {
-    constructor(options = {}) {
-      this.wrapperField = options.wrapperField;
-      this._bindEvent();
-      this._order();
-      this._normalize();
-    }
-
-    // Order by position
-    _order() {
-      const max = $(this.wrapperField).find(".collection-input").length;
-      $(this.wrapperField).find(".collection-input").each((idx, el) => {
-        const $positionField = $(el).find("input[name$=\\[position\\]]");
-        const position = $positionField.val()
-          ? parseInt($positionField.val(), 10)
-          : max;
-
-        let $next = $(el).next();
-        while ($next.length > 0) {
-          const $nextPositionField = $next.find("input[name$=\\[position\\]]");
-          const nextPosition = $nextPositionField.val()
-            ? parseInt($nextPositionField.val(), 10)
-            : max;
-
-          if (position > nextPosition) {
-            $next.insertBefore($(el));
-          }
-          $next = $next.next();
-        }
-      });
-    }
-
-    _findLastPosition() {
-      let lastPosition = 0;
-      $(this.wrapperField).find(".collection-input").each((idx, el) => {
-        const $positionField = $(el).find("input[name$=\\[position\\]]");
-        const position = parseInt($positionField.val(), 10);
-        if (position > lastPosition) {
-          lastPosition = position;
-        }
-      });
-      return lastPosition;
-    }
-
-    _normalize() {
-      $(this.wrapperField).find(".collection-input .position").each((idx, el) => {
-        const $positionField = $(el).parent().find("input[name$=\\[position\\]]");
-        if ($positionField.val()) {
-          $positionField.val(idx);
-          $positionField.prop("disabled", false);
-          $(el).html(`${idx + 1}. `);
-        }
-      });
-    }
-
-    _bindEvent() {
-      $(this.wrapperField).find("input[type=checkbox]").on("change", (el) => {
-        const $parentLabel = $(el.target).parents("label");
-        const $positionSelector = $parentLabel.find(".position");
-        const $positionField = $parentLabel.find("input[name$=\\[position\\]]");
-        const lastPosition = this._findLastPosition();
-
-        if (el.target.checked) {
-          $positionField.val(lastPosition + 1);
-          $positionField.prop("disabled", false);
-          $positionSelector.html(lastPosition + 1);
-        } else {
-          $positionField.val("");
-          $positionField.prop("disabled", true);
-          $positionSelector.html("");
-        }
-        this._order();
-        this._normalize();
-      });
-    }
-  }
-
-  exports.Decidim = exports.Decidim || {};
-  exports.Decidim.createAutosortableCheckboxes = (options) => {
-    return new AutosortableCheckboxesComponent(options);
-  };
-})(window);