decidim-forms 0.29.2 → 0.30.0.rc2

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

@@ -7,68 +7,61 @@ shared_examples_for "update questions" do
     let!(:question) { create(:questionnaire_question, questionnaire:, body:) }
 
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "modifies the question when the information is valid" 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
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: "Modified question"
+        fill_in "questions_questions_#{question.id}_max_characters", with: 30
+        check "Mandatory"
+        select "Long answer", from: "Type"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       expect(page).to have_css("input[value='Modified question']")
       expect(page).to have_no_css("input[value='This is the first question']")
-      expect(page).to have_css("input#questionnaire_questions_#{question.id}_mandatory[checked]")
-      expect(page).to have_css("input#questionnaire_questions_#{question.id}_max_characters[value='30']")
-      expect(page).to have_css("select#questionnaire_questions_#{question.id}_question_type option[value='long_answer'][selected]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_max_characters[value='30']")
+      expect(page).to have_css("select#questions_questions_#{question.id}_question_type option[value='long_answer'][selected]")
     end
 
     it "re-renders the form when the information is invalid and displays errors" do
       expand_all_questions
 
-      within "form.edit_questionnaire" 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"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        expect(page).to have_content("Statement*")
+        fill_in "questions_questions_#{question.id}_body_en", with: ""
+        fill_in "questions_questions_#{question.id}_max_characters", with: -3
+        check "Mandatory"
+        select "Matrix (Multiple option)", from: "Type"
+        select "2", from: "Maximum number of choices"
       end
 
-      expand_all_questions
+      click_on "Save"
+      click_on "Expand all questions"
 
       expect(page).to have_admin_callout("There was a problem saving")
-      expect(page).to have_content("cannot be blank", count: 5) # empty question, 2 empty default answer options, 2 empty default matrix rows
+      expect(page).to have_content("cannot be blank", count: 5)
       expect(page).to have_content("must be greater than or equal to 0", count: 1)
 
       expect(page).to have_css("input[value='']")
       expect(page).to have_no_css("input[value='This is the first question']")
-      expect(page).to have_css("input#questionnaire_questions_#{question.id}_mandatory[checked]")
-      expect(page).to have_css("input#questionnaire_questions_#{question.id}_max_characters[value='-3']")
+      expect(page).to have_css("input#questions_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_max_characters[value='-3']")
+      expect(page).to have_css("select#questions_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
       expect(page).to have_select("Maximum number of choices", selected: "2")
-      expect(page).to have_css("select#questionnaire_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
     end
 
     it "preserves deleted status across submission failures" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
       click_on "Add question"
@@ -84,36 +77,28 @@ shared_examples_for "update questions" do
     end
 
     it "removes the question" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit questionnaire_edit_path
+      click_on "Manage questions"
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
 
     it "cannot be moved up" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "cannot be moved down" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Down")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Down")
       end
     end
   end
@@ -122,22 +107,20 @@ shared_examples_for "update questions" do
     let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire:, body: title_and_description_body) }
 
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "modifies the question when the information is valid" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified title and description"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: "Modified title and description"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       expect(page).to have_css("input[value='Modified title and description']")
       expect(page).to have_no_css("input[value='This is the first title and description']")
@@ -146,14 +129,12 @@ shared_examples_for "update questions" do
     it "re-renders the form when the information is invalid and displays errors" do
       expand_all_questions
 
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: ""
       end
 
+      click_on "Save"
+
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
@@ -163,10 +144,8 @@ shared_examples_for "update questions" do
     end
 
     it "preserves deleted status across submission failures" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
       click_on "Add question"
@@ -182,36 +161,28 @@ shared_examples_for "update questions" do
     end
 
     it "removes the question" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit questionnaire_edit_path
+      click_on "Manage questions"
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
 
     it "cannot be moved up" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "cannot be moved down" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Down")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Down")
       end
     end
   end
