decidim-forms 0.27.4 → 0.28.0.rc5

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

@@ -57,14 +57,14 @@ shared_examples_for "manage questionnaires" do
   end
 
   context "when the questionnaire is already answered" do
-    let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, body: body, question_type: "multiple_option") }
-    let!(:answer) { create(:answer, questionnaire: questionnaire, question: question) }
+    let!(:question) { create(:questionnaire_question, questionnaire:, body:, question_type: "multiple_option") }
+    let!(:answer) { create(:answer, questionnaire:, question:) }
 
     it "cannot modify questionnaire questions" do
       visit questionnaire_edit_path
 
-      expect(page).to have_no_content("Add question")
-      expect(page).to have_no_content("Remove")
+      expect(page).not_to have_content("Add question")
+      expect(page).not_to have_content("Remove")
 
       expand_all_questions
 
@@ -72,26 +72,26 @@ shared_examples_for "manage questionnaires" do
       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]")
+      expect(page).to have_selector(".ProseMirror[contenteditable=false]")
     end
   end
 
   private
 
   def find_nested_form_field_locator(attribute, visible: :visible)
-    find_nested_form_field(attribute, visible: visible)["id"]
+    find_nested_form_field(attribute, visible:)["id"]
   end
 
   def find_nested_form_field(attribute, visible: :visible)
-    current_scope.find(nested_form_field_selector(attribute), visible: visible)
+    current_scope.find(nested_form_field_selector(attribute), visible:)
   end
 
   def have_nested_field(attribute, with:)
-    have_field find_nested_form_field_locator(attribute), with: with
+    have_field find_nested_form_field_locator(attribute), with:
   end
 
   def have_no_nested_field(attribute, with:)
-    have_no_field(find_nested_form_field_locator(attribute), with: with)
+    have_no_field(find_nested_form_field_locator(attribute), with:)
   end
 
   def nested_form_field_selector(attribute)

data/lib/decidim/forms/user_answers_serializer.rb

@@ -32,7 +32,7 @@ module Decidim
       def hash_for(answer)
         {
           answer_translated_attribute_name(:id) => answer&.session_token,
-          answer_translated_attribute_name(:created_at) => answer&.created_at&.to_s(:db),
+          answer_translated_attribute_name(:created_at) => answer&.created_at,
           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")
         }
@@ -83,7 +83,7 @@ module Decidim
           row_body = translated_attribute(matrix_row.body)
 
           row_choices = answer.question.answer_options.map do |answer_option|
-            choice = choices.find_by(matrix_row: matrix_row, answer_option: answer_option)
+            choice = choices.find_by(matrix_row:, answer_option:)
             choice.try(:custom_body) || choice.try(:body)
           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.27.4"
+      "0.28.0.rc5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.28.0.rc5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-12-18 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.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -100,6 +100,7 @@ files:
 - app/cells/decidim/forms/matrix_readonly/show.erb
 - app/cells/decidim/forms/matrix_readonly_cell.rb
 - app/cells/decidim/forms/question_readonly/show.erb
+- app/cells/decidim/forms/question_readonly/title_and_description.erb
 - app/cells/decidim/forms/question_readonly_cell.rb
 - app/cells/decidim/forms/step_navigation/show.erb
 - app/cells/decidim/forms/step_navigation_cell.rb
@@ -142,7 +143,6 @@ files:
 - 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
@@ -173,6 +173,8 @@ 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/_questionnaire.html.erb
+- app/views/decidim/forms/questionnaires/_questionnaire_readonly.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
@@ -254,9 +256,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -301,10 +305,15 @@ files:
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
 - lib/decidim/forms/user_answers_serializer.rb
 - lib/decidim/forms/version.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -313,14 +322,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Decidim forms

data/app/packs/src/decidim/forms/autosortable_checkboxes.component.js

@@ -1,83 +0,0 @@
-/* eslint-disable require-jsdoc */
-/* eslint-disable no-ternary */
-
-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();
-    });
-  }
-}
-
-export default function createAutosortableCheckboxes(options) {
-  return new AutosortableCheckboxesComponent(options);
-}