From 5527b48555cdedf97b3dccfeb19ac3e516b8e829 Mon Sep 17 00:00:00 2001 From: Anna Topalidi <60363870+antopalidi@users.noreply.github.com> Date: Mon, 6 May 2024 13:17:11 +0200 Subject: [PATCH] Upgrade Decidim 0.28 (#82) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * init upgrade * workflows * rubocop config * styles * edit note form * change photo galary * fix photo form * fix lib tests * fix stylelint * fix rubocop * fix some tests, fix hide button * fix hide button color * fix snippets for map builder * fix javascript_pack_tag * fix new proposal form * change the order of the sections * change new proposal form * fix gallery * fix stylelint * adapt the number of steps in the visualization for repoting proposals. Remove non used override * Fix proposal answer templates (#84) * remove extra code, override controller * remove extra premissions spec * fir order of avaliablity_options * steps css * fix tests * fix non-system tests * remove overriden file * further cleaning of templates * fix proposals tests * fix edit notes specs * fix edit notes links specs * fix edit notes links specs * fix reporting proposals in admin * scope everything under reporting proposals. fix template management * fix valuators bug using templates * fix unit specs * fix admin specs * fix custom validations * fix autocomplete in geocoding * fix styles * fix linked resources * fix more tests * fix editing proposals * fix test * fix comparizon overrides * fix proposals tests * fix additional buttons * fix camera device --------- Co-authored-by: Ivan Vergés --- .github/workflows/lint.yml | 6 +- .github/workflows/test_integration.yml | 20 +- .github/workflows/test_unit.yml | 22 +- .gitignore | 2 + .rubocop.yml | 4 +- .rubocop_ruby.yml | 3 +- .ruby-version | 2 +- Gemfile | 11 +- Gemfile.lock | 782 +- README.md | 23 +- Rakefile | 2 - .../linked_resources_for_cell_override.rb | 23 + .../edit_note_modal/show.erb | 41 +- .../decidim/admin/hide_resource_override.rb | 34 - .../admin/answer_proposal_override.rb | 4 +- .../assign_proposals_to_valuator_override.rb | 2 +- .../admin/update_category_override.rb | 2 +- ...pdate_proposal_answer_template_override.rb | 26 + .../publish_proposal_override.rb | 4 +- .../copy_questionnaire_template_override.rb | 32 - .../create_questionnaire_template_override.rb | 32 - .../create_reporting_proposal.rb | 2 +- .../update_reporting_proposal.rb | 38 + .../admin/copy_proposal_answer_template.rb | 35 - .../admin/create_proposal_answer_template.rb | 48 - .../admin/update_proposal_answer_template.rb | 52 - ...al_answer_templates_controller_override.rb | 31 + .../proposal_answers_controller_override.rb | 2 +- .../admin/proposals_controller_override.rb | 4 +- ...luation_assignments_controller_override.rb | 10 +- ...eds_proposal_extra_validations_snippets.rb | 1 - .../proposals_controller_override.rb | 39 + .../admin/application_controller_override.rb | 20 - .../admin/proposals_controller.rb | 8 +- .../geolocation_controller.rb | 2 +- .../proposal_answer_templates_controller.rb | 183 - .../publish_proposal_event_override.rb | 2 +- .../form_builder_override.rb | 25 +- .../map_builder_override.rb | 11 +- .../admin/proposal_photo_form.rb | 6 +- .../reporting_proposals/proposal_form.rb | 2 + .../admin/proposal_answer_template_form.rb | 21 - .../proposal_wizard_helper_override.rb | 37 +- .../resource_helper_override.rb | 2 +- .../decidim/admin/hidden_resource_mailer.rb | 28 - .../decidim/reported_mailer_override.rb | 16 - .../admin/hidden_resource_mailer.rb | 30 + .../notification_answer_proposal_mailer.rb | 2 +- .../admin/proposals_valuator_mailer.rb | 4 +- .../notification_publish_proposal_mailer.rb | 2 +- .../reported_mailer_override.rb | 18 + .../add_template_chooser.html.erb.deface | 5 - .../show/add_address.html.erb.deface | 2 +- .../show/add_photo_management.html.erb.deface | 2 +- .../show/add_send_email_btn.html.erb.deface | 2 +- .../show/add_valuators_form.html.erb.deface | 26 +- .../replace_add_photos.html.erb.deface | 37 - .../add_distance_badge.html.erb.deface | 5 - .../add_description.html.erb.deface | 5 + .../replace_title.html.erb.deface | 11 +- .../proposals/compare/add_css.html.erb.deface | 5 + .../add_distance_badge.html.erb.deface | 10 + .../proposals/edit/add_css.html.erb.deface | 2 +- .../edit/replace_javascript.html.erb.deface | 4 +- .../edit_draft/add_css.html.erb.deface | 5 - .../edit_draft/add_user_group.html.erb.deface | 3 - .../replace_javascript.html.erb.deface | 6 +- ...e_partial_edit_form_fields.html.erb.deface | 7 +- .../proposals/new/add_css.html.erb.deface | 4 +- .../proposals/new/remove_body.html.erb.deface | 1 + .../new/remove_title.html.erb.deface | 2 +- .../new/replace_javascript.html.erb.deface | 4 +- .../proposals/preview/add_css.html.erb.deface | 5 + .../add_additional_button.html.erb.deface | 2 +- .../decidim_reporting_proposals.js | 1 + ...idim_reporting_proposals_js_validations.js | 1 - .../entrypoints/decidim_templates_admin.js | 1 - .../proposal_extra_validations.js | 25 +- .../proposals/add_proposal.js | 86 +- .../reporting_proposals/reverse_geocoding.js | 2 - .../reporting_proposals/user_camera_inputs.js | 14 +- .../admin/proposal_answer_template_chooser.js | 27 - .../reporting_proposals/geocoding_addons.scss | 35 +- .../list_component_admin.scss | 12 +- .../manage_component_admin.scss | 74 +- .../proposals/add_proposal.scss | 13 +- .../user_camera_inputs.scss | 34 +- .../templates/admin/extra_permissions.rb | 37 - .../decidim/templates/admin/permissions.rb | 51 + .../resource_locator_presenter_override.rb | 40 + .../resource_locator_presenter_override.rb | 38 - .../resource_manifest_override.rb | 16 + .../decidim/resource_manifest_override.rb | 14 - .../proposal_serializer_override.rb | 8 +- .../proposal_notes/_editing_note.html.erb | 6 +- .../_proposal_notes_body.html.erb | 2 +- .../admin/proposals/_address.html.erb | 21 +- .../proposals/_send_email_button.html.erb | 10 +- .../notify_proposals_valuator.html.erb | 17 - .../proposals/_additional_button.html.erb | 2 +- .../decidim/proposals/proposals/index.js.erb | 2 - .../notify_mail.html.erb | 0 .../notify_proposal_author.html.erb | 0 .../admin/proposals/_photo_form.html.erb | 5 +- .../admin/proposals/_photo_gallery.html.erb | 7 +- .../admin/proposals/_photos.html.erb | 26 +- .../proposals/_proposal_td_hide.html.erb | 18 +- .../proposals/_proposal_td_title.html.erb | 4 +- .../notify_proposals_valuator.html.erb | 17 + .../notify_proposal_author.html.erb | 0 .../_additional_button_for_show.html.erb | 7 +- .../proposals/_camera_button.html.erb | 26 + .../proposals/_new_proposal_fields.html.erb | 12 +- .../_reporting_proposal_fields.html.erb | 147 +- .../proposals/_user_group.html.erb | 2 +- .../proposal_answer_templates/_form.html.erb | 34 - .../_template_chooser.html.erb | 16 - .../proposal_answer_templates/edit.html.erb | 3 - .../proposal_answer_templates/index.html.erb | 52 - .../proposal_answer_templates/new.html.erb | 6 - bin/dev | 5 + bin/{webpack-dev-server => shakapacker} | 2 +- bin/shakapacker-dev-server | 6 + config/assets.rb | 4 +- config/locales/ca.yml | 2 - config/locales/en.yml | 70 +- ...d_values_to_decidim_templates_templates.rb | 8 - .../20230404104741_migrate_templatable.rb | 13 - decidim-reporting_proposals.gemspec | 3 +- features/templates1.png | Bin 116563 -> 0 bytes features/templates2.png | Bin 87035 -> 0 bytes .../reporting_proposals/admin_engine.rb | 4 + lib/decidim/reporting_proposals/component.rb | 52 +- lib/decidim/reporting_proposals/engine.rb | 30 +- .../reporting_proposals/test/factories.rb | 14 +- lib/decidim/reporting_proposals/version.rb | 7 +- lib/tasks/reporting_proposals_upgrade.rake | 5 + package-lock.json | 9173 ++++++++--------- package.json | 19 +- .../admin/edit_note_modal_cell_spec.rb | 4 +- spec/commands/admin/create_category_spec.rb | 8 +- spec/commands/admin/create_result_spec.rb | 36 +- spec/commands/admin/update_category_spec.rb | 12 +- .../admin/update_importer_results_spec.rb | 34 +- .../admin/update_proposal_note_spec.rb | 8 +- spec/commands/admin/update_proposal_spec.rb | 4 +- spec/commands/admin/update_result_spec.rb | 34 +- spec/commands/create_report_spec.rb | 10 +- .../create_reporting_proposal_spec.rb | 18 +- .../decidim/admin/hide_resource_spec.rb | 12 +- .../copy_proposal_answer_template_spec.rb | 40 - .../templates/admin/destroy_template_spec.rb | 20 - .../admin/proposals_controller_spec.rb | 42 +- .../proposals/proposals_controller_spec.rb | 74 +- .../geolocation_controller_spec.rb | 18 +- spec/controllers/proposals_controller_spec.rb | 10 +- .../proposals/publish_proposal_event_spec.rb | 14 +- spec/forms/admin/category_form_spec.rb | 10 +- spec/forms/answer_form_spec.rb | 16 +- spec/forms/close_meeting_form_spec.rb | 2 +- .../proposal_answer_template_form_spec.rb | 63 - spec/forms/project_form_spec.rb | 26 +- spec/forms/proposal_form_spec.rb | 44 +- .../assign_proposal_valuators_job_spec.rb | 26 +- spec/lib/overrides_spec.rb | 80 +- spec/mailers/decidim/reported_mailer_spec.rb | 26 +- .../admin/hidden_resource_mailer_spec.rb | 4 +- ...otification_answer_proposal_mailer_spec.rb | 10 +- .../admin/proposals_valuator_mailer_spec.rb | 10 +- ...tification_publish_proposal_mailer_spec.rb | 10 +- spec/models/category_valuator_spec.rb | 8 +- spec/models/valuator_components_spec.rb | 8 +- spec/permissions/admin/permissions_spec.rb | 30 +- spec/permissions/permissions_spec.rb | 8 +- .../templates/admin/extra_permissions_spec.rb | 47 - .../resource_locator_presenter_spec.rb | 4 +- spec/queries/nearby_proposals_spec.rb | 18 +- spec/system/additional_buttons_spec.rb | 24 +- .../system/admin/add_proposals_photos_spec.rb | 44 +- .../admin_manages_answer_templates_spec.rb | 117 - ...ages_reporting_proposals_templates_spec.rb | 117 + .../admin/answer_form_without_status_spec.rb | 36 - ...gn_valuators_after_create_proposal_spec.rb | 45 +- ...gn_valuators_after_update_category_spec.rb | 26 +- spec/system/admin/assign_valuators_spec.rb | 52 +- .../create_proposal_with_valuators_spec.rb | 45 +- spec/system/admin/edit_proposal_notes_spec.rb | 82 +- ...nage_reporting_proposals_component_spec.rb | 16 +- .../admin/normal_proposal_overrides_spec.rb | 26 +- spec/system/admin/overdue_proposal_spec.rb | 6 +- .../process_admin_manages_proposal_spec.rb | 43 - .../admin/proposal_note_with_links_spec.rb | 28 - .../admin/report_and_hide_proposals_spec.rb | 57 +- spec/system/admin/show_valuators_name_spec.rb | 28 +- .../admin/time_elapsed_to_answer_spec.rb | 10 +- .../valuator_answers_with_templates_spec.rb | 58 +- spec/system/compare_proposals_spec.rb | 30 +- .../admin_manages_proposal_valuators_spec.rb | 62 +- .../admin/valuator_manages_proposals_spec.rb | 51 +- ..._manages_proposal_answer_templates_spec.rb | 219 - ...in_manages_questionnaire_templates_spec.rb | 297 - spec/system/device_camera_spec.rb | 57 +- spec/system/device_location_spec.rb | 21 +- .../proposals_resource_manifests_spec.rb | 223 +- spec/system/reporting_proposals_spec.rb | 51 +- .../admin_proposals_overdue_examples.rb | 16 +- .../system/shared/proposals_steps_examples.rb | 144 +- spec/types/reporting_proposals_type_spec.rb | 2 +- 208 files changed, 6442 insertions(+), 8740 deletions(-) create mode 100644 app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb delete mode 100644 app/commands/concerns/decidim/admin/hide_resource_override.rb rename app/commands/concerns/decidim/{proposals => reporting_proposals}/admin/answer_proposal_override.rb (83%) rename app/commands/concerns/decidim/{proposals => reporting_proposals}/admin/assign_proposals_to_valuator_override.rb (95%) create mode 100644 app/commands/concerns/decidim/reporting_proposals/admin/update_proposal_answer_template_override.rb rename app/commands/concerns/decidim/{proposals => reporting_proposals}/publish_proposal_override.rb (92%) delete mode 100644 app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb delete mode 100644 app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb create mode 100644 app/commands/decidim/reporting_proposals/update_reporting_proposal.rb delete mode 100644 app/commands/decidim/templates/admin/copy_proposal_answer_template.rb delete mode 100644 app/commands/decidim/templates/admin/create_proposal_answer_template.rb delete mode 100644 app/commands/decidim/templates/admin/update_proposal_answer_template.rb rename app/controllers/concerns/decidim/{proposals => reporting_proposals}/admin/valuation_assignments_controller_override.rb (82%) delete mode 100644 app/controllers/concerns/decidim/templates/admin/application_controller_override.rb delete mode 100644 app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb rename app/events/concerns/decidim/{proposals => reporting_proposals}/publish_proposal_event_override.rb (97%) delete mode 100644 app/forms/decidim/templates/admin/proposal_answer_template_form.rb delete mode 100644 app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb delete mode 100644 app/mailers/concerns/decidim/reported_mailer_override.rb create mode 100644 app/mailers/concerns/decidim/reporting_proposals/admin/hidden_resource_mailer.rb rename app/mailers/concerns/decidim/{proposals => reporting_proposals}/admin/notification_answer_proposal_mailer.rb (96%) rename app/mailers/concerns/decidim/{proposals => reporting_proposals}/admin/proposals_valuator_mailer.rb (82%) rename app/mailers/concerns/decidim/{proposals => reporting_proposals}/notification_publish_proposal_mailer.rb (95%) create mode 100644 app/mailers/concerns/decidim/reporting_proposals/reported_mailer_override.rb delete mode 100644 app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface delete mode 100644 app/overrides/decidim/proposals/proposals/_edit_form_fields/replace_add_photos.html.erb.deface delete mode 100644 app/overrides/decidim/proposals/proposals/_proposal_similar/add_distance_badge.html.erb.deface create mode 100644 app/overrides/decidim/proposals/proposals/_wizard_header/add_description.html.erb.deface create mode 100644 app/overrides/decidim/proposals/proposals/compare/add_css.html.erb.deface create mode 100644 app/overrides/decidim/proposals/proposals/compare/add_distance_badge.html.erb.deface delete mode 100644 app/overrides/decidim/proposals/proposals/edit_draft/add_css.html.erb.deface delete mode 100644 app/overrides/decidim/proposals/proposals/edit_draft/add_user_group.html.erb.deface create mode 100644 app/overrides/decidim/proposals/proposals/new/remove_body.html.erb.deface create mode 100644 app/overrides/decidim/proposals/proposals/preview/add_css.html.erb.deface delete mode 100644 app/packs/entrypoints/decidim_reporting_proposals_js_validations.js delete mode 100644 app/packs/entrypoints/decidim_templates_admin.js delete mode 100644 app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js delete mode 100644 app/permissions/decidim/templates/admin/extra_permissions.rb create mode 100644 app/permissions/decidim/templates/admin/permissions.rb create mode 100644 app/presenters/concerns/decidim/reporting_proposals/resource_locator_presenter_override.rb delete mode 100644 app/presenters/concerns/decidim/resource_locator_presenter_override.rb create mode 100644 app/resources/concerns/decidim/reporting_proposals/resource_manifest_override.rb delete mode 100644 app/resources/concerns/decidim/resource_manifest_override.rb delete mode 100644 app/views/decidim/proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb rename app/views/decidim/{ => reporting_proposals}/admin/hidden_resource_mailer/notify_mail.html.erb (100%) rename app/views/decidim/{proposals => reporting_proposals}/admin/notification_answer_proposal_mailer/notify_proposal_author.html.erb (100%) create mode 100644 app/views/decidim/reporting_proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb rename app/views/decidim/{proposals => reporting_proposals}/notification_publish_proposal_mailer/notify_proposal_author.html.erb (100%) create mode 100644 app/views/decidim/reporting_proposals/proposals/_camera_button.html.erb delete mode 100644 app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb delete mode 100644 app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb delete mode 100644 app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb delete mode 100644 app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb delete mode 100644 app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb create mode 100755 bin/dev rename bin/{webpack-dev-server => shakapacker} (72%) create mode 100755 bin/shakapacker-dev-server delete mode 100644 db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb delete mode 100644 db/migrate/20230404104741_migrate_templatable.rb delete mode 100644 features/templates1.png delete mode 100644 features/templates2.png create mode 100644 lib/tasks/reporting_proposals_upgrade.rake delete mode 100644 spec/commands/decidim/templates/admin/copy_proposal_answer_template_spec.rb delete mode 100644 spec/commands/decidim/templates/admin/destroy_template_spec.rb delete mode 100644 spec/forms/decidim/templates/admin/proposal_answer_template_form_spec.rb rename spec/jobs/{ => decidim/reporting_proposals}/assign_proposal_valuators_job_spec.rb (85%) rename spec/mailers/decidim/{ => reporting_proposals}/admin/hidden_resource_mailer_spec.rb (92%) rename spec/mailers/decidim/{proposals => reporting_proposals}/admin/notification_answer_proposal_mailer_spec.rb (92%) rename spec/mailers/decidim/{proposals => reporting_proposals}/admin/proposals_valuator_mailer_spec.rb (84%) rename spec/mailers/decidim/{proposals => reporting_proposals}/notification_publish_proposal_mailer_spec.rb (92%) delete mode 100644 spec/permissions/templates/admin/extra_permissions_spec.rb delete mode 100644 spec/system/admin/admin_manages_answer_templates_spec.rb create mode 100644 spec/system/admin/admin_manages_reporting_proposals_templates_spec.rb delete mode 100644 spec/system/admin/answer_form_without_status_spec.rb delete mode 100644 spec/system/admin/process_admin_manages_proposal_spec.rb delete mode 100644 spec/system/admin/proposal_note_with_links_spec.rb delete mode 100644 spec/system/decidim/templates/admin/admin_manages_proposal_answer_templates_spec.rb delete mode 100644 spec/system/decidim/templates/admin/admin_manages_questionnaire_templates_spec.rb diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 44b2a550..fc89e8f9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,8 +8,8 @@ on: env: CI: "true" - RUBY_VERSION: 3.0.6 - NODE_VERSION: 16.9.1 + RUBY_VERSION: 3.1.1 + NODE_VERSION: 18.17.1 jobs: lint-report: @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 9210c88f..51be6408 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -9,8 +9,8 @@ on: env: CI: "true" SIMPLECOV: "true" - RUBY_VERSION: 3.0.6 - NODE_VERSION: 16.9.1 + RUBY_VERSION: 3.1.1 + NODE_VERSION: 18.17.1 RAILS_ENV: test DATABASE_USERNAME: postgres DATABASE_PASSWORD: postgres @@ -34,7 +34,7 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 @@ -98,6 +98,20 @@ jobs: with: fetch-depth: 1 + - uses: nanasess/setup-chromedriver@v2 + with: + chromedriver-version: 119.0.6045.105 + + - name: List Chrome + run: apt list --installed | grep chrome + + - name: Remove Chrome + run: sudo apt remove google-chrome-stable + + - uses: browser-actions/setup-chrome@v1 + with: + chrome-version: 119.0.6045.105 + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.RUBY_VERSION }} diff --git a/.github/workflows/test_unit.yml b/.github/workflows/test_unit.yml index 23fa0daf..c323c4a0 100644 --- a/.github/workflows/test_unit.yml +++ b/.github/workflows/test_unit.yml @@ -9,8 +9,8 @@ on: env: CI: "true" SIMPLECOV: "true" - RUBY_VERSION: 3.0.6 - NODE_VERSION: 16.9.1 + RUBY_VERSION: 3.1.1 + NODE_VERSION: 18.17.1 jobs: test-unit: @@ -34,10 +34,24 @@ jobs: DATABASE_HOST: localhost steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 1 + - uses: nanasess/setup-chromedriver@v2 + with: + chromedriver-version: 119.0.6045.105 + + - name: List Chrome + run: apt list --installed | grep chrome + + - name: Remove Chrome + run: sudo apt remove google-chrome-stable + + - uses: browser-actions/setup-chrome@v1 + with: + chrome-version: 119.0.6045.105 + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.RUBY_VERSION }} @@ -52,4 +66,4 @@ jobs: - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 with: - token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index b30bf780..743af584 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ development_app *.gem node_modules/ npm_debug.log +tailwind.config.js +.rubocop-http* diff --git a/.rubocop.yml b/.rubocop.yml index 0975cd3a..d73ecacc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,2 @@ inherit_from: - - .rubocop_ruby.yml - - .rubocop_rails.yml - - .rubocop-disabled.yml + - https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml diff --git a/.rubocop_ruby.yml b/.rubocop_ruby.yml index 657b0234..f8e2d5cd 100644 --- a/.rubocop_ruby.yml +++ b/.rubocop_ruby.yml @@ -70,7 +70,7 @@ AllCops: # If a value is specified for TargetRubyVersion then it is used. # Else if .ruby-version exists and it contains an MRI version it is used. # Otherwise we fallback to the oldest officially supported Ruby version (2.0). - TargetRubyVersion: 3.0 + TargetRubyVersion: 3.1 # RSpec: # Patterns: @@ -1765,4 +1765,3 @@ Faker/DeprecatedArguments: questions: - number - supplemental - diff --git a/.ruby-version b/.ruby-version index 8ffc1ad6..94ff29cc 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.6 \ No newline at end of file +3.1.1 diff --git a/Gemfile b/Gemfile index 2c12ba07..6e48294c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ gem "decidim", DECIDIM_VERSION gem "decidim-reporting_proposals", path: "." gem "bootsnap", "~> 1.7" -gem "faker", "~> 2.14" +gem "faker", "~> 3.2" +gem "puma", ">= 6.3.1" gem "rspec", "~> 3.0" group :development, :test do @@ -28,11 +29,11 @@ group :development, :test do end group :development do - gem "letter_opener_web", "~> 2.0" + gem "letter_opener_web" gem "listen", "~> 3.1" - gem "rubocop-faker" - gem "spring" - gem "spring-watcher-listen" + gem "rubocop-faker", "~> 1.1" + gem "spring", "~> 2.0" + gem "spring-watcher-listen", "~> 2.0" gem "web-console" end diff --git a/Gemfile.lock b/Gemfile.lock index 171c9a32..e2c15689 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,50 @@ PATH remote: . specs: - decidim-reporting_proposals (0.5.2) - decidim-admin (>= 0.27.0, < 0.28) - decidim-core (>= 0.27.0, < 0.28) - decidim-participatory_processes (>= 0.27.0, < 0.28) - decidim-proposals (>= 0.27.0, < 0.28) - decidim-templates (>= 0.27.0, < 0.28) + decidim-reporting_proposals (0.6.0) + decidim-admin (>= 0.28, < 0.29) + decidim-core (>= 0.28, < 0.29) + decidim-participatory_processes (>= 0.28, < 0.29) + decidim-proposals (>= 0.28, < 0.29) deface (>= 1.9) GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailer (6.1.7.7) + actionpack (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.7) + actionview (= 6.1.7.7) + activesupport (= 6.1.7.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (6.1.7.7) + actionpack (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.7) + activesupport (= 6.1.7.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -53,69 +52,62 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + activejob (6.1.7.7) + activesupport (= 6.1.7.7) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (6.1.7.7) + activesupport (= 6.1.7.7) + activerecord (6.1.7.7) + activemodel (= 6.1.7.7) + activesupport (= 6.1.7.7) + activestorage (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activesupport (= 6.1.7.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - acts_as_list (0.9.19) - activerecord (>= 3.0) - addressable (2.8.5) + acts_as_list (1.1.0) + activerecord (>= 4.2) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - axe-core-api (4.7.0) - dumb_delegator - virtus - axe-core-rspec (4.1.0) - axe-core-api - dumb_delegator - virtus - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) + base64 (0.2.0) batch-loader (1.5.0) - bcrypt (3.1.19) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + bcrypt (3.1.20) + better_html (2.1.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bigdecimal (3.1.7) bindex (0.8.1) - bootsnap (1.16.0) + bootsnap (1.18.3) msgpack (~> 1.2) browser (2.7.1) builder (3.2.4) + bullet (7.1.6) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.4) + carrierwave (2.2.6) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -135,101 +127,90 @@ GEM actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chef-utils (18.2.7) - concurrent-ruby - childprocess (4.1.0) - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) + childprocess (5.0.0) + codecov (0.2.12) + json + simplecov commonmarker (0.23.10) - concurrent-ruby (1.2.2) - crack (0.4.5) + concurrent-ruby (1.2.3) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.16.0) + css_parser (1.17.1) addressable - date (3.3.3) + date (3.3.4) date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) - db-query-matchers (0.10.0) - activesupport (>= 4.0, < 7) - rspec (~> 3.0) - decidim (0.27.4) - decidim-accountability (= 0.27.4) - decidim-admin (= 0.27.4) - decidim-api (= 0.27.4) - decidim-assemblies (= 0.27.4) - decidim-blogs (= 0.27.4) - decidim-budgets (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-debates (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-generators (= 0.27.4) - decidim-meetings (= 0.27.4) - decidim-pages (= 0.27.4) - decidim-participatory_processes (= 0.27.4) - decidim-proposals (= 0.27.4) - decidim-sortitions (= 0.27.4) - decidim-surveys (= 0.27.4) - decidim-system (= 0.27.4) - decidim-templates (= 0.27.4) - decidim-verifications (= 0.27.4) - decidim-accountability (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-admin (0.27.4) + decidim (0.28.0) + decidim-accountability (= 0.28.0) + decidim-admin (= 0.28.0) + decidim-api (= 0.28.0) + decidim-assemblies (= 0.28.0) + decidim-blogs (= 0.28.0) + decidim-budgets (= 0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-debates (= 0.28.0) + decidim-forms (= 0.28.0) + decidim-generators (= 0.28.0) + decidim-meetings (= 0.28.0) + decidim-pages (= 0.28.0) + decidim-participatory_processes (= 0.28.0) + decidim-proposals (= 0.28.0) + decidim-sortitions (= 0.28.0) + decidim-surveys (= 0.28.0) + decidim-system (= 0.28.0) + decidim-templates (= 0.28.0) + decidim-verifications (= 0.28.0) + decidim-accountability (0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-admin (0.28.0) active_link_to (~> 1.0) - decidim-core (= 0.27.4) + decidim-core (= 0.28.0) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-api (0.27.4) - graphql (~> 1.12, < 1.13) - graphql-docs (~> 2.1.0) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-api (0.28.0) + commonmarker (~> 0.23.0, >= 0.23.9) + graphql (~> 2.0.0) + graphql-docs (~> 3.0.1) rack-cors (~> 1.0) - decidim-assemblies (0.27.4) - decidim-core (= 0.27.4) - decidim-blogs (0.27.4) - decidim-admin (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-budgets (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-bulletin_board (0.23.0) + decidim-assemblies (0.28.0) + decidim-core (= 0.28.0) + decidim-blogs (0.28.0) + decidim-admin (= 0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-budgets (0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-bulletin_board (0.24.4) byebug (~> 11.0) graphlient (~> 0.5.0) - jwt (~> 2.2.2) - rails (~> 6.0, >= 5.0.0) + jwt (~> 2.5.0) + rails (>= 5.0.0, < 7.1) wisper (~> 2.0.0) - decidim-comments (0.27.4) - decidim-core (= 0.27.4) + decidim-comments (0.28.0) + decidim-core (= 0.28.0) redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.27.4) + decidim-core (0.28.0) active_link_to (~> 1.0) - acts_as_list (~> 0.9) + acts_as_list (~> 1.0) batch-loader (~> 1.2) browser (~> 2.7) - carrierwave (~> 2.2.1) + carrierwave (~> 2.2.5, >= 2.2.5) cells-erb (~> 0.1.0) cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.12.0) - decidim-api (= 0.27.4) + decidim-api (= 0.28.0) devise (~> 4.7) - devise-i18n (~> 1.2) + devise-i18n (~> 1.2, < 1.11.1) diffy (~> 3.3) - doorkeeper (~> 5.1) + doorkeeper (~> 5.6, >= 5.6.6) doorkeeper-i18n (~> 4.0) file_validators (~> 3.0) fog-local (~> 0.6) @@ -238,112 +219,114 @@ GEM hashdiff (>= 0.4.0, < 2.0.0) invisible_captcha (~> 0.12) kaminari (~> 1.2, >= 1.2.1) - loofah (~> 2.19.0) + loofah (~> 2.19, >= 2.19.1) mime-types (>= 1.16, < 4.0) mini_magick (~> 4.9) mustache (~> 1.1.0) + net-smtp (~> 0.3.1) omniauth (~> 2.0) omniauth-facebook (~> 5.0) omniauth-google-oauth2 (~> 1.0) omniauth-rails_csrf_protection (~> 1.0) omniauth-twitter (~> 1.4) paper_trail (~> 12.0) - pg (~> 1.1.4, < 2) + pg (~> 1.4.0, < 2) pg_search (~> 2.2) premailer-rails (~> 1.10) - rack (~> 2.2, >= 2.2.3) + psych (~> 4.0) + rack (~> 2.2, >= 2.2.6.4) rack-attack (~> 6.0) - rails (~> 6.1.0) + rails (~> 6.1.7, >= 6.1.7.4) rails-i18n (~> 6.0) - ransack (~> 2.4.1) + ransack (~> 3.2.1) redis (~> 4.1) request_store (~> 1.5.0) rubyXL (~> 3.4) rubyzip (~> 2.0) seven_zip_ruby (~> 1.3) - social-share-button (~> 1.2, >= 1.2.1) - valid_email2 (~> 2.1) - webpacker (= 6.0.0.rc.5) - webpush (~> 1.1) + shakapacker (~> 7.1.0) + valid_email2 (~> 4.0) + web-push (~> 3.0) wisper (~> 2.0) - decidim-debates (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-dev (0.27.4) - axe-core-rspec (~> 4.1.0) + decidim-debates (0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-dev (0.28.0) + bullet (~> 7.0) byebug (~> 11.0) - capybara (~> 3.24) - db-query-matchers (~> 0.10.0) - decidim (= 0.27.4) - erb_lint (~> 0.0.35) - factory_bot_rails (~> 4.8) - i18n-tasks (~> 0.9.18) - mdl (~> 0.5) - nokogiri (~> 1.13) - parallel_tests (~> 3.7) - puma (~> 5.0) + capybara (~> 3.39) + decidim (= 0.28.0) + erb_lint (~> 0.4.0) + factory_bot_rails (~> 6.2) + faker (~> 3.2) + i18n-tasks (~> 1.0) + nokogiri (~> 1.14, >= 1.14.3) + parallel_tests (~> 4.2) + puma (~> 6.2, >= 6.3.1) rails-controller-testing (~> 1.0) + rspec (~> 3.12) rspec-cells (~> 0.3.7) - rspec-html-matchers (~> 0.9.1) - rspec-rails (~> 4.0) + rspec-html-matchers (~> 0.10) + rspec-rails (~> 6.0) rspec-retry (~> 0.6.2) - rspec_junit_formatter (~> 0.3.0) - rubocop (~> 1.28.0) - rubocop-rails (~> 2.14) - rubocop-rspec (~> 2.10) - selenium-webdriver (~> 4.1.0) - simplecov (~> 0.21.0) + rspec_junit_formatter (~> 0.6.0) + rubocop (~> 1.50.0) + rubocop-faker (~> 1.1) + rubocop-rails (~> 2.19) + rubocop-rspec (~> 2.20) + selenium-webdriver (~> 4.9) + simplecov (~> 0.22.0) simplecov-cobertura (~> 2.1.0) w3c_rspec_validators (~> 0.3.0) - webmock (~> 3.6) + webmock (~> 3.18) wisper-rspec (~> 1.0) - decidim-elections (0.27.4) - decidim-bulletin_board (= 0.23) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-proposals (= 0.27.4) + decidim-elections (0.28.0) + decidim-bulletin_board (~> 0.24.4) + decidim-core (= 0.28.0) + decidim-forms (= 0.28.0) + decidim-proposals (= 0.28.0) rack-attack (~> 6.0) - voting_schemes-dummy (= 0.23) - voting_schemes-electionguard (= 0.23) - decidim-forms (0.27.4) - decidim-core (= 0.27.4) + voting_schemes-dummy (~> 0.24.4) + voting_schemes-electionguard (~> 0.24.4) + decidim-forms (0.28.0) + decidim-core (= 0.28.0) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.27.4) - decidim-core (= 0.27.4) - decidim-meetings (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) + decidim-generators (0.28.0) + decidim-core (= 0.28.0) + decidim-meetings (0.28.0) + decidim-core (= 0.28.0) + decidim-forms (= 0.28.0) icalendar (~> 2.5) - decidim-pages (0.27.4) - decidim-core (= 0.27.4) - decidim-participatory_processes (0.27.4) - decidim-core (= 0.27.4) - decidim-proposals (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - doc2text (~> 0.4.5) + decidim-pages (0.28.0) + decidim-core (= 0.28.0) + decidim-participatory_processes (0.28.0) + decidim-core (= 0.28.0) + decidim-proposals (0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + doc2text (~> 0.4.6) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.27.4) - decidim-admin (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-proposals (= 0.27.4) - decidim-surveys (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-templates (= 0.27.4) - decidim-system (0.27.4) + decidim-sortitions (0.28.0) + decidim-admin (= 0.28.0) + decidim-comments (= 0.28.0) + decidim-core (= 0.28.0) + decidim-proposals (= 0.28.0) + decidim-surveys (0.28.0) + decidim-core (= 0.28.0) + decidim-forms (= 0.28.0) + decidim-templates (= 0.28.0) + decidim-system (0.28.0) active_link_to (~> 1.0) - decidim-core (= 0.27.4) + decidim-core (= 0.28.0) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-templates (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-verifications (0.27.4) - decidim-core (= 0.27.4) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-templates (0.28.0) + decidim-core (= 0.28.0) + decidim-forms (= 0.28.0) + decidim-verifications (0.28.0) + decidim-core (= 0.28.0) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -353,9 +336,7 @@ GEM polyglot railties (>= 5.2) rainbow (>= 2.1.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.2) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -363,23 +344,21 @@ GEM warden (~> 1.2.3) devise-i18n (1.11.0) devise (>= 4.9.0) - devise_invitable (2.0.8) + devise_invitable (2.0.9) actionmailer (>= 5.0) devise (>= 4.6) - diff-lcs (1.5.0) + diff-lcs (1.5.1) diffy (3.4.2) - doc2text (0.4.6) - nokogiri (>= 1.13.2, < 1.15.0) + doc2text (0.4.7) + nokogiri (>= 1.13.2, < 1.17.0) rubyzip (~> 2.3.0) docile (1.4.0) - doorkeeper (5.6.6) + doorkeeper (5.6.9) railties (>= 5) doorkeeper-i18n (4.0.1) - dumb_delegator (1.0.0) - erb_lint (0.0.37) + erb_lint (0.4.0) activesupport - better_html (~> 1.0.7) - html_tokenizer + better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow rubocop @@ -387,17 +366,16 @@ GEM erbse (0.1.4) temple erubi (1.12.0) - escape_utils (1.3.0) - excon (0.103.0) - execjs (2.9.0) + escape_utils (1.2.2) + excon (0.110.0) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) - factory_bot (4.11.1) - activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) - railties (>= 3.0.0) - faker (2.23.0) + factory_bot (6.4.6) + activesupport (>= 5.0.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) + railties (>= 5.0.0) + faker (3.3.1) i18n (>= 1.8.11, < 2) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -424,11 +402,11 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.15.5) + ffi (1.16.3) file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-core (2.3.0) + fog-core (2.4.0) builder excon (~> 0.71) formatador (>= 0.2, < 2.0) @@ -449,50 +427,49 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.12.24) - graphql-client (0.18.0) + graphql (2.0.29) + base64 + graphql-client (0.22.0) activesupport (>= 3.0) - graphql - graphql-docs (2.1.0) + graphql (>= 1.13.0) + graphql-docs (3.0.1) commonmarker (~> 0.16) - escape_utils (~> 1.2) + escape_utils (~> 1.2.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) - graphql (~> 1.12) + graphql (~> 2.0) html-pipeline (~> 2.9) sass (~> 3.4) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) - highline (2.1.0) - hkdf (0.3.0) + highline (3.0.1) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - html_tokenizer (0.0.7) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.37) + i18n-tasks (1.0.13) activesupport (>= 4.0.2) ast (>= 2.1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n - parser (>= 2.2.3.0) + parser (>= 3.2.2.1) rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.9.0) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) - ice_nine (0.11.2) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) - json (2.6.3) - jwt (2.2.3) + json (2.7.2) + jwt (2.5.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -505,65 +482,55 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - launchy (2.5.2) + launchy (3.0.0) addressable (~> 2.8) - letter_opener (1.8.1) - launchy (>= 2.2, < 3) + childprocess (~> 5.0) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) letter_opener_web (2.0.0) actionmailer (>= 5.2) letter_opener (~> 1.7) railties (>= 5.2) rexml - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - mdl (0.12.0) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.1) - mixlib-cli (~> 2.1, >= 2.1.1) - mixlib-config (>= 2.2.1, < 4) - mixlib-shellout method_source (1.0.0) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) + mime-types-data (3.2024.0305) mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.20.0) - mixlib-cli (2.1.8) - mixlib-config (3.0.27) - tomlrb - mixlib-shellout (3.2.7) - chef-utils + minitest (5.22.3) msgpack (1.7.2) multi_xml (0.6.0) - multipart-post (2.3.0) + multipart-post (2.4.0) mustache (1.1.1) - net-imap (0.3.7) + net-imap (0.4.10) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.3.4) net-protocol - nio4r (2.5.9) - nokogiri (1.14.5-x86_64-linux) + nio4r (2.7.1) + nokogiri (1.16.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-linux) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -578,17 +545,17 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - omniauth (2.1.1) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (1.1.1) + omniauth-google-oauth2 (1.1.2) jwt (>= 2.0) - oauth2 (~> 2.0.6) + oauth2 (~> 2.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8.0) + omniauth-oauth2 (~> 1.8) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) @@ -601,22 +568,23 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + openssl (3.2.0) orm_adapter (0.5.0) paper_trail (12.3.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.23.0) - parallel_tests (3.13.0) + parallel (1.24.0) + parallel_tests (4.6.1) parallel - parser (3.2.2.3) + parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.1.4) + pg (1.4.6) pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) polyglot (0.3.5) - premailer (1.21.0) + premailer (1.23.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) @@ -624,35 +592,38 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (5.0.3) - puma (5.6.7) + psych (4.0.6) + stringio + public_suffix (5.0.5) + puma (6.4.2) nio4r (~> 2.0) - racc (1.7.1) - rack (2.2.8) + racc (1.7.3) + rack (2.2.9) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (3.1.0) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (6.1.7.7) + actioncable (= 6.1.7.7) + actionmailbox (= 6.1.7.7) + actionmailer (= 6.1.7.7) + actionpack (= 6.1.7.7) + actiontext (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activemodel (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) bundler (>= 1.15.0) - railties (= 6.1.7.6) + railties (= 6.1.7.7) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -662,91 +633,103 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) - ransack (2.4.2) - activerecord (>= 5.2.4) - activesupport (>= 5.2.4) + rake (13.2.1) + ransack (3.2.1) + activerecord (>= 6.1.5) + activesupport (>= 6.1.5) i18n rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.6.0) redis (4.8.1) - regexp_parser (2.8.1) + regexp_parser (2.9.0) request_store (1.5.1) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-cells (0.3.8) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-cells (0.3.9) cells (>= 4.0.0, < 6.0.0) - rspec-rails (>= 3.0.0, < 6.1.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-rails (>= 3.0.0, < 6.2.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-html-matchers (0.9.4) + rspec-support (~> 3.13.0) + rspec-html-matchers (0.10.0) nokogiri (~> 1) - rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.12.6) + rspec (>= 3.0.0.a) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (4.1.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-support (~> 3.13.0) + rspec-rails (6.1.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.1) - rspec_junit_formatter (0.3.0) + rspec-support (3.13.1) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.28.2) + rubocop (1.50.2) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.17.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) - rubocop-rails (2.15.2) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.29.1) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.3) + rubocop (~> 1.40) ruby-progressbar (1.13.0) - ruby-vips (2.1.4) + ruby-vips (2.2.1) ffi (~> 1.12) ruby2_keywords (0.0.5) - rubyXL (3.4.25) + rubyXL (3.4.26) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) rubyzip (2.3.2) @@ -755,13 +738,19 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - selenium-webdriver (4.1.0) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.19.0) + base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) semantic_range (3.0.0) seven_zip_ruby (1.3.0) - simplecov (0.21.2) + shakapacker (7.1.0) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -774,12 +763,10 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - social-share-button (1.2.4) - coffee-rails - spring (4.1.1) - spring-watcher-listen (2.1.0) + spring (2.1.1) + spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) - spring (>= 4) + spring (>= 1.2, < 3.0) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -788,29 +775,25 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) ssrf_filter (1.1.2) - temple (0.10.2) + stringio (3.1.0) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) - thread_safe (0.3.6) + thor (1.3.1) tilt (2.3.0) - timeout (0.4.0) - tomlrb (2.0.3) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.4.2) - valid_email2 (2.3.1) + unicode-display_width (2.5.0) + uniform_notifier (1.16.0) + valid_email2 (4.0.6) activemodel (>= 3.2) mail (~> 2.5) - version_gem (1.1.3) - virtus (2.0.0) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - voting_schemes-dummy (0.23.0) + version_gem (1.1.4) + voting_schemes-dummy (0.24.4) rails (>= 5.0.0) - voting_schemes-electionguard (0.23.0) + voting_schemes-electionguard (0.24.4) rails (>= 5.0.0) w3c_rspec_validators (0.3.0) rails @@ -827,53 +810,52 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.19.1) + web-push (3.0.1) + jwt (~> 2.0) + openssl (~> 3.0) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (6.0.0.rc.5) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - webpush (1.1.0) - hkdf (~> 0.2) - jwt (~> 2.0) + websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (2.7.0) + wicked_pdf (2.8.0) activesupport wisper (2.0.1) wisper-rspec (1.1.0) wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.11) + zeitwerk (2.6.13) PLATFORMS + arm64-darwin-23 + x86_64-darwin-23 x86_64-linux DEPENDENCIES bootsnap (~> 1.7) byebug (~> 11.0) codecov - decidim (= 0.27.4) - decidim-dev (= 0.27.4) - decidim-elections (= 0.27.4) + decidim (= 0.28) + decidim-dev (= 0.28) + decidim-elections (= 0.28) decidim-reporting_proposals! - decidim-templates (= 0.27.4) - faker (~> 2.14) - letter_opener_web (~> 2.0) + decidim-templates (= 0.28) + faker (~> 3.2) + letter_opener_web listen (~> 3.1) + puma (>= 6.3.1) rspec (~> 3.0) - rubocop-faker - spring - spring-watcher-listen + rubocop-faker (~> 1.1) + spring (~> 2.0) + spring-watcher-listen (~> 2.0) web-console RUBY VERSION - ruby 3.0.6p216 + ruby 3.1.1p18 BUNDLED WITH - 2.3.20 + 2.4.22 diff --git a/README.md b/README.md index 64fb0392..5bb6b953 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ And then execute (do also this on upgrades): ``` bundle -bundle exec rails decidim_reporting_proposals:install:migrations +bin/rails decidim:upgrade bin/rails db:migrate ``` @@ -52,12 +52,21 @@ bin/rails db:migrate > > Alternatively, use any other ENV var to set up the `config.deface.enabled` to `false` during the precompilation phase. +> **EXPERTS ONLY** +> +> Under the hood, when running `bundle exec rails decidim:upgrade` the `decidim-reporting_proposals` gem will run the following (that can also be run manually if you consider): +> +> ```bash +> bin/rails decidim_reporting_proposals:install:migrations +> ``` + Depending on your Decidim version, you can choose the corresponding version to ensure compatibility: | Version | Compatible Decidim versions | -|---|---| -| 0.5.x | 0.27.x | -| 0.4.x | 0.26.x | +|---------|-----------------------------| +| 0.6.x | 0.28.x | +| 0.5.x | 0.27.x | +| 0.4.x | 0.26.x | ## Usage @@ -88,10 +97,6 @@ This module provides the following features: 7. **Hide proposals without reporting**: Administrators can hide proposals directly, without using the reporting process. Also, authors who's content has been hidden receive a notification. -8. **Proposal answers templates**: Administrators can create templates for the answers to proposals. This is useful to provide a standard answer to proposals that are similar. This feature requires to enable the `decidim-templates` official module. - ![Templates for proposals answers](features/templates1.png) - ![Applying a template](features/templates2.png) - ### Customization Almost all the features of this module can be customized/disabled through an initializer. @@ -119,7 +124,7 @@ Decidim::ReportingProposals.configure do |config| config.show_my_location_button = [:proposals, :meetings, :reporting_proposals] # Public Setting that adds a button next to the "add image" input[type=file] to open the camera directly - config.use_camera_button = [:proposals, :reporting_proposals] + config.use_camera_button = true # Public setting to prevent valuators or admins to modify the photos attached to a proposal # otherwise can be configured at the component level diff --git a/Rakefile b/Rakefile index cc83b620..128c3677 100644 --- a/Rakefile +++ b/Rakefile @@ -3,8 +3,6 @@ require "decidim/dev/common_rake" def install_module(path) - # maintain until https://github.com/decidim/decidim/commit/51b81b37004708ab72e70993fef4634eef18ee6c is in the decidim version used - FileUtils.cp("babel.config.json", "#{path}/babel.config.json") Dir.chdir(path) do system("bundle exec rake decidim_reporting_proposals:install:migrations") system("bundle exec rake db:migrate") diff --git a/app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb b/app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb new file mode 100644 index 00000000..891b37f5 --- /dev/null +++ b/app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +module Decidim + module ReportingProposals + # Exposes the proposal resource so users can view and create them. + module LinkedResourcesForCellOverride + extend ActiveSupport::Concern + + included do + private + + def linked_resources + @linked_resources ||= begin + query = resource.linked_resources(type, link_name) + query = query.or(resource.linked_resources(:reporting_proposals, link_name)) if type == :proposals + + query.group_by { |linked_resource| linked_resource.class.name } + end + end + end + end + end +end diff --git a/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb b/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb index c8d096e8..e33bf1fb 100644 --- a/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb +++ b/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb @@ -1,20 +1,23 @@ -