@@ -233,7 +204,8 @@ shared_examples_for "update questions" do
     end
 
     before do
-      visit questionnaire_edit_path
+      click_on "Save"
+      click_on "Manage questions"
     end
 
     it "allows deleting answer options" do
@@ -245,35 +217,31 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       expect(page).to have_css(".questionnaire-question-answer-option", count: 2)
     end
 
     it "still removes the question even if previous editions rendered the options invalid" do
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 1)
-
-        expand_all_questions
+      expect(page).to have_css(".questionnaire-question", count: 1)
 
-        within ".questionnaire-question-answer-option:first-of-type" do
-          fill_in find_nested_form_field_locator("body_en"), with: ""
-        end
+      expand_all_questions
 
-        within ".questionnaire-question" do
-          click_on "Remove", match: :first
-        end
+      within ".questionnaire-question-answer-option:first-of-type" do
+        fill_in find_nested_form_field_locator("body_en"), with: ""
+      end
 
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove", match: :first
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
   end
 
@@ -300,7 +268,8 @@ shared_examples_for "update questions" do
     end
 
     before do
-      visit_questionnaire_edit_path_and_expand_all
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "allows deleting matrix rows" do
@@ -310,7 +279,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       within ".questionnaire-question:last-of-type" do
         expect(page).to have_css(".questionnaire-question-matrix-row", count: 2)
@@ -319,27 +288,23 @@ shared_examples_for "update questions" do
     end
 
     it "still removes the question even if previous editions rendered the rows invalid" do
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 2)
-
-        within ".questionnaire-question-matrix-row:first-of-type" do
-          fill_in find_nested_form_field_locator("body_en"), with: ""
-        end
+      expect(page).to have_css(".questionnaire-question", count: 2)
 
-        within ".questionnaire-question:last-of-type" do
-          click_on "Remove", match: :first
-        end
+      within ".questionnaire-question-matrix-row:first-of-type" do
+        fill_in find_nested_form_field_locator("body_en"), with: ""
+      end
 
-        click_on "Save"
+      within ".questionnaire-question:last-of-type" do
+        click_on "Remove", match: :first
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 1)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 1)
     end
   end
 
@@ -361,8 +326,8 @@ shared_examples_for "update questions" do
     end
 
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     shared_examples_for "switching questions order" do

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

@@ -24,30 +24,9 @@ shared_examples_for "manage questionnaires" do
     }
   end
 
-  it "updates the questionnaire" do
-    visit questionnaire_edit_path
-
-    new_description = {
-      en: "<p>New description</p>",
-      ca: "<p>Nova descripció</p>",
-      es: "<p>Nueva descripción</p>"
-    }
-
-    within "form.edit_questionnaire" do
-      fill_in_i18n_editor(:questionnaire_description, "#questionnaire-description-tabs", new_description)
-      click_on "Save"
-    end
-
-    expect(page).to have_admin_callout("successfully")
-
-    visit questionnaire_public_path
-
-    expect(page).to have_content("New description")
-  end
-
   context "when the questionnaire is not already answered" do
     before do
-      visit questionnaire_edit_path
+      visit manage_questions_path
     end
 
     it_behaves_like "add questions"
@@ -61,7 +40,7 @@ shared_examples_for "manage questionnaires" do
     let!(:answer) { create(:answer, questionnaire:, question:) }
 
     it "cannot modify questionnaire questions" do
-      visit questionnaire_edit_path
+      visit manage_questions_path
 
       expect(page).to have_no_content("Add question")
       expect(page).to have_no_content("Remove")
@@ -112,8 +91,8 @@ shared_examples_for "manage questionnaires" do
     find(".button.expand-all").click
   end
 
-  def visit_questionnaire_edit_path_and_expand_all
-    visit questionnaire_edit_path
+  def visit_manage_questions_and_expand_all
+    click_on "Manage questions"
     expand_all_questions
   end
 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.29.2"
+      "0.30.0.rc2"
     end
   end
 end

data/lib/decidim/forms.rb

@@ -14,6 +14,5 @@ module Decidim
 
   module Exporters
     autoload :FormPDF, "decidim/exporters/form_pdf"
-    autoload :FormPDFControllerHelper, "decidim/exporters/form_pdf_controller_helper"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,56 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
-- !ruby/object:Gem::Dependency
-  name: wicked_pdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -91,6 +77,7 @@ files:
 - app/cells/decidim/forms/step_navigation/show.erb
 - app/cells/decidim/forms/step_navigation_cell.rb
 - app/commands/decidim/forms/admin/update_questionnaire.rb
+- app/commands/decidim/forms/admin/update_questions.rb
 - app/commands/decidim/forms/answer_questionnaire.rb
 - app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
 - app/controllers/decidim/forms/admin/concerns/has_questionnaire_answers.rb
@@ -100,6 +87,7 @@ files:
 - app/forms/decidim/forms/admin/question_form.rb
 - app/forms/decidim/forms/admin/question_matrix_row_form.rb
 - app/forms/decidim/forms/admin/questionnaire_form.rb
+- app/forms/decidim/forms/admin/questions_form.rb
 - app/forms/decidim/forms/answer_choice_form.rb
 - app/forms/decidim/forms/answer_form.rb
 - app/forms/decidim/forms/questionnaire_form.rb
@@ -120,8 +108,6 @@ files:
 - 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
@@ -129,14 +115,15 @@ 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/admin/publish_answers_buttons.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/admin_log/question_presenter.rb
 - app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb
 - app/presenters/decidim/forms/answer_option_presenter.rb
 - app/presenters/decidim/forms/question_presenter.rb
@@ -151,13 +138,13 @@ files:
 - app/views/decidim/forms/admin/questionnaires/_matrix_row.html.erb
 - app/views/decidim/forms/admin/questionnaires/_matrix_row_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_question.html.erb
+- app/views/decidim/forms/admin/questionnaires/_questions_form.html.erb
 - app/views/decidim/forms/admin/questionnaires/_separator.html.erb
 - app/views/decidim/forms/admin/questionnaires/_title_and_description.html.erb
-- app/views/decidim/forms/admin/questionnaires/answers/export/_answer.html.erb
-- app/views/decidim/forms/admin/questionnaires/answers/export/pdf.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/index.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/show.html.erb
 - app/views/decidim/forms/admin/questionnaires/edit.html.erb
+- app/views/decidim/forms/admin/questionnaires/edit_questions.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
@@ -171,10 +158,9 @@ files:
 - app/views/decidim/forms/questionnaires/answers/_single_option.html.erb
 - app/views/decidim/forms/questionnaires/answers/_sorting.html.erb
 - app/views/decidim/forms/questionnaires/answers/_title_and_description.html.erb
+- app/views/decidim/forms/questionnaires/edit.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
 - config/locales/ar.yml
@@ -274,13 +260,13 @@ files:
 - db/migrate/20240402095253_add_matrix_row_counter_cache_to_questions.rb
 - db/migrate/20240416111953_add_display_conditions_counter_cache_to_questions.rb
 - db/migrate/20240416113926_add_display_conditions_for_other_questions_counter_cache_to_questions.rb
+- db/migrate/20241122142230_add_survey_answers_published_at_to_questions.rb
 - decidim-forms.gemspec
 - 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
 - lib/decidim/forms/admin.rb
 - lib/decidim/forms/admin_engine.rb
@@ -315,14 +301,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Decidim forms

data/app/packs/entrypoints/decidim_questionnaire_answers_pdf.js

@@ -1 +0,0 @@
-import "entrypoints/decidim_questionnaire_answers_pdf.scss"

data/app/packs/entrypoints/decidim_questionnaire_answers_pdf.scss

@@ -1 +0,0 @@
-@import "stylesheets/decidim/forms/questionnaire-answers-pdf.scss";