-
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb index fe3bf57a8fcf5..8461708195b5c 100644 --- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb +++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb @@ -1,7 +1,6 @@
- <% categories = meetings.map(&:category).uniq %>
+ <% taxonomies = meetings.map(&:taxonomies).uniq %>
<% seed = SecureRandom.hex(3).to_s %>
- <% if categories.present? %>
-
diff --git a/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb b/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
index 22b013f8900d7..9d027b5f2d97f 100644
--- a/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
@@ -9,6 +9,10 @@
<% end %>
+
+
-
- <% categories.each do |category| %>
+ <% if taxonomies.present? %>
+
-
- - <%= category.present? ? translated_attribute(category.name) : "other" %> ++ <%= taxonomy.first.present? ? translated_attribute(taxonomy.first.name) : t(".other_category") %><% end %> <% end %> - <% meetings.group_by(&:category).each do |categories_block| %> -- <% categories_block.last.each do |meeting| %> + <% meetings.group_by(&:taxonomies).each do |taxonomies_block| %> +diff --git a/decidim-core/app/views/layouts/decidim/footer/_main.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb index 7f141154c2605..f43249b094573 100644 --- a/decidim-core/app/views/layouts/decidim/footer/_main.html.erb +++ b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb @@ -14,6 +14,5 @@ - <%= render partial: "layouts/decidim/footer/main_language_chooser" %>+ <% taxonomies_block.last.each do |meeting| %> <%= render partial: "program_meeting", locals: { meeting: } %> <% end %>diff --git a/decidim-conferences/config/locales/ca-IT.yml b/decidim-conferences/config/locales/ca-IT.yml index 6c42a2c109c13..6a6fe10d36622 100644 --- a/decidim-conferences/config/locales/ca-IT.yml +++ b/decidim-conferences/config/locales/ca-IT.yml @@ -442,6 +442,8 @@ ca-IT: no_slots_available: No hi ha places disponibles registration: Inscripció conference_program: + program_item: + other_category: Altre show: program: Programa conference_registration_mailer: diff --git a/decidim-conferences/config/locales/ca.yml b/decidim-conferences/config/locales/ca.yml index 41ceb56f19eaa..d82f4cd582c04 100644 --- a/decidim-conferences/config/locales/ca.yml +++ b/decidim-conferences/config/locales/ca.yml @@ -442,6 +442,8 @@ ca: no_slots_available: No hi ha places disponibles registration: Inscripció conference_program: + program_item: + other_category: Altre show: program: Programa conference_registration_mailer: diff --git a/decidim-conferences/config/locales/en.yml b/decidim-conferences/config/locales/en.yml index 575c80ad18808..10f890ace43f1 100644 --- a/decidim-conferences/config/locales/en.yml +++ b/decidim-conferences/config/locales/en.yml @@ -443,6 +443,8 @@ en: no_slots_available: No slots available registration: Registration conference_program: + program_item: + other_category: Other show: program: Program conference_registration_mailer: @@ -621,6 +623,7 @@ en: open_data: help: conferences: + component_settings: Component settings of the conference space created_at: The date this space was created decidim_scope_id: The scope of the conference description: A long description of the conference diff --git a/decidim-conferences/config/locales/es-MX.yml b/decidim-conferences/config/locales/es-MX.yml index 0a85567f5b84e..bbca649525b0c 100644 --- a/decidim-conferences/config/locales/es-MX.yml +++ b/decidim-conferences/config/locales/es-MX.yml @@ -442,6 +442,8 @@ es-MX: no_slots_available: No hay plazas disponibles registration: Inscripción conference_program: + program_item: + other_category: Otro show: program: Programa conference_registration_mailer: diff --git a/decidim-conferences/config/locales/es-PY.yml b/decidim-conferences/config/locales/es-PY.yml index c2c719fc803b6..600d5d4900dfb 100644 --- a/decidim-conferences/config/locales/es-PY.yml +++ b/decidim-conferences/config/locales/es-PY.yml @@ -442,6 +442,8 @@ es-PY: no_slots_available: No hay espacios disponibles registration: Registro conference_program: + program_item: + other_category: Otro show: program: Programa conference_registration_mailer: diff --git a/decidim-conferences/config/locales/es.yml b/decidim-conferences/config/locales/es.yml index db8d91d038e95..8a45c03aa3e6a 100644 --- a/decidim-conferences/config/locales/es.yml +++ b/decidim-conferences/config/locales/es.yml @@ -442,6 +442,8 @@ es: no_slots_available: No hay plazas disponibles registration: Inscripción conference_program: + program_item: + other_category: Otro show: program: Programa conference_registration_mailer: diff --git a/decidim-conferences/config/locales/eu.yml b/decidim-conferences/config/locales/eu.yml index 9d5d522afa6fd..65fbfde7a97b8 100644 --- a/decidim-conferences/config/locales/eu.yml +++ b/decidim-conferences/config/locales/eu.yml @@ -442,6 +442,8 @@ eu: no_slots_available: Ez dago plazarik registration: Izen-ematea conference_program: + program_item: + other_category: Beste bat show: program: Egitaraua conference_registration_mailer: diff --git a/decidim-conferences/config/locales/fr-CA.yml b/decidim-conferences/config/locales/fr-CA.yml index d1aa62e09adba..454e86e1740ce 100644 --- a/decidim-conferences/config/locales/fr-CA.yml +++ b/decidim-conferences/config/locales/fr-CA.yml @@ -437,6 +437,8 @@ fr-CA: no_slots_available: Il ne reste plus de place registration: Inscription conference_program: + program_item: + other_category: Autre show: program: Programme conference_registration_mailer: diff --git a/decidim-conferences/config/locales/fr.yml b/decidim-conferences/config/locales/fr.yml index 5b6551ee25e3c..3c30205baa92d 100644 --- a/decidim-conferences/config/locales/fr.yml +++ b/decidim-conferences/config/locales/fr.yml @@ -437,6 +437,8 @@ fr: no_slots_available: Il ne reste plus de place registration: Inscription conference_program: + program_item: + other_category: Autre show: program: Programme conference_registration_mailer: diff --git a/decidim-conferences/config/locales/ja.yml b/decidim-conferences/config/locales/ja.yml index 4d35b6f3d1592..64b14a53698ec 100644 --- a/decidim-conferences/config/locales/ja.yml +++ b/decidim-conferences/config/locales/ja.yml @@ -438,6 +438,8 @@ ja: no_slots_available: 利用可能なスロットがありません registration: 登録 conference_program: + program_item: + other_category: その他 show: program: プログラム conference_registration_mailer: diff --git a/decidim-conferences/config/locales/sv.yml b/decidim-conferences/config/locales/sv.yml index c443a4b285323..3a54afab192a6 100644 --- a/decidim-conferences/config/locales/sv.yml +++ b/decidim-conferences/config/locales/sv.yml @@ -427,6 +427,8 @@ sv: no_slots_available: Inga platser tillgängliga registration: Registrering conference_program: + program_item: + other_category: Övrigt show: program: Program conference_registration_mailer: diff --git a/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb b/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb new file mode 100644 index 0000000000000..a920cc33a1df1 --- /dev/null +++ b/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromConferencesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_conferences, :hero_image, :string + remove_column :decidim_conferences, :banner_image, :string + remove_column :decidim_conferences, :main_logo, :string + remove_column :decidim_conferences, :signature, :string + + remove_column :decidim_conference_speakers, :avatar, :string + remove_column :decidim_conferences_partners, :logo, :string + end +end diff --git a/decidim-conferences/decidim-conferences.gemspec b/decidim-conferences/decidim-conferences.gemspec index 1eec50811e176..65358fcb4d35a 100644 --- a/decidim-conferences/decidim-conferences.gemspec +++ b/decidim-conferences/decidim-conferences.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-conferences" s.summary = "Decidim conferences module" diff --git a/decidim-conferences/lib/decidim/conferences/participatory_space.rb b/decidim-conferences/lib/decidim/conferences/participatory_space.rb index eed900f6c2319..b2cd8e49fced6 100644 --- a/decidim-conferences/lib/decidim/conferences/participatory_space.rb +++ b/decidim-conferences/lib/decidim/conferences/participatory_space.rb @@ -51,10 +51,8 @@ end participatory_space.exports :conferences do |export| - export.collection do - Decidim::Conference - .public_spaces - .includes(:taxonomies, :attachment_collections) + export.collection do |participatory_space, _user| + Decidim::Conference.public_spaces.includes(:taxonomies, :attachment_collections).where(id: participatory_space) end export.include_in_open_data = true diff --git a/decidim-conferences/spec/system/admin/admin_access_spec.rb b/decidim-conferences/spec/system/admin/admin_access_spec.rb index 5b32a9b146388..9fd1bcd8fec28 100644 --- a/decidim-conferences/spec/system/admin/admin_access_spec.rb +++ b/decidim-conferences/spec/system/admin/admin_access_spec.rb @@ -17,6 +17,9 @@ it_behaves_like "admin participatory space access" it_behaves_like "admin participatory space edit button" + it_behaves_like "admin menu shows only assigned space", + space_name: "Conferences", + other_spaces: %w(Processes Initiatives Assemblies) end context "with participatory space evaluator" do diff --git a/decidim-conferences/spec/system/conference_program_spec.rb b/decidim-conferences/spec/system/conference_program_spec.rb index 6449c9c2e5b65..091136f369ee4 100644 --- a/decidim-conferences/spec/system/conference_program_spec.rb +++ b/decidim-conferences/spec/system/conference_program_spec.rb @@ -39,8 +39,10 @@ context "when there are some conference meetings" do let!(:conference_speakers) { create_list(:conference_speaker, 3, :with_meeting, conference:, meetings_component: component) } let(:meetings) { Decidim::ConferenceMeeting.where(component:) } + let(:taxonomy) { create(:taxonomy, parent: create(:taxonomy, organization:), organization:) } before do + meetings.each { |meeting| meeting.update(taxonomies: [taxonomy]) } visit decidim_conferences.conference_conference_program_path(conference, component) end @@ -79,5 +81,11 @@ end end end + + it "has the taxonomy name" do + within "[data-conference-program-day]" do + expect(page).to have_content(translated_attribute(taxonomy.name)) + end + end end end diff --git a/decidim-conferences/spec/system/conferences_spec.rb b/decidim-conferences/spec/system/conferences_spec.rb index 849d8fffc114e..340f0b6a63987 100644 --- a/decidim-conferences/spec/system/conferences_spec.rb +++ b/decidim-conferences/spec/system/conferences_spec.rb @@ -28,18 +28,6 @@ end end - context "when there are no conferences and accessing from the homepage" do - let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) } - - it "the menu link is not shown" do - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_no_content("Conferences") - end - end - end - context "when the conference does not exist" do it_behaves_like "a 404 page" do let(:target_path) { decidim_conferences.conference_path(99_999_999) } @@ -57,18 +45,6 @@ let(:target_path) { decidim_conferences.conferences_path } end end - - context "and accessing from the homepage" do - let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) } - - it "the menu link is not shown" do - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_no_content("Conferences") - end - end - end end context "when there are some published conferences" do @@ -85,20 +61,6 @@ let(:manifest_name) { :conferences } end - context "and accessing from the homepage" do - let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) } - - it "the menu link is shown" do - visit decidim.root_path - - within "#home__menu" do - click_on "Conferences" - end - - expect(page).to have_current_path decidim_conferences.conferences_path - end - end - it "lists all the highlighted conferences" do within "#highlighted-conferences" do expect(page).to have_content(translated(promoted_conference.title, locale: :en)) diff --git a/decidim-core/app/cells/decidim/content_blocks/global_menu/show.erb b/decidim-core/app/cells/decidim/content_blocks/global_menu/show.erb deleted file mode 100644 index 374b85592098c..0000000000000 --- a/decidim-core/app/cells/decidim/content_blocks/global_menu/show.erb +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/decidim-core/app/cells/decidim/content_blocks/global_menu_cell.rb b/decidim-core/app/cells/decidim/content_blocks/global_menu_cell.rb deleted file mode 100644 index 737a880c6daf4..0000000000000 --- a/decidim-core/app/cells/decidim/content_blocks/global_menu_cell.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module ContentBlocks - class GlobalMenuCell < Decidim::ViewModel - include Decidim::MenuHelper - - private - - def menu_items - @menu_items ||= home_content_block_menu.items - end - - def method_missing(method_name, *_args) - return super if (engine = engine(method_name)).blank? - - engine.routes.url_helpers - end - - def respond_to_missing?(method_name, include_private = false) - method_name.starts_with?("decidim_") || super - end - - def engine(method_name) - return if (manifest = Decidim.find_participatory_space_manifest(method_name.to_s.gsub(/\Adecidim_/, ""))).blank? - - manifest.context(:public).engine - end - - def cache_hash - ["decidim/content_blocks/global_menu", current_organization.cache_key_with_version, I18n.locale].join(Decidim.cache_key_separator) - end - end - end -end diff --git a/decidim-core/app/commands/decidim/destroy_account.rb b/decidim-core/app/commands/decidim/destroy_account.rb index 960283e131dfc..6199f2ffbf6cb 100644 --- a/decidim-core/app/commands/decidim/destroy_account.rb +++ b/decidim-core/app/commands/decidim/destroy_account.rb @@ -19,6 +19,15 @@ def call destroy_user_account! destroy_user_identities destroy_follows + destroy_user_versions + destroy_user_private_exports + destroy_user_access_grants + destroy_user_access_tokens + destroy_user_reminders + destroy_user_notifications + destroy_user_badges + destroy_user_likes + destroy_user_reports destroy_participatory_space_private_user delegate_destroy_to_participatory_spaces end @@ -47,17 +56,53 @@ def destroy_user_account! current_user.save! end + def destroy_user_badges + Decidim::Gamification::BadgeScore.where(user: current_user).find_each(&:destroy) + end + + def destroy_user_reports + Decidim::UserModeration.where(user: current_user).find_each(&:destroy) + end + + def destroy_user_likes + Decidim::Like.where(author: current_user).find_each(&:destroy) + end + def destroy_user_identities - current_user.identities.destroy_all + current_user.identities.find_each(&:destroy) + end + + def destroy_user_versions + current_user.versions.find_each(&:destroy) + end + + def destroy_user_private_exports + current_user.private_exports.find_each(&:destroy) + end + + def destroy_user_access_grants + current_user.access_grants.find_each(&:destroy) + end + + def destroy_user_access_tokens + current_user.access_tokens.find_each(&:destroy) + end + + def destroy_user_reminders + current_user.reminders.find_each(&:destroy) + end + + def destroy_user_notifications + current_user.notifications.find_each(&:destroy) end def destroy_follows - Decidim::Follow.where(followable: current_user).destroy_all - Decidim::Follow.where(user: current_user).destroy_all + Decidim::Follow.where(followable: current_user).find_each(&:destroy) + Decidim::Follow.where(user: current_user).find_each(&:destroy) end def destroy_participatory_space_private_user - Decidim::ParticipatorySpacePrivateUser.where(user: current_user).destroy_all + Decidim::ParticipatorySpacePrivateUser.where(user: current_user).find_each(&:destroy) end def delegate_destroy_to_participatory_spaces diff --git a/decidim-core/app/controllers/decidim/components/base_controller.rb b/decidim-core/app/controllers/decidim/components/base_controller.rb index 159df9b506982..b07f684295f15 100644 --- a/decidim-core/app/controllers/decidim/components/base_controller.rb +++ b/decidim-core/app/controllers/decidim/components/base_controller.rb @@ -67,13 +67,29 @@ def redirect_unless_feature_private end def set_component_breadcrumb_item - context_breadcrumb_items << { + context_breadcrumb_items << add_current_component + context_breadcrumb_items << add_parent_breadcrumb_item + context_breadcrumb_items << add_breadcrumb_item + end + + private + + def add_current_component + { label: current_component.name, url: Decidim::EngineRouter.main_proxy(current_component).root_path, active: false, resource: current_component } end + + def add_parent_breadcrumb_item + {} + end + + def add_breadcrumb_item + {} + end end end end diff --git a/decidim-core/app/helpers/decidim/filters_helper.rb b/decidim-core/app/helpers/decidim/filters_helper.rb index f28338e325f22..9538db0ee2503 100644 --- a/decidim-core/app/helpers/decidim/filters_helper.rb +++ b/decidim-core/app/helpers/decidim/filters_helper.rb @@ -44,8 +44,6 @@ def filter_for_resource(skip_to_id) I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models") when "debates" I18n.t("decidim/debates/debate.other", scope: "activerecord.models") - when "sortitions" - I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models") when "surveys" I18n.t("decidim/surveys/survey.other", scope: "activerecord.models") when "projects" diff --git a/decidim-core/app/jobs/decidim/delete_inactive_participants_job.rb b/decidim-core/app/jobs/decidim/delete_inactive_participants_job.rb index c206ed87c437f..895ee18072bc1 100644 --- a/decidim-core/app/jobs/decidim/delete_inactive_participants_job.rb +++ b/decidim-core/app/jobs/decidim/delete_inactive_participants_job.rb @@ -14,9 +14,9 @@ def perform(organization) private - def enqueue_jobs(users, action, *args) + def enqueue_jobs(users, action, *) users.find_each do |user| - ProcessInactiveParticipantJob.perform_later(user.id, action, *args) + ProcessInactiveParticipantJob.perform_later(user.id, action, *) end end diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js index bcb15703d62a6..c5f012eaea871 100644 --- a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js +++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js @@ -116,10 +116,10 @@ export default class extends Controller { changeStyleOfSelectedElement() { this.element.addEventListener("click", function(event) { event.target.parentNode.parentNode.querySelectorAll("a").forEach((link) => { - link.parentNode.classList.remove("dropdown__item-hovered") + link.parentNode.classList.remove("dropdown__item-opened"); }) - event.target.parentNode.classList.add("dropdown__item-hovered") + event.target.parentNode.classList.add("dropdown__item-opened") }) } } diff --git a/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js b/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js index d21194f9954e7..98e0abb00dac0 100644 --- a/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js +++ b/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js @@ -41,7 +41,7 @@ export default class extends Controller { const menuBarContainer = document.querySelector("#menu-bar-container"); // Calculate margin based on screen size and sticky header height - const marginTop = this.isMaxScreenSize("md") + const marginTop = this.isMaxScreenSize("sm") ? this.element.offsetHeight : 0; diff --git a/decidim-core/app/packs/src/decidim/dropdown_menu.js b/decidim-core/app/packs/src/decidim/dropdown_menu.js index 52267f356acd8..bb3ce7068eb82 100644 --- a/decidim-core/app/packs/src/decidim/dropdown_menu.js +++ b/decidim-core/app/packs/src/decidim/dropdown_menu.js @@ -16,3 +16,64 @@ document.addEventListener("turbo:load", () => { }) } }); + +const setMenuOpacity = (opacity) => { + const content = document.getElementById("content"); + const footer = document.querySelector("footer"); + const menuBar = document.getElementById("menu-bar-container"); + + if (content) { + content.style.opacity = opacity; + } + if (footer) { + footer.style.opacity = opacity; + } + if (menuBar) { + menuBar.style.opacity = opacity; + } +} + +const menuContainer = document.getElementById("dropdown-menu-main-desktop"); +const menuButton = document.getElementById("main-dropdown-summary-desktop"); + +if (menuButton && menuContainer) { + menuButton.addEventListener("click", function () { + const isHidden = menuContainer.getAttribute("aria-hidden") === "true"; + if (!isHidden) { + return; + } + setTimeout(() => { + setMenuOpacity("0.3"); + document.body.style.overflow = "hidden"; + menuContainer.setAttribute("aria-hidden", "false"); + window.scrollTo({ top: 0, behavior: "smooth" }); + }, 50); + }); +} + +if (menuContainer) { + document.addEventListener("keydown", function (event) { + if (event.key === "Escape") { + const isOpen = menuContainer.getAttribute("aria-hidden") === "true"; + + if (isOpen) { + menuContainer.setAttribute("aria-hidden", "true"); + setMenuOpacity("1"); + document.body.style.overflow = "scroll"; + } + } + }) + + document.addEventListener("click", function (event) { + const isOpen = menuContainer.getAttribute("aria-hidden") === "false"; + const closeMenuButton = document.getElementById("main-dropdown-summary-desktop-close"); + const clickedInsideMenu = menuContainer.contains(event.target); + const clickCloseButton = closeMenuButton && closeMenuButton.contains(event.target); + + if (isOpen && (!clickedInsideMenu || clickCloseButton)) { + menuContainer.setAttribute("aria-hidden", "true"); + setMenuOpacity("1"); + document.body.style.overflow = "scroll"; + } + }); +} diff --git a/decidim-core/app/packs/src/decidim/editor/index.js b/decidim-core/app/packs/src/decidim/editor/index.js index 2fd490ee4e3ac..d6feed0da42b1 100644 --- a/decidim-core/app/packs/src/decidim/editor/index.js +++ b/decidim-core/app/packs/src/decidim/editor/index.js @@ -81,7 +81,11 @@ export default function createEditor(container) { const toolbar = createEditorToolbar(editor); container.insertBefore(toolbar, editorContainer); - editor.on("update", () => (input.value = editor.getHTML())); + editor.on("update", () => { + input.value = editor.isEmpty + ? "" + : editor.getHTML(); + }); return editor; } diff --git a/decidim-core/app/packs/stylesheets/decidim/_cards.scss b/decidim-core/app/packs/stylesheets/decidim/_cards.scss index 600c06c1b693a..18d43176030c0 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_cards.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_cards.scss @@ -167,7 +167,8 @@ /* shared styles */ &__highlight-metadata, &__grid-metadata { - @apply mt-auto flex items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:flex-none; + @apply mt-auto flex gap-x-2 items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center + [&>*]:gap-1 first:[&>*]:flex-none; svg { @apply flex-none text-gray fill-current; diff --git a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss index ff8e00402363d..604983164afd0 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss @@ -33,6 +33,32 @@ } } +[data-target="dropdown-menu-main-mobile"] { + &[aria-expanded="false"] > span:last-of-type, + &[aria-expanded="true"] > span:first-of-type { + @apply hidden; + } + + &[aria-expanded="true"] > span:last-of-type, + &[aria-expanded="false"] > span:first-of-type { + @apply block; + } +} + +[data-target="dropdown-menu-main-desktop"] { + > span:first-of-type, + > svg:first-of-type { + @apply block; + } +} + +[data-target="dropdown-menu-main-desktop"] { + > span, + > svg { + @apply hidden md:block; + } +} + [data-target="dropdown-menu-participatory-space"], [data-target="dropdown-menu-order"], [data-target="dropdown-menu-resource"], @@ -64,7 +90,7 @@ } > svg { - @apply w-5 h-6 flex-none text-xs font-normal text-black fill-current; + @apply w-fit h-6 flex-none text-xs font-normal text-black fill-current px-2; } & > ul { @@ -106,12 +132,9 @@ @apply text-gray-2 mr-1; } } - } - &:hover, - &-hovered { - > .dropdown__button { - @apply text-white no-underline; + &:hover { + @apply text-white no-underline !bg-secondary; span { @apply text-white; @@ -122,6 +145,26 @@ } } } + + &-opened { + > .dropdown__button { + @apply text-secondary no-underline; + + span { + @apply text-secondary; + } + + svg { + fill: rgb(var(--secondary-rgb) / var(--tw-bg-opacity)) !important; + } + + &:hover { + svg { + fill: white !important; + } + } + } + } } &__bottom { diff --git a/decidim-core/app/packs/stylesheets/decidim/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/_footer.scss index a190230986dd0..6fcf8478c0e4c 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_footer.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_footer.scss @@ -4,6 +4,11 @@ footer { &__top { @apply hidden lg:flex flex-row gap-8 container py-10; + + .prose a, + .prose strong { + @apply text-white; + } } &__down { diff --git a/decidim-core/app/packs/stylesheets/decidim/_header.scss b/decidim-core/app/packs/stylesheets/decidim/_header.scss index d4625f4990f4e..e37d30f6e0d56 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_header.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_header.scss @@ -35,11 +35,11 @@ header { } #sticky-header-container { - @apply fixed w-full top-0 shadow-lg z-40 bg-white md:relative transition-top duration-300; + @apply fixed w-full top-0 z-40 bg-white md:relative transition-top duration-300; } .main-bar { - @apply container grid grid-cols-4 md:grid-cols-8 lg:grid-cols-12 gap-4 items-center py-5 h-24; + @apply container flex justify-between gap-4 items-center py-5 h-20; &--focus-mode-back-button { @apply h-16 lg:h-24; @@ -50,7 +50,7 @@ header { } &__container { - @apply relative w-full; + @apply relative w-full flex justify-between; } &__logo { @@ -73,11 +73,19 @@ header { } input[type="text"] { - @apply block bg-transparent w-full px-4 py-1.5; + @apply block bg-transparent w-full px-4 py-2 h-full; + + &::placeholder { + @apply text-neutral-500 text-sm ltr:pl-0 rtl:pr-0; + } } button[type="submit"] { - @apply absolute ltr:right-2 rtl:left-2 inset-y-0 text-secondary px-2; + @apply absolute rtl:left-2 ltr:right-2 inset-y-0 text-secondary px-2; + + svg { + @apply fill-neutral-500; + } } } @@ -90,7 +98,7 @@ header { } &__menu-mobile { - @apply lg:hidden flex flex-row-reverse items-center; + @apply lg:hidden flex flex-row-reverse items-center gap-x-3; } &__links-desktop, @@ -102,7 +110,11 @@ header { @apply hidden lg:flex items-center justify-between text-center divide-x-2 divide-gray-3 ml-auto [&>*]:px-4 xl:[&>*]:px-6 first:[&>*]:pl-0 last:[&>*]:pr-0; &__item { - @apply flex flex-col items-center text-secondary px-2 py-1 rounded hover:underline hover:bg-background; + @apply flex items-center gap-x-2 text-secondary px-2 py-1 rounded; + + &:hover { + @apply bg-secondary rounded-[4px] text-white; + } &-wrapper { @apply flex gap-x-4 xl:gap-x-6; @@ -113,17 +125,70 @@ header { } } + &__dropdown { + @apply flex items-end absolute top-0 right-0 z-30 h-screen; + + .menu-bar { + &__main-dropdown { + @apply hidden lg:flex flex-col h-full md:p-8; + + &__left { + @apply w-full; + } + } + + &__dropdown-menu { + @apply w-full; + + li { + @apply py-3 md:py-3.5 border-b border-t-0 last:border-0 border-gray-3 #{!important}; + + a { + @apply no-underline; + } + } + } + } + + #main-dropdown-summary-desktop-close { + @apply self-end; + } + } + + &__trigger { + @apply text-secondary cursor-pointer py-1 px-2 text-md leading-[22px] w-fit flex items-center gap-x-2; + + span { + @apply text-secondary; + } + + &:hover { + @apply bg-secondary rounded-[4px] text-white; + + svg, + span { + @apply text-white; + } + } + + &[aria-expended="true"] { + #content { + @apply bg-[rgb(0_0_0_/_0.5)]; + } + } + } + /* overwrite default dropdown styles */ [data-target*="dropdown"] > span:only-of-type { @apply gap-0; } svg { - @apply w-5 h-5 fill-current; + @apply w-4 h-5 fill-current; } svg + span { - @apply text-sm first-letter:uppercase; + @apply text-md leading-[22px] first-letter:uppercase font-semibold; } } @@ -131,14 +196,23 @@ header { @apply fixed bottom-0 left-0 z-40 bg-white w-full px-4 py-3 flex justify-between text-secondary shadow-[0_-4px_6px_rgba(198,198,198,0.25)]; &__trigger { - @apply flex flex-col items-center text-secondary cursor-pointer md:pl-4 md:border-l border-gray-3; + @apply flex items-center text-secondary cursor-pointer justify-evenly gap-x-1 px-2 py-1; svg { @apply w-6 h-6 fill-current; } span { - @apply text-sm first-letter:uppercase; + @apply text-secondary; + } + + &:hover { + @apply bg-secondary rounded-[4px] text-white; + + svg, + span { + @apply text-white; + } } } @@ -146,10 +220,6 @@ header { @apply absolute top-full left-0 z-30 bg-white; } - &__dropdown-before { - @apply before:block before:absolute before:-top-10 before:right-12 before:content-[""] before:bg-white before:w-24 before:h-12 before:-mt-8; - } - &__account { @apply fixed top-0 left-0 w-full h-full z-30 bg-white; @@ -198,7 +268,7 @@ header { } svg + span { - @apply text-sm first-letter:uppercase w-auto; + @apply w-auto text-md leading-[22px] first-letter:uppercase font-semibold; flex-shrink: 0; } @@ -243,7 +313,7 @@ header { /* overwrite default dropdown styles */ [id*="dropdown-menu"] { - @apply py-0 mx-0 w-full; + @apply py-0 mx-0 w-full lg:w-fit; &[aria-hidden="true"] { @apply md:hidden; @@ -255,14 +325,18 @@ header { @apply container h-full flex justify-between items-center lg:relative last-of-type:[&>svg]:hidden; &__container { - @apply bg-primary relative h-14; + @apply bg-white relative h-14 flex justify-between; } &__breadcrumb-desktop { - @apply hidden lg:flex justify-between items-center gap-2.5 [&>*]:text-lg [&>*]:text-white; + @apply hidden lg:flex justify-between items-center [&>*]:text-md [&>*]:text-black gap-x-2; + + .no-interactive { + @apply font-normal px-0; + } &__dropdown-trigger { - @apply flex rounded px-2 py-1 z-20; + @apply flex rounded py-1 z-20 font-semibold; &:hover { @apply z-10 relative before:content-[''] before:absolute before:w-[calc(100%+3rem+1px)] before:min-w-[10rem] before:h-40 before:left-1/2 before:top-1/2 before:-translate-x-1/2 before:-translate-y-1/4 before:-z-10; @@ -274,7 +348,7 @@ header { } &__dropdown-wrapper { - @apply flex items-center cursor-pointer rounded hover:backdrop-brightness-75 focus:backdrop-brightness-75 focus:outline-none; + @apply flex items-center cursor-pointer underline focus:backdrop-brightness-75 focus:outline-none; } &__dropdown-content { @@ -348,13 +422,17 @@ header { @apply block lg:hidden w-full z-20; &__dropdown-trigger { - @apply flex items-center justify-between text-white; + @apply flex items-center justify-between text-black; svg { @apply w-6 h-6 fill-current; } } + .menu-bar__breadcrumb-item { + @apply font-semibold underline; + } + /* overwrite default dropdown styles */ [id*="dropdown-menu"] { @apply mx-0 py-0 border-0; @@ -382,18 +460,90 @@ header { } &__language-chooser { - @apply absolute top-full left-0 bg-white rounded w-full bg-gray-5; + @apply absolute top-full left-0 rounded w-full bg-gray-5; + + &-desktop { + @apply border-r border-gray-6 pr-10; + + &.focus-mode { + @apply border-none pr-0; + } + } + + &-desktop, + &-mobile { + & button { + @apply border border-neutral-300 rounded px-4 py-2 gap-x-2; + + & > span, + & > svg:first-of-type { + @apply text-neutral-500; + + display: block !important; + } + + & > span.mobile-holder { + @apply items-center gap-x-1; + + display: flex !important; + } + + & > span { + @apply text-sm font-normal; + } + + & > svg:last-of-type { + @apply text-gray-2 ml-1; + + display: block !important; + } + } + + #dropdown-menu-language-chooser { + @apply absolute top-full bg-white shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)] p-2; + + ul { + @apply flex flex-col space-y-2; + + li:hover { + @apply rounded; + } + + .is-active { + @apply bg-neutral-200 rounded; + + &:hover { + @apply bg-[var(--secondary)]; + } + } + } + } + + #dropdown-menu-language-chooser-mobile { + @apply overflow-scroll h-[50vh]; + + ul { + .is-active { + @apply bg-neutral-200 rounded; + + &:hover { + @apply bg-[var(--secondary)]; + } + } + } + } + } } &__dropdown-menu { - @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white; + @apply w-full md:w-1/4 px-4 md:px-0 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-[var(--secondary)]; > * { - @apply py-3 md:py-3.5; + @apply py-3 md:py-3.5 md:px-2; } a { - @apply flex items-center justify-start gap-1 font-semibold text-lg text-white; + @apply flex items-center justify-start gap-1 font-semibold text-xl text-[var(--secondary)] underline; span { @apply min-w-0 truncate; @@ -403,13 +553,21 @@ header { @apply flex-none fill-current; } } + + li:hover { + @apply bg-[var(--secondary)] rounded-[4px]; + + a { + @apply text-white; + } + } } &__main-dropdown { - @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto; + @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[530px] h-screen md:h-auto; &__left { - @apply flex flex-col justify-between p-4 md:p-8 space-y-5 hidden md:block md:w-3/4; + @apply p-4 md:py-8 md:px-0 space-y-5 hidden md:block md:w-3/4; &-top { @apply border-b-4 border-gray-3 pb-3; @@ -466,6 +624,24 @@ header { } } + &__dropdown-desktop { + .card__highlight { + @apply flex-col ring-transparent rounded-lg shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)]; + + &-img { + @apply w-full aspect-[3/1] rounded-tl-lg rounded-tr-lg; + } + + &-text { + @apply w-full items-start text-start bg-background-2 rounded-bl-lg rounded-br-lg; + + h3 { + @apply font-bold; + } + } + } + } + &__secondary-dropdown { @apply absolute top-full left-0 lg:relative flex justify-between bg-white rounded-b shadow-lg text-black w-full lg:w-[1000px]; diff --git a/decidim-core/app/packs/stylesheets/decidim/_layout.scss b/decidim-core/app/packs/stylesheets/decidim/_layout.scss index 3968820e6ea5c..e5ad2e758dc3b 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_layout.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_layout.scss @@ -6,7 +6,7 @@ } [data-content] { - @apply relative flex flex-col flex-1; + @apply relative flex flex-col flex-1 border-t-neutral-100 border-t; } } diff --git a/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb b/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb index 6915e75aa2923..e7e9e49cbbd39 100644 --- a/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb +++ b/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb @@ -18,7 +18,7 @@ def render def arrow_link(text, url, args = {}) link_to url, class: args.with_indifferent_access[:class] do - "#{text} #{icon("arrow-right-line")}".html_safe + "#{text}".html_safe end end end diff --git a/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb b/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb index bdb9ba66662b7..6e02322533747 100644 --- a/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb +++ b/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb @@ -27,7 +27,8 @@ def serialize follows_count: resource.follows_count, short_description: resource.short_description, description: resource.description, - promoted: resource.promoted + promoted: resource.promoted, + component_settings: component_settings } end @@ -98,6 +99,19 @@ def serialize_components serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(resource) serializer.run end + + def component_settings + return unless resource.respond_to?(:components) + + resource.components.map do |component| + { + id: component.id, + name: component.name, + manifest_name: component.manifest_name, + settings: component.settings.respond_to?(:as_json) ? component.settings.as_json : component.settings + } + end + end end end end diff --git a/decidim-core/app/services/decidim/open_data_exporter.rb b/decidim-core/app/services/decidim/open_data_exporter.rb index 57956d2ebeb8f..a3de4000dd62a 100644 --- a/decidim-core/app/services/decidim/open_data_exporter.rb +++ b/decidim-core/app/services/decidim/open_data_exporter.rb @@ -117,9 +117,10 @@ def data_for_component(export_manifest, col_sep = Decidim.default_csv_col_sep) end def data_for_participatory_space(export_manifest) - collection = participatory_spaces.flat_map do |participatory_space| + collection = participatory_spaces.filter { |space| space.manifest.name == export_manifest.manifest.name }.flat_map do |participatory_space| export_manifest.collection.call(participatory_space) end + serializer = export_manifest.open_data_serializer.nil? ? export_manifest.serializer : export_manifest.open_data_serializer exporter = Decidim::Exporters::CSV.new(collection, serializer) get_help_definition(:spaces, exporter, export_manifest, collection.count) unless collection.empty? diff --git a/decidim-core/app/views/layouts/decidim/footer/_focus_mode_main.html.erb b/decidim-core/app/views/layouts/decidim/footer/_focus_mode_main.html.erb index 1d48f6f1dc30c..31fa57ccd2499 100644 --- a/decidim-core/app/views/layouts/decidim/footer/_focus_mode_main.html.erb +++ b/decidim-core/app/views/layouts/decidim/footer/_focus_mode_main.html.erb @@ -2,6 +2,5 @@
-
+ <% taxonomies.each do |taxonomy| %>
decidim/shared/share_modal is present in the DOM. This partial is placed in the application layout.
sizes: Sizes
- sortition_l: sortition_l
- sortitions: Sortitions
source_code: Source Code
state: State
tab_panels_context_description: This tab-panel component gathers all the related contents or another resources of the main element displayed, in order to save vertical space. Clicking on the tab will activate the created panel to show the content.
diff --git a/decidim-design/decidim-design.gemspec b/decidim-design/decidim-design.gemspec
index 10e5e5c41bdef..3254c10c54d82 100644
--- a/decidim-design/decidim-design.gemspec
+++ b/decidim-design/decidim-design.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-design"
s.summary = "Decidim Design Guide (DDG) module"
diff --git a/decidim-dev/app/models/decidim/dev/dummy_resource.rb b/decidim-dev/app/models/decidim/dev/dummy_resource.rb
index 9c41abce8f27b..a6af0e915e4d1 100644
--- a/decidim-dev/app/models/decidim/dev/dummy_resource.rb
+++ b/decidim-dev/app/models/decidim/dev/dummy_resource.rb
@@ -78,7 +78,10 @@ def user_allowed_to_comment?(user)
# Public: Whether the object can have new comment votes or not.
def user_allowed_to_vote_comment?(user)
- component.can_participate_in_space?(user)
+ return false unless accepts_new_comments?
+ return unless component.can_participate_in_space?(user)
+
+ ActionAuthorizer.new(user, "vote_comment", component, self).authorize.ok?
end
def self.user_collection(user)
diff --git a/decidim-dev/config/rubocop/ruby/configuration.yml b/decidim-dev/config/rubocop/ruby/configuration.yml
index c67062c21f1c2..f02aa6e69ba2f 100644
--- a/decidim-dev/config/rubocop/ruby/configuration.yml
+++ b/decidim-dev/config/rubocop/ruby/configuration.yml
@@ -68,7 +68,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.3
+ TargetRubyVersion: 3.4
# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
diff --git a/decidim-dev/decidim-dev.gemspec b/decidim-dev/decidim-dev.gemspec
index b1e8bac878dc4..2f1820f51d6f0 100644
--- a/decidim-dev/decidim-dev.gemspec
+++ b/decidim-dev/decidim-dev.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-dev"
s.summary = "Decidim dev tools"
diff --git a/decidim-dev/lib/decidim/dev/assets/assemblies.json b/decidim-dev/lib/decidim/dev/assets/assemblies.json
index 1c1298dbdebb1..f04650bb7c651 100644
--- a/decidim-dev/lib/decidim/dev/assets/assemblies.json
+++ b/decidim-dev/lib/decidim/dev/assets/assemblies.json
@@ -578,23 +578,6 @@
"permissions": null,
"published_at": "2020-01-22 07:55:05 UTC"
},
- {
- "manifest_name": "sortitions",
- "id": 26,
- "name": {
- "ca": "Sortejos",
- "en": "Sortitions",
- "es": "Sorteos"
- },
- "participatory_space_id": 1,
- "participatory_space_type": "Decidim::Assembly",
- "settings": {
- "comments_enabled": true
- },
- "weight": 0,
- "permissions": null,
- "published_at": "2020-01-22 07:55:19 UTC"
- },
{
"manifest_name": "surveys",
"id": 23,
diff --git a/decidim-dev/lib/decidim/dev/dummy_translator.rb b/decidim-dev/lib/decidim/dev/dummy_translator.rb
index 7947458ae0154..c4da7d7b3b516 100644
--- a/decidim-dev/lib/decidim/dev/dummy_translator.rb
+++ b/decidim-dev/lib/decidim/dev/dummy_translator.rb
@@ -20,7 +20,7 @@ def initialize(resource, field_name, text, target_locale, source_locale)
def translate
translated_text = "#{target_locale} - #{text}"
- MachineTranslationSaveJob.perform_later(
+ Decidim::MachineTranslationSaveJob.perform_later(
resource,
field_name,
target_locale,
diff --git a/decidim-dev/lib/decidim/dev/test/factories.rb b/decidim-dev/lib/decidim/dev/test/factories.rb
index b0f7c8af8387e..cfaecb92bb625 100644
--- a/decidim-dev/lib/decidim/dev/test/factories.rb
+++ b/decidim-dev/lib/decidim/dev/test/factories.rb
@@ -15,9 +15,10 @@
transient do
skip_injection { false }
users { nil }
+ organization { create(:organization, skip_injection:) }
end
title { generate_localized_title(:dummy_resource_title, skip_injection:) }
- component { create(:dummy_component, skip_injection:) }
+ component { create(:dummy_component, organization:, skip_injection:) }
author { create(:user, :confirmed, organization: component.organization, skip_injection:) }
scope { create(:scope, organization: component.organization, skip_injection:) }
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
index 2de57b3dfaf38..b78032386b153 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
@@ -33,7 +33,7 @@ def within_admin_menu
end
def within_language_menu(options = {})
- within(options[:admin] ? ".language-choose" : "footer") do
+ within(options[:admin] ? ".language-choose" : "header") do
find(options[:admin] ? "#admin-menu-trigger" : "#trigger-dropdown-language-chooser").click
yield
end
diff --git a/decidim-elections/README.md b/decidim-elections/README.md
index 5c2e483eaf4fe..f24fd3a50c4bd 100644
--- a/decidim-elections/README.md
+++ b/decidim-elections/README.md
@@ -12,6 +12,14 @@ To install this module, run in your console:
bundle add decidim-elections
```
+And then execute:
+
+```bash
+bundle
+bundle exec rails decidim_elections:install:migrations
+bundle exec rails db:migrate
+```
+
## Contributing
See [Decidim](https://github.com/decidim/decidim).
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb b/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
index 895cc764a3ba9..c379e669d260b 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
@@ -47,6 +47,7 @@ def update_question(question_form, index)
body: question_form.body,
description: question_form.description,
question_type: question_form.question_type,
+ max_choices: question_form.max_choices,
position: index
)
diff --git a/decidim-elections/app/controllers/decidim/elections/elections_controller.rb b/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
index 307b85d378e73..9984ba8381581 100644
--- a/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
@@ -30,7 +30,7 @@ def elections
end
def election
- @election ||= current_user&.admin? ? available_elections.find(params[:id]) : elections.find(params[:id])
+ @election ||= current_user&.admin? ? available_elections.find_by(id: params[:id]) : elections.find_by(id: params[:id])
end
def questions
@@ -59,6 +59,16 @@ def default_filter_params
with_any_state: "all"
}
end
+
+ def add_breadcrumb_item
+ return {} if election.blank?
+
+ {
+ label: translated_attribute(election.title),
+ url: Decidim::EngineRouter.main_proxy(current_component).election_path(election),
+ active: false
+ }
+ end
end
end
end
diff --git a/decidim-elections/app/controllers/decidim/elections/votes_controller.rb b/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
index 41311510db060..51576fab8eb57 100644
--- a/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
@@ -20,6 +20,14 @@ def show
def update
enforce_permission_to(:create, :vote, election:)
+ response_ids = Array(params.dig(:response, question.id.to_s)).compact
+
+ if question.max_choices.present? && response_ids.size > question.max_choices
+ flash.now[:alert] = t("votes.question.max_choices_exceeded", scope: "decidim.elections", max: question.max_choices)
+ render :show
+ return
+ end
+
votes_buffer[question.id.to_s] = params.dig(:response, question.id.to_s)
redirect_to next_vote_step_path
end
diff --git a/decidim-elections/app/forms/decidim/elections/admin/question_form.rb b/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
index 29579d7c3b02e..cb50cf84e9b02 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
@@ -10,6 +10,7 @@ class QuestionForm < Decidim::Form
attribute :question_type, String, default: "multiple_option"
attribute :response_options, Array[Decidim::Elections::Admin::ResponseOptionForm]
+ attribute :max_choices, Integer
attribute :deleted, Boolean, default: false
translatable_attribute :body, String
@@ -18,6 +19,7 @@ class QuestionForm < Decidim::Form
validates :body, translatable_presence: true
validates :question_type, inclusion: { in: Decidim::Elections::Question.question_types }, if: :editable?
validates :response_options, presence: true, if: :editable?
+ validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true
def election
@election ||= context[:election]
@@ -32,6 +34,10 @@ def to_param
def editable?
@editable ||= id.blank? || Decidim::Elections::Question.exists?(id:)
end
+
+ def number_of_options
+ response_options.size
+ end
end
end
end
diff --git a/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb b/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
index ee8033887501e..9f4f67e2695e7 100644
--- a/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
@@ -8,6 +8,9 @@ class InternalUsersForm < Decidim::Form
validate :user_authenticated
delegate :election, :current_user, to: :context
+ delegate :organization, to: :current_user
+
+ attr_reader :authorization_status
def voter_uid
@voter_uid ||= election.census.users(election).find_by(id: current_user&.id)&.to_global_id&.to_s
@@ -18,7 +21,7 @@ def adapters
end
def authorization_handlers
- election.census_settings["authorization_handlers"] || {}
+ @authorization_handlers ||= election.census_settings&.fetch("authorization_handlers", {})&.slice(*organization.available_authorizations)
end
def authorizations
@@ -26,7 +29,7 @@ def authorizations
[
adapter,
Decidim::Verifications::Authorizations.new(
- organization: current_user.organization,
+ organization: organization,
user: current_user,
name: adapter.name
).first
@@ -43,20 +46,11 @@ def in_census?
def user_authenticated
return errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid")) unless in_census?
- invalid = authorizations.filter_map do |adapter, authorization|
- if !authorization || !authorization.granted?
- ["not_granted", adapter]
- elsif adapter.authorize(authorization, authorization_handlers.dig(adapter.name, "options"), election.component, election)&.first != :ok
- ["not_authorized", adapter]
- end
- end
+ @authorization_status = Decidim::ActionAuthorizer::AuthorizationStatusCollection.new(authorization_handlers, current_user, election.component, election)
- return if invalid.empty?
+ return if @authorization_status.ok?
errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid"))
- invalid.each do |error, adapter|
- errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.#{error}", adapter: adapter.fullname))
- end
end
end
end
diff --git a/decidim-elections/app/helpers/decidim/elections/application_helper.rb b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
index fb76d007ffb3c..7c793594ab53c 100644
--- a/decidim-elections/app/helpers/decidim/elections/application_helper.rb
+++ b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
@@ -37,9 +37,13 @@ def component_name
(defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.elections.name")
end
- def question_title(question, tag = :h3, **options)
- content_tag(tag, **options) do
- translated_attribute(question.body)
+ def question_title(question, tag = :h3, **)
+ content_tag(tag, **) do
+ title = translated_attribute(question.body)
+ if question.max_choices.present? && question.question_type == "multiple_option"
+ title += " (#{t("decidim.elections.votes.question.max_choices", count: question.max_choices)})"
+ end
+ title.html_safe
end
end
diff --git a/decidim-elections/app/models/decidim/elections/question.rb b/decidim-elections/app/models/decidim/elections/question.rb
index d0ba336682ee0..6bfee4dd38532 100644
--- a/decidim-elections/app/models/decidim/elections/question.rb
+++ b/decidim-elections/app/models/decidim/elections/question.rb
@@ -28,6 +28,7 @@ def self.question_types
end
def max_votable_options
+ return max_choices if max_choices.present? && question_type == "multiple_option"
return response_options.size if question_type == "multiple_option"
1
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections.js b/decidim-elections/app/packs/entrypoints/decidim_elections.js
index 19a5a196bd98d..b24319e37f05a 100644
--- a/decidim-elections/app/packs/entrypoints/decidim_elections.js
+++ b/decidim-elections/app/packs/entrypoints/decidim_elections.js
@@ -1,3 +1,4 @@
+import "src/decidim/elections/elections.js"
import "src/decidim/elections/waiting_room.js"
import "src/decidim/elections/live_results_update.js";
diff --git a/decidim-elections/app/packs/src/decidim/elections/elections.js b/decidim-elections/app/packs/src/decidim/elections/elections.js
new file mode 100644
index 0000000000000..50fd9d555f724
--- /dev/null
+++ b/decidim-elections/app/packs/src/decidim/elections/elections.js
@@ -0,0 +1,32 @@
+document.addEventListener("turbo:load", () => {
+ const responseContainers = document.querySelectorAll(".response[data-max-choices]");
+ if (!responseContainers.length) {
+ return;
+ }
+
+ responseContainers.forEach((container) => {
+ const maxChoices = parseInt(container.dataset.maxChoices, 10);
+ if (!maxChoices) {
+ return;
+ }
+
+ const checkboxes = container.querySelectorAll("input[type=checkbox]");
+ const alertElement = container.querySelector(".max-choices-alert");
+
+ const checkLimit = () => {
+ const checkedCount = container.querySelectorAll("input[type=checkbox]:checked").length;
+
+ if (checkedCount > maxChoices) {
+ alertElement.style.display = "block";
+ } else {
+ alertElement.style.display = "none";
+ }
+ };
+
+ checkboxes.forEach((checkbox) => {
+ checkbox.addEventListener("change", checkLimit);
+ });
+
+ checkLimit();
+ });
+});
diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
index 33e27c637243f..b424a89655a2f 100644
--- a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
@@ -8,14 +8,14 @@
+ <%=
+ form.select(
+ :max_choices,
+ (2..question.number_of_options),
+ { include_blank: t("any", scope: "decidim.forms.admin.questionnaires.question") },
+ disabled: !editable
+ )
+ %>
+
diff --git a/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb b/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
index b063841343ea3..7a286593fc830 100644
--- a/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
+++ b/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
@@ -1,6 +1,21 @@
<% if current_user %>
<% if @form.in_census? && @form.invalid? %>
<%= cell "decidim/announcement", title: t(".invalid"), body: t(".authorization_options_invalid"), callout_class: "alert" %>
+ <% cell("decidim/authorization_modal", @form.authorization_status).verifications.each do |verification| %>
+
+ <% end %>
<%= link_to t(".exit_button"), exit_path, class: "button button__secondary button__lg w-full mt-12" %>
<%= render "decidim/elections/censuses/submit_button", form: form, disabled: true %>
<% else %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/show.html.erb b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
index b76cde2df6248..9463d769b0c96 100644
--- a/decidim-elections/app/views/decidim/elections/votes/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
@@ -4,12 +4,16 @@
<%= render_question_description(question) %>
-
+
diff --git a/decidim-elections/config/locales/ca-IT.yml b/decidim-elections/config/locales/ca-IT.yml
index c7d6a2cafd64d..34477e12a20e4 100644
--- a/decidim-elections/config/locales/ca-IT.yml
+++ b/decidim-elections/config/locales/ca-IT.yml
@@ -44,7 +44,6 @@ ca-IT:
choose_census: Tria el tipus de cens que vols vincular a aquesta elecció
created_at: Creada el
identifier: Identificador d'usuària
- title: Tipus de cens
preview:
title:
one: La vista prèvia de la llista està limitada a %{count} registre.
diff --git a/decidim-elections/config/locales/ca.yml b/decidim-elections/config/locales/ca.yml
index b170de5dcf804..474b6fcd7745f 100644
--- a/decidim-elections/config/locales/ca.yml
+++ b/decidim-elections/config/locales/ca.yml
@@ -44,7 +44,6 @@ ca:
choose_census: Tria el tipus de cens que vols vincular a aquesta elecció
created_at: Creada el
identifier: Identificador d'usuària
- title: Tipus de cens
preview:
title:
one: La vista prèvia de la llista està limitada a %{count} registre.
diff --git a/decidim-elections/config/locales/cs.yml b/decidim-elections/config/locales/cs.yml
index f011de3f0d7b4..236addfc4cc1e 100644
--- a/decidim-elections/config/locales/cs.yml
+++ b/decidim-elections/config/locales/cs.yml
@@ -128,7 +128,22 @@ cs:
already_have_an_account?: Již máte účet?
are_you_new?: Nový účastník?
sign_in_description: Přihlaste se k hlasování v těchto volbách
+ sign_up_description: Vytvořte účet pro hlasování v této volbě
+ internal_users_form:
+ authorization_options_invalid: Bohužel, i když máte všechna požadovaná oprávnění, některé z nich pro tyto volby neplatí.
+ invalid: V těchto volbách nemáte oprávnění volit.
+ missing: Vašemu uživateli chybí některá požadovaná autorizace. Zkontrolujte prosím informace a zkuste to znovu.
+ resume_with_method: Pokračovat v ověřování pomocí %{name}
+ verify_with_method: Ověřit pomocí %{name}
token_csv:
+ example: |
+ e-mail;token
+ user@example.org;123456
+ user2@example.org;ABCXYZ
+ info_html: |
+ Musí být soubor ve formátu CSV se dvěma sloupci, jedna s e-mailovou adresou a druhá s hodnotou tokenu, který uživatel bude muset představit, aby mohl hlasovat.
+ Musí být oddělena středníkem (;)
+ label: Neregistrovaní účastníci s tokeny (fixní)
upload_file: Nahrát soubor
upload_new_census: Nahrát CSV soubor
token_csv_form:
@@ -146,6 +161,7 @@ cs:
other: "%{count} voleb"
elections:
empty: Nejsou k dispozici žádné volby.
+ empty_filters: Neexistují žádné volby, které by odpovídaly vašim filtrům.
filters:
all: Vše
state: Stav
@@ -163,6 +179,8 @@ cs:
show:
vote_button: Hlasovat
vote_results:
+ subtitle:
+ per_question: Výsledky jsou k dispozici na jednu otázku. Výsledky pro každou otázku můžete vidět po povolení hlasování a po zveřejnění výsledků.
title: Výsledky
models:
election:
@@ -175,11 +193,14 @@ cs:
per_question_votes:
waiting:
edit_vote: Upravte svůj hlas
+ exit_button: Odejít z čekací místnosti
+ title: Čekání na další otázku
status:
active: Aktivní
finished: Dokončeno
not_started: Nezahájeno
ongoing: Probíhající
+ published_results: Zveřejněné výsledky
scheduled: Naplánováno
unpublished: Nezveřejněno
voting_enabled: Probíhá hlasování
@@ -189,9 +210,11 @@ cs:
success: Váš hlas byl úspěšně odeslán.
check_census:
access: Přístup
+ election_not_open: Volby ještě nejsou otevřeny. Zkontrolujte prosím datum a zkuste to znovu.
failed: Vaši identitu nelze ověřit. Zkontrolujte zadané informace a zkuste to znovu.
form_title: Ověřte svou identitu
confirm:
+ edit_vote: Upravte svůj hlas
not_answered: Na tuto otázku jste neodpověděl.
title: Potvrďte svůj hlas
not_authorized: V těchto volbách nemáte oprávnění volit.
diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
index 3c970ec5c7a37..1f2e3d1adf4b0 100644
--- a/decidim-elections/config/locales/en.yml
+++ b/decidim-elections/config/locales/en.yml
@@ -2,6 +2,8 @@
en:
activemodel:
attributes:
+ elections_question:
+ max_choices: Maximum number of choices
token_csv:
file: File
remove_all: Remove all current census data
@@ -200,9 +202,6 @@ en:
authorization_options_invalid: Unfortunately, although you have all the required authorizations, some of them are not valid for this election.
exit_button: Exit the voting booth
invalid: You are not authorized to vote in this election.
- missing: Your user misses some required authorizations. Please check the information and try again.
- not_authorized: '"%{adapter}" authorization does not match the required conditions.'
- not_granted: '"%{adapter}" authorization is not granted.'
resume_with_method: Resume verification with %{name}
verify_with_method: Verify with %{name}
token_csv:
@@ -302,6 +301,9 @@ en:
question:
back: Back
cast_vote: Cast vote
+ max_choices: 'Max choices: %{count}'
+ max_choices_alert: You have selected too many options. Please deselect some to continue.
+ max_choices_exceeded: You cannot select more than %{max} options. Please go back and adjust your selection.
next: Next
receipt:
description: Yo can vote again at any time while the voting period is open. Your previous vote will be overwritten by the new one.
diff --git a/decidim-elections/config/locales/es-MX.yml b/decidim-elections/config/locales/es-MX.yml
index a713fdaaf03e6..b9f00c38dae2a 100644
--- a/decidim-elections/config/locales/es-MX.yml
+++ b/decidim-elections/config/locales/es-MX.yml
@@ -44,7 +44,6 @@ es-MX:
choose_census: Elige el tipo de censo que quieres vincular esta elección
created_at: Creado el
identifier: Identificador de usuaria
- title: Tipo de censo
preview:
title:
one: La vista previa de la lista está limitada a %{count} registro.
diff --git a/decidim-elections/config/locales/es-PY.yml b/decidim-elections/config/locales/es-PY.yml
index 7b50d4ac3b4b7..d899df8ca3fab 100644
--- a/decidim-elections/config/locales/es-PY.yml
+++ b/decidim-elections/config/locales/es-PY.yml
@@ -44,7 +44,6 @@ es-PY:
choose_census: Elige el tipo de censo que quieres vincular esta elección
created_at: Creado el
identifier: Identificador de usuaria
- title: Tipo de censo
preview:
title:
one: La vista previa de la lista está limitada a %{count} registro.
diff --git a/decidim-elections/config/locales/es.yml b/decidim-elections/config/locales/es.yml
index 0e107c8291698..26653fe7d7a95 100644
--- a/decidim-elections/config/locales/es.yml
+++ b/decidim-elections/config/locales/es.yml
@@ -44,7 +44,6 @@ es:
choose_census: Elige el tipo de censo que quieres vincular esta elección
created_at: Creado el
identifier: Identificador de usuaria
- title: Tipo de censo
preview:
title:
one: La vista previa de la lista está limitada a %{count} registro.
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index 4009958aa6e39..f978acc27c79d 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -44,7 +44,6 @@ eu:
choose_census: Hautatu hauteskunde hauetarako erabili nahi duzun errolda-mota
created_at: Sortze-data
identifier: Parte-hartzailearen identifikatzailea
- title: Errolda-mota
preview:
title:
one: Aurrebistaren zerrenda erregistro batera mugatuta dago.
@@ -180,7 +179,7 @@ eu:
unpublish: "%{user_name} parte-hartzaileak %{resource_name} hauteskundea despublikatu du %{space_name} espazioan"
update: "%{user_name} parte-hartzaileak %{resource_name} hauteskundea eguneratu du %{space_name} espazioan"
question:
- update: "%{user_name} -k eguneratu ditu %{resource_name} aukerako galderak"
+ update: "%{user_name} parte-hartzaileak eguneratu ditu %{resource_name} aukerako galderak"
censuses:
census_ready_html: Erroldako datuak kargatuta daude eta prest daude % %{election_title}{@eleccion_title} bozketan erabiltzeko.
census_size_html:
diff --git a/decidim-elections/config/locales/fi-plain.yml b/decidim-elections/config/locales/fi-plain.yml
index baa445dd43f2b..b2560c07ea471 100644
--- a/decidim-elections/config/locales/fi-plain.yml
+++ b/decidim-elections/config/locales/fi-plain.yml
@@ -44,7 +44,6 @@ fi-pl:
choose_census: Valitse henkilötietorekisterin tyyppi, jota haluat käyttää tälle vaalille
created_at: Luonnin ajankohta
identifier: Käyttäjän tunniste
- title: Henkilötietorekisterin tyyppi
preview:
title:
one: Esikatselulista on rajattu %{count} tietueeseen.
diff --git a/decidim-elections/config/locales/fi.yml b/decidim-elections/config/locales/fi.yml
index 09d527ab23005..9fb410f86b70e 100644
--- a/decidim-elections/config/locales/fi.yml
+++ b/decidim-elections/config/locales/fi.yml
@@ -44,7 +44,6 @@ fi:
choose_census: Valitse henkilötietorekisterin tyyppi, jota haluat käyttää tälle vaalille
created_at: Luonnin ajankohta
identifier: Käyttäjän tunniste
- title: Henkilötietorekisterin tyyppi
preview:
title:
one: Esikatselulista on rajattu %{count} tietueeseen.
diff --git a/decidim-elections/config/locales/fr-CA.yml b/decidim-elections/config/locales/fr-CA.yml
index b07e1de80e09d..ad54e715b1042 100644
--- a/decidim-elections/config/locales/fr-CA.yml
+++ b/decidim-elections/config/locales/fr-CA.yml
@@ -40,6 +40,7 @@ fr-CA:
admin:
census:
edit:
+ choose_census: Choisissez le type de recensement que vous souhaitez utiliser pour cette élection
created_at: Créée le
identifier: Identifiant de l'utilisateur
preview:
@@ -71,6 +72,7 @@ fr-CA:
publish_button: Publier les résultats
title: Résultats
status:
+ census: 'Recensement:'
results_availability:
after_end: Résultats disponibles après la fin de l'élection
per_question: Résultats disponibles par question
@@ -80,6 +82,8 @@ fr-CA:
create:
invalid: Il y a eu un problème lors de la création de l'élection.
success: Élection créée avec succès.
+ dashboard:
+ subtitle: 'Étape finale: éxaminez vos détails. Des modifications peuvent toujours être apportées avant de publier. Une fois publiée, vous serez toujours en mesure de mettre à jour la description de l''élection.'
edit:
title: Modifier l'élection
form:
@@ -142,6 +146,9 @@ fr-CA:
internal_users:
already_have_an_account?: Vous avez déjà un compte?
are_you_new?: Nouveau participant ?
+ info_html: |
+ Vous pouvez restreindre la participation à l'élection aux participants qui ont une autorisation.
+ Notez que les participants devront satisfaire aux autorisations sélectionnées pour voter. Laisser toutes les cases à cocher vides permettra à toute personne enregistrée de voter. internal_type_title: Autorisations supplémentaires requises pour voter (facultatif) sign_in_description: Connectez-vous pour voter durant cette élection sign_up_description: Créer un compte pour voter durant cette élection @@ -184,6 +191,7 @@ fr-CA: state_values: finished: Terminées ongoing: En cours + scheduled: Programmé orders: end_at: Date de fin label: Trier par diff --git a/decidim-elections/config/locales/fr.yml b/decidim-elections/config/locales/fr.yml index 68d35c0b00b69..7244ea07f2183 100644 --- a/decidim-elections/config/locales/fr.yml +++ b/decidim-elections/config/locales/fr.yml @@ -40,6 +40,7 @@ fr: admin: census: edit: + choose_census: Choisissez le type de recensement que vous souhaitez utiliser pour cette élection created_at: Créée le identifier: Identifiant de l'utilisateur preview: @@ -71,6 +72,7 @@ fr: publish_button: Publier les résultats title: Résultats status: + census: 'Recensement:' results_availability: after_end: Résultats disponibles après la fin de l'élection per_question: Résultats disponibles par question @@ -80,6 +82,8 @@ fr: create: invalid: Il y a eu un problème lors de la création de l'élection. success: Élection créée avec succès. + dashboard: + subtitle: 'Étape finale: éxaminez vos détails. Des modifications peuvent toujours être apportées avant de publier. Une fois publiée, vous serez toujours en mesure de mettre à jour la description de l''élection.' edit: title: Modifier l'élection form: @@ -142,6 +146,9 @@ fr: internal_users: already_have_an_account?: Vous avez déjà un compte? are_you_new?: Nouveau participant ? + info_html: | + Vous pouvez restreindre la participation à l'élection aux participants qui ont une autorisation.
+ Notez que les participants devront satisfaire aux autorisations sélectionnées pour voter. Laisser toutes les cases à cocher vides permettra à toute personne enregistrée de voter. internal_type_title: Autorisations supplémentaires requises pour voter (facultatif) sign_in_description: Connectez-vous pour voter durant cette élection sign_up_description: Créer un compte pour voter durant cette élection @@ -184,6 +191,7 @@ fr: state_values: finished: Terminées ongoing: En cours + scheduled: Programmé orders: end_at: Date de fin label: Trier par diff --git a/decidim-elections/config/locales/ja.yml b/decidim-elections/config/locales/ja.yml index 56db4c3bd6645..550cb2d9ca32e 100644 --- a/decidim-elections/config/locales/ja.yml +++ b/decidim-elections/config/locales/ja.yml @@ -44,7 +44,6 @@ ja: choose_census: この選挙に使用したいセンサスの種類を選択してください created_at: 作成日時 identifier: ユーザーID - title: センサスの種類 preview: title: other: プレビューリストは %{count} レコードに制限されています。 diff --git a/decidim-elections/config/locales/sv.yml b/decidim-elections/config/locales/sv.yml index 79514ca975b30..e4888aa9694d9 100644 --- a/decidim-elections/config/locales/sv.yml +++ b/decidim-elections/config/locales/sv.yml @@ -39,7 +39,6 @@ sv: choose_census: Välj vilken typ av folkräkning du vill använda för detta val created_at: Skapad den identifier: Identifierare för användare - title: Typ av folkräkning preview: title: one: Förhandsgranskningen är begränsad till %{count} post. diff --git a/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb new file mode 100644 index 0000000000000..4e2d8aadcac24 --- /dev/null +++ b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddMaxChoicesToDecidimElectionsQuestions < ActiveRecord::Migration[7.2] + def change + add_column :decidim_elections_questions, :max_choices, :integer + end +end diff --git a/decidim-elections/decidim-elections.gemspec b/decidim-elections/decidim-elections.gemspec index e46c1f172e9a8..c4d592bca87f1 100644 --- a/decidim-elections/decidim-elections.gemspec +++ b/decidim-elections/decidim-elections.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-elections" s.summary = "A Decidim module for creating Elections." diff --git a/decidim-elections/lib/decidim/elections/test/factories.rb b/decidim-elections/lib/decidim/elections/test/factories.rb index 50ae7c6bd5cac..c50e57fc0fe00 100644 --- a/decidim-elections/lib/decidim/elections/test/factories.rb +++ b/decidim-elections/lib/decidim/elections/test/factories.rb @@ -69,8 +69,8 @@ end trait :with_questions do - after :create do |election, _evaluator| - create_list(:election_question, 2, :with_response_options, :voting_enabled, election:) + after :create do |election, evaluator| + create_list(:election_question, 2, :with_response_options, :voting_enabled, election:, skip_injection: evaluator.skip_injection) end end @@ -95,8 +95,12 @@ end factory :election_question, class: "Decidim::Elections::Question" do + transient do + skip_injection { false } + end + association :election - body { generate_localized_title(:question_body) } + body { generate_localized_title(:question_body, skip_injection:) } description { generate_localized_description(:question_description) } question_type { "multiple_option" } sequence(:position) { |n| n } diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb index 4d0d6369ec37b..b1d35796b0490 100644 --- a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb +++ b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb @@ -190,6 +190,67 @@ module Admin end end + context "when updating max_choices" do + let(:update_max_choices_params) do + { + "questions" => [ + { + "id" => first_question.id, + "body" => first_question.body, + "description" => first_question.description, + "question_type" => "multiple_option", + "max_choices" => 2, + "response_options" => [ + { "id" => first_question_first_option.id, "body" => first_question_first_option.body }, + { "id" => first_question_second_option.id, "body" => first_question_second_option.body } + ] + } + ] + } + end + + let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(update_max_choices_params).with_context(context_params) } + let(:command) { described_class.new(form, election) } + + it "updates max_choices field" do + command.call + updated = election.reload.questions.find_by(id: first_question.id) + expect(updated.max_choices).to eq(2) + end + end + + context "when adding a new question with max_choices" do + let(:add_with_max_choices_params) do + { + "questions" => [ + { + "body" => { en: "Q with max choices" }, + "description" => { en: "Description" }, + "question_type" => "multiple_option", + "max_choices" => 3, + "response_options" => [ + { "body" => { en: "Option 1" } }, + { "body" => { en: "Option 2" } }, + { "body" => { en: "Option 3" } }, + { "body" => { en: "Option 4" } } + ] + } + ] + } + end + + let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(add_with_max_choices_params).with_context(context_params) } + let(:command) { described_class.new(form, election) } + + it "creates a new question with max_choices" do + expect { command.call } + .to change { election.reload.questions.count }.by(1) + new_question = election.reload.questions.last + expect(new_question.max_choices).to eq(3) + expect(new_question.response_options.size).to eq(4) + end + end + context "when updating, deleting, and adding at once" do let(:combo_params) do { diff --git a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb index e340e150c9e3c..7cab91d3c4936 100644 --- a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb +++ b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb @@ -96,6 +96,56 @@ module Elections expect(session[:votes_buffer]).to eq({ question.id.to_s => nil, second_question.id.to_s => nil }) expect(response).to redirect_to(confirm_election_votes_path) end + + context "when question has max_choices limit" do + let!(:question_with_limit) do + create(:election_question, :voting_enabled, election:, question_type: "multiple_option", max_choices: 2) + end + let!(:option1) { create(:election_response_option, question: question_with_limit) } + let!(:option2) { create(:election_response_option, question: question_with_limit) } + let!(:option3) { create(:election_response_option, question: question_with_limit) } + + it "rejects vote when exceeding max_choices" do + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id, option2.id, option3.id] + } + ) + + expect(response).to have_http_status(:ok) + expect(flash[:alert]).to match(/cannot select more than 2/) + expect(subject).to render_template(:show) + end + + it "accepts vote when within max_choices limit" do + session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil } + + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id, option2.id] + } + ) + + expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s, option2.id.to_s]) + expect(response).to redirect_to(confirm_election_votes_path) + end + + it "accepts vote with less than max_choices" do + session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil } + + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id] + } + ) + + expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s]) + expect(response).to redirect_to(confirm_election_votes_path) + end + end end end diff --git a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb index f5a0349884b82..75e3f42235347 100644 --- a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb +++ b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb @@ -55,6 +55,72 @@ module Admin it { is_expected.not_to be_valid } end + describe "max_choices validation" do + let(:attributes) do + { + body_en: body_en, + description_en: description_en, + question_type: question_type, + response_options: response_options, + max_choices: max_choices + } + end + + context "when max_choices is valid" do + let(:max_choices) { 2 } + + it { is_expected.to be_valid } + end + + context "when max_choices is greater than number of options" do + let(:max_choices) { 10 } + + it { is_expected.not_to be_valid } + + it "adds an error on max_choices" do + subject.valid? + expect(subject.errors[:max_choices]).not_to be_empty + end + end + + context "when max_choices is 1" do + let(:max_choices) { 1 } + + it { is_expected.not_to be_valid } + + it "adds an error on max_choices" do + subject.valid? + expect(subject.errors[:max_choices]).not_to be_empty + end + end + + context "when max_choices is nil" do + let(:max_choices) { nil } + + it { is_expected.to be_valid } + end + + context "when max_choices is blank string" do + let(:max_choices) { "" } + + it { is_expected.to be_valid } + end + end + + describe "#number_of_options" do + it "returns the count of response options" do + expect(subject.number_of_options).to eq(2) + end + + context "when there are no response options" do + let(:response_options) { {} } + + it "returns 0" do + expect(subject.number_of_options).to eq(0) + end + end + end + it_behaves_like "form to param", default_id: "questionnaire-question-id" end end diff --git a/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb index b97f8cf74614d..dc5f1b63cd5a4 100644 --- a/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb +++ b/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb @@ -18,6 +18,10 @@ module Censuses {} end + before do + organization.update!(available_authorizations: %w(dummy_authorization_handler)) + end + subject { described_class.new.with_context(election:, current_user: user) } it { is_expected.to be_valid } @@ -77,6 +81,9 @@ module Censuses it "adds an error for the base" do subject.validate expect(subject.errors[:base]).to include(I18n.t("decidim.elections.censuses.internal_users_form.invalid")) + expect(subject.authorization_status).to be_a(Decidim::ActionAuthorizer::AuthorizationStatusCollection) + expect(subject.authorization_status).not_to be_ok + expect(subject.authorization_status.statuses.first.data).to eq({ :extra_explanation => [{ :key => "extra_explanation.postal_codes", :params => { :scope => "decidim.verifications.dummy_authorization", :count => 1, :postal_codes => "08002" } }] }) end context "when the user does not match the options" do diff --git a/decidim-elections/spec/models/decidim/elections/question_spec.rb b/decidim-elections/spec/models/decidim/elections/question_spec.rb index 3f33d9493f9e4..fad27465bc732 100644 --- a/decidim-elections/spec/models/decidim/elections/question_spec.rb +++ b/decidim-elections/spec/models/decidim/elections/question_spec.rb @@ -155,6 +155,22 @@ module Elections it "returns the count of response options" do expect(subject.max_votable_options).to eq(2) end + + context "when max_choices is set" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) } + + it "returns the max_choices value" do + expect(subject.max_votable_options).to eq(1) + end + end + + context "when max_choices is nil" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: nil) } + + it "returns the count of response options" do + expect(subject.max_votable_options).to eq(2) + end + end end end @@ -182,6 +198,15 @@ module Elections expect(question.safe_responses(response_ids)).to be_empty end end + + context "when max_choices is set" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) } + + it "returns only max_choices number of responses" do + response_ids = question.response_options.pluck(:id) + expect(question.safe_responses(response_ids).count).to eq(1) + end + end end describe "#sibling_questions" do diff --git a/decidim-elections/spec/system/admin/admin_access_spec.rb b/decidim-elections/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..ce6e0ca70a8a0 --- /dev/null +++ b/decidim-elections/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "elections" } + let!(:election) { create(:election, :with_token_csv_census, :published, component:) } + let(:title) { "Elections" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb index 74495a43005ea..53e36e01b138a 100644 --- a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb +++ b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb @@ -225,6 +225,74 @@ end end + context "when admin user sets max_choices for multiple_option question" do + it "creates a question with max_choices" do + visit questions_edit_path + + click_on "Add question" + expand_all_questions + + within "form.edit_questions" do + within page.all(".questionnaire-question").first do + fill_in find_nested_form_field_locator("body_en"), with: "Select up to 2 options" + select "Multiple option", from: "Type" + + 3.times { click_on "Add response option" } + + page.all(".questionnaire-question-response-option").each_with_index do |option, idx| + within option do + fill_in find_nested_form_field_locator("body_en"), with: "Option #{idx + 1}" + end + end + + select "2", from: "Maximum number of choices" + end + end + + click_on "Save and continue" + + expect(page).to have_admin_callout("successfully") + + visit questions_edit_path + expand_all_questions + + expect(page).to have_css("input[value='Select up to 2 options']") + expect(election.questions.last.max_choices).to eq(2) + end + + it "updates max_choices on existing question" do + question = create(:election_question, :with_response_options, + election:, + question_type: "multiple_option", + max_choices: nil) + + visit questions_edit_path + find("#questionnaire_question_#{question.id}-button").click + + within "#accordion-questionnaire_question_#{question.id}-field" do + select "2", from: "Maximum number of choices" + end + + click_on "Save and continue" + + expect(page).to have_admin_callout("successfully") + expect(question.reload.max_choices).to eq(2) + end + + it "shows 'Any' option for max_choices when unset" do + question = create(:election_question, :with_response_options, + election:, + question_type: "multiple_option") + + visit questions_edit_path + find("#questionnaire_question_#{question.id}-button").click + + within "#accordion-questionnaire_question_#{question.id}-field" do + expect(page).to have_select("Maximum number of choices", selected: "Any") + end + end + end + private def find_nested_form_field_locator(attribute, visible: :visible) diff --git a/decidim-elections/spec/system/election_results_spec.rb b/decidim-elections/spec/system/election_results_spec.rb index a5c9adb11fb4f..0653401acf4d2 100644 --- a/decidim-elections/spec/system/election_results_spec.rb +++ b/decidim-elections/spec/system/election_results_spec.rb @@ -4,7 +4,7 @@ require "decidim/elections/test/vote_examples" describe "Dashboard" do - let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions) } + let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions, skip_injection: true) } let(:question1) { election.questions.first } let(:question2) { election.questions.second } let(:option11) { question1.response_options.first } @@ -70,8 +70,8 @@ def expect_vote_count(question, option, count) context "when the election is per question" do let(:election) { create(:election, :published, :ongoing, :per_question, :with_internal_users_census) } - let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:) } - let!(:question2) { create(:election_question, :with_response_options, election:) } + let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) } + let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true) } let(:option11) { question1.response_options.first } let(:option12) { question1.response_options.second } let(:option21) { question2.response_options.first } @@ -84,7 +84,7 @@ def expect_vote_count(question, option, count) end context "when all questions are enabled" do - let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:) } + let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) } it_behaves_like "shows questions in an election" end diff --git a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb index bed6fc96a6fb4..54ec42daacb07 100644 --- a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb +++ b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb @@ -6,8 +6,8 @@ describe "Dashboard" do let(:user) { create(:user, :confirmed, organization:) } let!(:election) { create(:election, :published, :ongoing, :with_internal_users_census, census_settings:) } - let!(:question1) { create(:election_question, :with_response_options, election:, question_type: "single_option") } - let!(:question2) { create(:election_question, :with_response_options, election:, question_type: "multiple_option") } + let!(:question1) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "single_option") } + let!(:question2) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "multiple_option") } let(:organization) { election.organization } let(:census_settings) do { @@ -30,6 +30,7 @@ def election_vote_path(question) end before do + organization.update!(available_authorizations: %w(dummy_authorization_handler)) switch_to_host(organization.host) end @@ -94,6 +95,10 @@ def election_vote_path(question) let(:election) { create(:election, :published, :finished, :with_internal_users_census) } it "does not allow to vote" do + within(".menu-bar") do + expect(page).to have_content(translated(election.component.name)) + expect(page).to have_content(translated(election.title)) + end expect(page).to have_no_link("Vote") expect(page).to have_no_content("You have already voted.") visit new_election_vote_path @@ -103,6 +108,62 @@ def election_vote_path(question) end end + context "when question has max_choices limit", :js do + let(:election_with_limit) { create(:election, :published, :ongoing, :with_internal_users_census, component: election.component) } + let!(:question_with_limit) { create(:election_question, election: election_with_limit, question_type: "multiple_option", max_choices: 2, body: { en: "Choose your options" }) } + let!(:option1) { create(:election_response_option, question: question_with_limit, body: { en: "Option 1" }) } + let!(:option2) { create(:election_response_option, question: question_with_limit, body: { en: "Option 2" }) } + let!(:option3) { create(:election_response_option, question: question_with_limit, body: { en: "Option 3" }) } + let(:new_election_with_limit_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election_with_limit.id) } + + before do + login_as user, scope: :user + visit new_election_with_limit_vote_path + end + + it "shows max_choices in question title" do + expect(page).to have_content("Choose your options (Max choices: 2)") + end + + it "shows alert when selecting more than max_choices" do + check "Option 1" + check "Option 2" + check "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :visible) + end + + it "hides alert when deselecting options" do + check "Option 1" + check "Option 2" + check "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :visible) + + uncheck "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :hidden) + end + + it "shows server-side validation error when exceeding limit" do + check "Option 1" + check "Option 2" + check "Option 3" + + click_on "Next" + + expect(page).to have_content("You cannot select more than 2 options") + end + + context "when question is single_option" do + let!(:single_question) { create(:election_question, election: election_with_limit, question_type: "single_option", body: { en: "Choose one option" }) } + + it "does not show max_choices for single_option questions" do + expect(page).to have_no_content("Choose one option (Max choices:") + end + end + end + context "when the election is per_question" do let(:election) { create(:election, :published, :ongoing, :with_internal_users_census, :per_question) } diff --git a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb index 87f3717b88796..7be60f6e774b7 100644 --- a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb +++ b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb @@ -21,8 +21,8 @@ let(:receipt_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).receipt_election_per_question_votes_path(election_id: election.id) } let(:confirm_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).confirm_election_per_question_votes_path(election_id: election.id) } let(:new_election_normal_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election.id) } - let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, question_type: "single_option", election:, position: 1) } - let!(:question2) { create(:election_question, :with_response_options, election:, position: 2) } + let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, skip_injection: true, question_type: "single_option", election:, position: 1) } + let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 2) } let(:voter_uid) { user.to_global_id.to_s } def election_vote_path(question) @@ -62,8 +62,8 @@ def election_vote_path(question) end context "when navigating through already voted questions" do - let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, position: 2) } - let!(:question3) { create(:election_question, :with_response_options, election:, position: 3) } + let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true, position: 2) } + let!(:question3) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 3) } before do login_as user, scope: :user diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml index ede0eb99271a5..3faf10583f609 100644 --- a/decidim-forms/config/locales/eu.yml +++ b/decidim-forms/config/locales/eu.yml @@ -139,7 +139,7 @@ eu: remove: Kendu separator: Bereizlea title_and_description: - collapse: Kolapsoa + collapse: Tolestu description: Deskribapena expand: Zabaldu remove: Kendu @@ -195,7 +195,7 @@ eu: body: Galdetegi honen ezaugarri batzuk desaktibatu egingo dira. Zure esperientzia hobetzeko, gaitu JavaScript zure nabigatzailean. title: Javascript desaktibatuta dago questionnaire_not_published: - body: Argitalpen hau oraindik ez da argitaratu. + body: Formulario hau ez da oraindik argitaratu. questionnaire_responded: body: Dagoeneko inkesta hau erantzun duzu. title: Dagoeneko erantzunda diff --git a/decidim-forms/decidim-forms.gemspec b/decidim-forms/decidim-forms.gemspec index e0220203de50f..0ce9b4620b584 100644 --- a/decidim-forms/decidim-forms.gemspec +++ b/decidim-forms/decidim-forms.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-forms" s.summary = "Decidim forms" diff --git a/decidim-forms/lib/decidim/forms/test/factories.rb b/decidim-forms/lib/decidim/forms/test/factories.rb index d831bc65dc4b7..1aef9e948a7bf 100644 --- a/decidim-forms/lib/decidim/forms/test/factories.rb +++ b/decidim-forms/lib/decidim/forms/test/factories.rb @@ -117,14 +117,18 @@ end trait :with_response_options do - response_options do - Array.new(3).collect { build(:response_option, skip_injection:) } + after(:build) do |question, evaluator| + question.response_options = Array.new(3).collect do + build(:response_option, question:, skip_injection: evaluator.skip_injection) + end end end trait :conditioned do - display_conditions do - Array.new(3).collect { build(:display_condition, skip_injection:) } + after(:build) do |question, evaluator| + question.display_conditions = Array.new(3).collect do + build(:display_condition, question:, skip_injection: evaluator.skip_injection) + end end end @@ -194,7 +198,7 @@ transient do skip_injection { false } end - condition_question { create(:questionnaire_question, skip_injection:) } + condition_question { create(:questionnaire_question, questionnaire: question.questionnaire, skip_injection:) } question { create(:questionnaire_question, position: 1, skip_injection:) } condition_type { :responded } mandatory { true } diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock index 85ca866494936..444107ddf8bd0 100644 --- a/decidim-generators/Gemfile.lock +++ b/decidim-generators/Gemfile.lock @@ -17,7 +17,6 @@ PATH decidim-pages (= 0.32.0.dev) decidim-participatory_processes (= 0.32.0.dev) decidim-proposals (= 0.32.0.dev) - decidim-sortitions (= 0.32.0.dev) decidim-surveys (= 0.32.0.dev) decidim-system (= 0.32.0.dev) decidim-verifications (= 0.32.0.dev) @@ -187,11 +186,6 @@ PATH decidim-core (= 0.32.0.dev) doc2text (~> 0.4.0, >= 0.4.8) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.32.0.dev) - decidim-admin (= 0.32.0.dev) - decidim-comments (= 0.32.0.dev) - decidim-core (= 0.32.0.dev) - decidim-proposals (= 0.32.0.dev) decidim-surveys (0.32.0.dev) decidim-core (= 0.32.0.dev) decidim-forms (= 0.32.0.dev) @@ -342,7 +336,7 @@ GEM fast-stemmer (~> 1.0) matrix (~> 0.4) cmdparse (3.0.7) - commonmarker (0.23.11) + commonmarker (0.23.12) concurrent-ruby (1.3.5) connection_pool (2.5.4) crack (1.0.0) @@ -934,7 +928,7 @@ DEPENDENCIES web-console (~> 4.2) RUBY VERSION - ruby 3.3.4p94 + ruby 3.4.7p58 BUNDLED WITH 2.4.20 diff --git a/decidim-generators/decidim-generators.gemspec b/decidim-generators/decidim-generators.gemspec index 078ba9acc0dd0..bb97cc67019b2 100644 --- a/decidim-generators/decidim-generators.gemspec +++ b/decidim-generators/decidim-generators.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-generators" diff --git a/decidim-generators/exe/decidim b/decidim-generators/exe/decidim index 0e047a7add583..f778b9ce4e838 100755 --- a/decidim-generators/exe/decidim +++ b/decidim-generators/exe/decidim @@ -9,25 +9,25 @@ if File.exist?(File.expand_path("../../.git", __dir__)) end case ARGV[0] -when "--component" +when "--component", "-c" ARGV.replace(["component", *ARGV[1..-1]]) require "decidim/generators/component_generator" Decidim::Generators::ComponentGenerator.start -when "--version" +when "--version", "-v" require "decidim/core/version" puts Decidim::Core.version -when "--help" +when "--help", "-h" require "decidim/core/version" puts "Decidim #{Decidim::Core.version} Syntax: decidim [options] [App or Module name] https://decidim.org Options: - --help display this help and exit - --version output version information and exit - --component [name] creates a component for Decidim + -h, --help display this help and exit + -v, --version output version information and exit + -c, --component [name] creates a component for Decidim [name] creates an application based on Decidim App generation extra options (ignored if the --component flag is on): @@ -48,6 +48,10 @@ App generation extra options (ignored if the --component flag is on): --seed_db [true|false] Seed the database: generate demo data for each participatory space and component --recreate_db Recreate the database after installing Decidim +Component generation extra options (ignored if the --component flag is not defined) + --external To create a new module external to the main decidim repository + --destination-folder IF you want to point to an existing folder or give it a custom name + Examples: decidim my-application decidim --storage=s3 my-application @@ -55,6 +59,9 @@ Examples: decidim --locales=en,ca,es,fr my-application decidim --queue sidekiq my-application decidim --queue sidekiq --storage s3 my-application + + decidim --component --external my_component + decidim --component --external my_component --destination-folder my-comp " else require "decidim/generators/app_generator" diff --git a/decidim-generators/lib/decidim/generators/app_generator.rb b/decidim-generators/lib/decidim/generators/app_generator.rb index 344f2329303cf..d9dcaaa69e581 100644 --- a/decidim-generators/lib/decidim/generators/app_generator.rb +++ b/decidim-generators/lib/decidim/generators/app_generator.rb @@ -323,8 +323,7 @@ def modify_gitignore # Ignore the files and folders generated through Webpack /public/decidim-packs /public/packs-test - /public/sw.js - /public/sw.js.map + /public/sw.js* # Ignore node modules /node_modules diff --git a/decidim-generators/lib/decidim/generators/app_templates/.ruby-version b/decidim-generators/lib/decidim/generators/app_templates/.ruby-version index a0891f563f38b..2aa5131992119 100644 --- a/decidim-generators/lib/decidim/generators/app_templates/.ruby-version +++ b/decidim-generators/lib/decidim/generators/app_templates/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.7 diff --git a/decidim-generators/lib/decidim/generators/component_templates/.ruby-version b/decidim-generators/lib/decidim/generators/component_templates/.ruby-version index a0891f563f38b..2aa5131992119 100644 --- a/decidim-generators/lib/decidim/generators/component_templates/.ruby-version +++ b/decidim-generators/lib/decidim/generators/component_templates/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.7 diff --git a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb index afe754f4f9f99..a79d068133eee 100644 --- a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb +++ b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb @@ -18,7 +18,7 @@ def base_query end def search_field_predicate - :title_or_description_or_id_string_or_author_name_or_author_nickname_cont + :title_or_description_or_author_name_or_author_nickname_cont end def filters diff --git a/decidim-initiatives/app/models/decidim/initiative.rb b/decidim-initiatives/app/models/decidim/initiative.rb index 93bfcd3476409..df2118eb55a85 100644 --- a/decidim-initiatives/app/models/decidim/initiative.rb +++ b/decidim-initiatives/app/models/decidim/initiative.rb @@ -450,6 +450,10 @@ def user_allowed_to_comment?(user) ActionAuthorizer.new(user, "comment", self, nil).authorize.ok? end + def user_allowed_to_vote_comment?(user) + ActionAuthorizer.new(user, "vote_comment", self, nil).authorize.ok? + end + def shareable_url(share_token) EngineRouter.main_proxy(self).initiative_url(self, share_token: share_token.token) end diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb index 19a54708fd59a..83c31bc92a853 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb @@ -19,7 +19,6 @@
+ Notez que les participants devront satisfaire aux autorisations sélectionnées pour voter. Laisser toutes les cases à cocher vides permettra à toute personne enregistrée de voter. internal_type_title: Autorisations supplémentaires requises pour voter (facultatif) sign_in_description: Connectez-vous pour voter durant cette élection sign_up_description: Créer un compte pour voter durant cette élection @@ -184,6 +191,7 @@ fr-CA: state_values: finished: Terminées ongoing: En cours + scheduled: Programmé orders: end_at: Date de fin label: Trier par diff --git a/decidim-elections/config/locales/fr.yml b/decidim-elections/config/locales/fr.yml index 68d35c0b00b69..7244ea07f2183 100644 --- a/decidim-elections/config/locales/fr.yml +++ b/decidim-elections/config/locales/fr.yml @@ -40,6 +40,7 @@ fr: admin: census: edit: + choose_census: Choisissez le type de recensement que vous souhaitez utiliser pour cette élection created_at: Créée le identifier: Identifiant de l'utilisateur preview: @@ -71,6 +72,7 @@ fr: publish_button: Publier les résultats title: Résultats status: + census: 'Recensement:' results_availability: after_end: Résultats disponibles après la fin de l'élection per_question: Résultats disponibles par question @@ -80,6 +82,8 @@ fr: create: invalid: Il y a eu un problème lors de la création de l'élection. success: Élection créée avec succès. + dashboard: + subtitle: 'Étape finale: éxaminez vos détails. Des modifications peuvent toujours être apportées avant de publier. Une fois publiée, vous serez toujours en mesure de mettre à jour la description de l''élection.' edit: title: Modifier l'élection form: @@ -142,6 +146,9 @@ fr: internal_users: already_have_an_account?: Vous avez déjà un compte? are_you_new?: Nouveau participant ? + info_html: | + Vous pouvez restreindre la participation à l'élection aux participants qui ont une autorisation.
+ Notez que les participants devront satisfaire aux autorisations sélectionnées pour voter. Laisser toutes les cases à cocher vides permettra à toute personne enregistrée de voter. internal_type_title: Autorisations supplémentaires requises pour voter (facultatif) sign_in_description: Connectez-vous pour voter durant cette élection sign_up_description: Créer un compte pour voter durant cette élection @@ -184,6 +191,7 @@ fr: state_values: finished: Terminées ongoing: En cours + scheduled: Programmé orders: end_at: Date de fin label: Trier par diff --git a/decidim-elections/config/locales/ja.yml b/decidim-elections/config/locales/ja.yml index 56db4c3bd6645..550cb2d9ca32e 100644 --- a/decidim-elections/config/locales/ja.yml +++ b/decidim-elections/config/locales/ja.yml @@ -44,7 +44,6 @@ ja: choose_census: この選挙に使用したいセンサスの種類を選択してください created_at: 作成日時 identifier: ユーザーID - title: センサスの種類 preview: title: other: プレビューリストは %{count} レコードに制限されています。 diff --git a/decidim-elections/config/locales/sv.yml b/decidim-elections/config/locales/sv.yml index 79514ca975b30..e4888aa9694d9 100644 --- a/decidim-elections/config/locales/sv.yml +++ b/decidim-elections/config/locales/sv.yml @@ -39,7 +39,6 @@ sv: choose_census: Välj vilken typ av folkräkning du vill använda för detta val created_at: Skapad den identifier: Identifierare för användare - title: Typ av folkräkning preview: title: one: Förhandsgranskningen är begränsad till %{count} post. diff --git a/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb new file mode 100644 index 0000000000000..4e2d8aadcac24 --- /dev/null +++ b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddMaxChoicesToDecidimElectionsQuestions < ActiveRecord::Migration[7.2] + def change + add_column :decidim_elections_questions, :max_choices, :integer + end +end diff --git a/decidim-elections/decidim-elections.gemspec b/decidim-elections/decidim-elections.gemspec index e46c1f172e9a8..c4d592bca87f1 100644 --- a/decidim-elections/decidim-elections.gemspec +++ b/decidim-elections/decidim-elections.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-elections" s.summary = "A Decidim module for creating Elections." diff --git a/decidim-elections/lib/decidim/elections/test/factories.rb b/decidim-elections/lib/decidim/elections/test/factories.rb index 50ae7c6bd5cac..c50e57fc0fe00 100644 --- a/decidim-elections/lib/decidim/elections/test/factories.rb +++ b/decidim-elections/lib/decidim/elections/test/factories.rb @@ -69,8 +69,8 @@ end trait :with_questions do - after :create do |election, _evaluator| - create_list(:election_question, 2, :with_response_options, :voting_enabled, election:) + after :create do |election, evaluator| + create_list(:election_question, 2, :with_response_options, :voting_enabled, election:, skip_injection: evaluator.skip_injection) end end @@ -95,8 +95,12 @@ end factory :election_question, class: "Decidim::Elections::Question" do + transient do + skip_injection { false } + end + association :election - body { generate_localized_title(:question_body) } + body { generate_localized_title(:question_body, skip_injection:) } description { generate_localized_description(:question_description) } question_type { "multiple_option" } sequence(:position) { |n| n } diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb index 4d0d6369ec37b..b1d35796b0490 100644 --- a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb +++ b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb @@ -190,6 +190,67 @@ module Admin end end + context "when updating max_choices" do + let(:update_max_choices_params) do + { + "questions" => [ + { + "id" => first_question.id, + "body" => first_question.body, + "description" => first_question.description, + "question_type" => "multiple_option", + "max_choices" => 2, + "response_options" => [ + { "id" => first_question_first_option.id, "body" => first_question_first_option.body }, + { "id" => first_question_second_option.id, "body" => first_question_second_option.body } + ] + } + ] + } + end + + let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(update_max_choices_params).with_context(context_params) } + let(:command) { described_class.new(form, election) } + + it "updates max_choices field" do + command.call + updated = election.reload.questions.find_by(id: first_question.id) + expect(updated.max_choices).to eq(2) + end + end + + context "when adding a new question with max_choices" do + let(:add_with_max_choices_params) do + { + "questions" => [ + { + "body" => { en: "Q with max choices" }, + "description" => { en: "Description" }, + "question_type" => "multiple_option", + "max_choices" => 3, + "response_options" => [ + { "body" => { en: "Option 1" } }, + { "body" => { en: "Option 2" } }, + { "body" => { en: "Option 3" } }, + { "body" => { en: "Option 4" } } + ] + } + ] + } + end + + let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(add_with_max_choices_params).with_context(context_params) } + let(:command) { described_class.new(form, election) } + + it "creates a new question with max_choices" do + expect { command.call } + .to change { election.reload.questions.count }.by(1) + new_question = election.reload.questions.last + expect(new_question.max_choices).to eq(3) + expect(new_question.response_options.size).to eq(4) + end + end + context "when updating, deleting, and adding at once" do let(:combo_params) do { diff --git a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb index e340e150c9e3c..7cab91d3c4936 100644 --- a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb +++ b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb @@ -96,6 +96,56 @@ module Elections expect(session[:votes_buffer]).to eq({ question.id.to_s => nil, second_question.id.to_s => nil }) expect(response).to redirect_to(confirm_election_votes_path) end + + context "when question has max_choices limit" do + let!(:question_with_limit) do + create(:election_question, :voting_enabled, election:, question_type: "multiple_option", max_choices: 2) + end + let!(:option1) { create(:election_response_option, question: question_with_limit) } + let!(:option2) { create(:election_response_option, question: question_with_limit) } + let!(:option3) { create(:election_response_option, question: question_with_limit) } + + it "rejects vote when exceeding max_choices" do + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id, option2.id, option3.id] + } + ) + + expect(response).to have_http_status(:ok) + expect(flash[:alert]).to match(/cannot select more than 2/) + expect(subject).to render_template(:show) + end + + it "accepts vote when within max_choices limit" do + session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil } + + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id, option2.id] + } + ) + + expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s, option2.id.to_s]) + expect(response).to redirect_to(confirm_election_votes_path) + end + + it "accepts vote with less than max_choices" do + session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil } + + patch :update, params: params.merge( + id: question_with_limit.id, + response: { + question_with_limit.id.to_s => [option1.id] + } + ) + + expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s]) + expect(response).to redirect_to(confirm_election_votes_path) + end + end end end diff --git a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb index f5a0349884b82..75e3f42235347 100644 --- a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb +++ b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb @@ -55,6 +55,72 @@ module Admin it { is_expected.not_to be_valid } end + describe "max_choices validation" do + let(:attributes) do + { + body_en: body_en, + description_en: description_en, + question_type: question_type, + response_options: response_options, + max_choices: max_choices + } + end + + context "when max_choices is valid" do + let(:max_choices) { 2 } + + it { is_expected.to be_valid } + end + + context "when max_choices is greater than number of options" do + let(:max_choices) { 10 } + + it { is_expected.not_to be_valid } + + it "adds an error on max_choices" do + subject.valid? + expect(subject.errors[:max_choices]).not_to be_empty + end + end + + context "when max_choices is 1" do + let(:max_choices) { 1 } + + it { is_expected.not_to be_valid } + + it "adds an error on max_choices" do + subject.valid? + expect(subject.errors[:max_choices]).not_to be_empty + end + end + + context "when max_choices is nil" do + let(:max_choices) { nil } + + it { is_expected.to be_valid } + end + + context "when max_choices is blank string" do + let(:max_choices) { "" } + + it { is_expected.to be_valid } + end + end + + describe "#number_of_options" do + it "returns the count of response options" do + expect(subject.number_of_options).to eq(2) + end + + context "when there are no response options" do + let(:response_options) { {} } + + it "returns 0" do + expect(subject.number_of_options).to eq(0) + end + end + end + it_behaves_like "form to param", default_id: "questionnaire-question-id" end end diff --git a/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb index b97f8cf74614d..dc5f1b63cd5a4 100644 --- a/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb +++ b/decidim-elections/spec/forms/decidim/elections/internal_users_form_spec.rb @@ -18,6 +18,10 @@ module Censuses {} end + before do + organization.update!(available_authorizations: %w(dummy_authorization_handler)) + end + subject { described_class.new.with_context(election:, current_user: user) } it { is_expected.to be_valid } @@ -77,6 +81,9 @@ module Censuses it "adds an error for the base" do subject.validate expect(subject.errors[:base]).to include(I18n.t("decidim.elections.censuses.internal_users_form.invalid")) + expect(subject.authorization_status).to be_a(Decidim::ActionAuthorizer::AuthorizationStatusCollection) + expect(subject.authorization_status).not_to be_ok + expect(subject.authorization_status.statuses.first.data).to eq({ :extra_explanation => [{ :key => "extra_explanation.postal_codes", :params => { :scope => "decidim.verifications.dummy_authorization", :count => 1, :postal_codes => "08002" } }] }) end context "when the user does not match the options" do diff --git a/decidim-elections/spec/models/decidim/elections/question_spec.rb b/decidim-elections/spec/models/decidim/elections/question_spec.rb index 3f33d9493f9e4..fad27465bc732 100644 --- a/decidim-elections/spec/models/decidim/elections/question_spec.rb +++ b/decidim-elections/spec/models/decidim/elections/question_spec.rb @@ -155,6 +155,22 @@ module Elections it "returns the count of response options" do expect(subject.max_votable_options).to eq(2) end + + context "when max_choices is set" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) } + + it "returns the max_choices value" do + expect(subject.max_votable_options).to eq(1) + end + end + + context "when max_choices is nil" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: nil) } + + it "returns the count of response options" do + expect(subject.max_votable_options).to eq(2) + end + end end end @@ -182,6 +198,15 @@ module Elections expect(question.safe_responses(response_ids)).to be_empty end end + + context "when max_choices is set" do + let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) } + + it "returns only max_choices number of responses" do + response_ids = question.response_options.pluck(:id) + expect(question.safe_responses(response_ids).count).to eq(1) + end + end end describe "#sibling_questions" do diff --git a/decidim-elections/spec/system/admin/admin_access_spec.rb b/decidim-elections/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..ce6e0ca70a8a0 --- /dev/null +++ b/decidim-elections/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "elections" } + let!(:election) { create(:election, :with_token_csv_census, :published, component:) } + let(:title) { "Elections" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb index 74495a43005ea..53e36e01b138a 100644 --- a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb +++ b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb @@ -225,6 +225,74 @@ end end + context "when admin user sets max_choices for multiple_option question" do + it "creates a question with max_choices" do + visit questions_edit_path + + click_on "Add question" + expand_all_questions + + within "form.edit_questions" do + within page.all(".questionnaire-question").first do + fill_in find_nested_form_field_locator("body_en"), with: "Select up to 2 options" + select "Multiple option", from: "Type" + + 3.times { click_on "Add response option" } + + page.all(".questionnaire-question-response-option").each_with_index do |option, idx| + within option do + fill_in find_nested_form_field_locator("body_en"), with: "Option #{idx + 1}" + end + end + + select "2", from: "Maximum number of choices" + end + end + + click_on "Save and continue" + + expect(page).to have_admin_callout("successfully") + + visit questions_edit_path + expand_all_questions + + expect(page).to have_css("input[value='Select up to 2 options']") + expect(election.questions.last.max_choices).to eq(2) + end + + it "updates max_choices on existing question" do + question = create(:election_question, :with_response_options, + election:, + question_type: "multiple_option", + max_choices: nil) + + visit questions_edit_path + find("#questionnaire_question_#{question.id}-button").click + + within "#accordion-questionnaire_question_#{question.id}-field" do + select "2", from: "Maximum number of choices" + end + + click_on "Save and continue" + + expect(page).to have_admin_callout("successfully") + expect(question.reload.max_choices).to eq(2) + end + + it "shows 'Any' option for max_choices when unset" do + question = create(:election_question, :with_response_options, + election:, + question_type: "multiple_option") + + visit questions_edit_path + find("#questionnaire_question_#{question.id}-button").click + + within "#accordion-questionnaire_question_#{question.id}-field" do + expect(page).to have_select("Maximum number of choices", selected: "Any") + end + end + end + private def find_nested_form_field_locator(attribute, visible: :visible) diff --git a/decidim-elections/spec/system/election_results_spec.rb b/decidim-elections/spec/system/election_results_spec.rb index a5c9adb11fb4f..0653401acf4d2 100644 --- a/decidim-elections/spec/system/election_results_spec.rb +++ b/decidim-elections/spec/system/election_results_spec.rb @@ -4,7 +4,7 @@ require "decidim/elections/test/vote_examples" describe "Dashboard" do - let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions) } + let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions, skip_injection: true) } let(:question1) { election.questions.first } let(:question2) { election.questions.second } let(:option11) { question1.response_options.first } @@ -70,8 +70,8 @@ def expect_vote_count(question, option, count) context "when the election is per question" do let(:election) { create(:election, :published, :ongoing, :per_question, :with_internal_users_census) } - let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:) } - let!(:question2) { create(:election_question, :with_response_options, election:) } + let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) } + let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true) } let(:option11) { question1.response_options.first } let(:option12) { question1.response_options.second } let(:option21) { question2.response_options.first } @@ -84,7 +84,7 @@ def expect_vote_count(question, option, count) end context "when all questions are enabled" do - let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:) } + let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) } it_behaves_like "shows questions in an election" end diff --git a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb index bed6fc96a6fb4..54ec42daacb07 100644 --- a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb +++ b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb @@ -6,8 +6,8 @@ describe "Dashboard" do let(:user) { create(:user, :confirmed, organization:) } let!(:election) { create(:election, :published, :ongoing, :with_internal_users_census, census_settings:) } - let!(:question1) { create(:election_question, :with_response_options, election:, question_type: "single_option") } - let!(:question2) { create(:election_question, :with_response_options, election:, question_type: "multiple_option") } + let!(:question1) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "single_option") } + let!(:question2) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "multiple_option") } let(:organization) { election.organization } let(:census_settings) do { @@ -30,6 +30,7 @@ def election_vote_path(question) end before do + organization.update!(available_authorizations: %w(dummy_authorization_handler)) switch_to_host(organization.host) end @@ -94,6 +95,10 @@ def election_vote_path(question) let(:election) { create(:election, :published, :finished, :with_internal_users_census) } it "does not allow to vote" do + within(".menu-bar") do + expect(page).to have_content(translated(election.component.name)) + expect(page).to have_content(translated(election.title)) + end expect(page).to have_no_link("Vote") expect(page).to have_no_content("You have already voted.") visit new_election_vote_path @@ -103,6 +108,62 @@ def election_vote_path(question) end end + context "when question has max_choices limit", :js do + let(:election_with_limit) { create(:election, :published, :ongoing, :with_internal_users_census, component: election.component) } + let!(:question_with_limit) { create(:election_question, election: election_with_limit, question_type: "multiple_option", max_choices: 2, body: { en: "Choose your options" }) } + let!(:option1) { create(:election_response_option, question: question_with_limit, body: { en: "Option 1" }) } + let!(:option2) { create(:election_response_option, question: question_with_limit, body: { en: "Option 2" }) } + let!(:option3) { create(:election_response_option, question: question_with_limit, body: { en: "Option 3" }) } + let(:new_election_with_limit_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election_with_limit.id) } + + before do + login_as user, scope: :user + visit new_election_with_limit_vote_path + end + + it "shows max_choices in question title" do + expect(page).to have_content("Choose your options (Max choices: 2)") + end + + it "shows alert when selecting more than max_choices" do + check "Option 1" + check "Option 2" + check "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :visible) + end + + it "hides alert when deselecting options" do + check "Option 1" + check "Option 2" + check "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :visible) + + uncheck "Option 3" + + expect(page).to have_css(".max-choices-alert", visible: :hidden) + end + + it "shows server-side validation error when exceeding limit" do + check "Option 1" + check "Option 2" + check "Option 3" + + click_on "Next" + + expect(page).to have_content("You cannot select more than 2 options") + end + + context "when question is single_option" do + let!(:single_question) { create(:election_question, election: election_with_limit, question_type: "single_option", body: { en: "Choose one option" }) } + + it "does not show max_choices for single_option questions" do + expect(page).to have_no_content("Choose one option (Max choices:") + end + end + end + context "when the election is per_question" do let(:election) { create(:election, :published, :ongoing, :with_internal_users_census, :per_question) } diff --git a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb index 87f3717b88796..7be60f6e774b7 100644 --- a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb +++ b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb @@ -21,8 +21,8 @@ let(:receipt_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).receipt_election_per_question_votes_path(election_id: election.id) } let(:confirm_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).confirm_election_per_question_votes_path(election_id: election.id) } let(:new_election_normal_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election.id) } - let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, question_type: "single_option", election:, position: 1) } - let!(:question2) { create(:election_question, :with_response_options, election:, position: 2) } + let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, skip_injection: true, question_type: "single_option", election:, position: 1) } + let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 2) } let(:voter_uid) { user.to_global_id.to_s } def election_vote_path(question) @@ -62,8 +62,8 @@ def election_vote_path(question) end context "when navigating through already voted questions" do - let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, position: 2) } - let!(:question3) { create(:election_question, :with_response_options, election:, position: 3) } + let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true, position: 2) } + let!(:question3) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 3) } before do login_as user, scope: :user diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml index ede0eb99271a5..3faf10583f609 100644 --- a/decidim-forms/config/locales/eu.yml +++ b/decidim-forms/config/locales/eu.yml @@ -139,7 +139,7 @@ eu: remove: Kendu separator: Bereizlea title_and_description: - collapse: Kolapsoa + collapse: Tolestu description: Deskribapena expand: Zabaldu remove: Kendu @@ -195,7 +195,7 @@ eu: body: Galdetegi honen ezaugarri batzuk desaktibatu egingo dira. Zure esperientzia hobetzeko, gaitu JavaScript zure nabigatzailean. title: Javascript desaktibatuta dago questionnaire_not_published: - body: Argitalpen hau oraindik ez da argitaratu. + body: Formulario hau ez da oraindik argitaratu. questionnaire_responded: body: Dagoeneko inkesta hau erantzun duzu. title: Dagoeneko erantzunda diff --git a/decidim-forms/decidim-forms.gemspec b/decidim-forms/decidim-forms.gemspec index e0220203de50f..0ce9b4620b584 100644 --- a/decidim-forms/decidim-forms.gemspec +++ b/decidim-forms/decidim-forms.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-forms" s.summary = "Decidim forms" diff --git a/decidim-forms/lib/decidim/forms/test/factories.rb b/decidim-forms/lib/decidim/forms/test/factories.rb index d831bc65dc4b7..1aef9e948a7bf 100644 --- a/decidim-forms/lib/decidim/forms/test/factories.rb +++ b/decidim-forms/lib/decidim/forms/test/factories.rb @@ -117,14 +117,18 @@ end trait :with_response_options do - response_options do - Array.new(3).collect { build(:response_option, skip_injection:) } + after(:build) do |question, evaluator| + question.response_options = Array.new(3).collect do + build(:response_option, question:, skip_injection: evaluator.skip_injection) + end end end trait :conditioned do - display_conditions do - Array.new(3).collect { build(:display_condition, skip_injection:) } + after(:build) do |question, evaluator| + question.display_conditions = Array.new(3).collect do + build(:display_condition, question:, skip_injection: evaluator.skip_injection) + end end end @@ -194,7 +198,7 @@ transient do skip_injection { false } end - condition_question { create(:questionnaire_question, skip_injection:) } + condition_question { create(:questionnaire_question, questionnaire: question.questionnaire, skip_injection:) } question { create(:questionnaire_question, position: 1, skip_injection:) } condition_type { :responded } mandatory { true } diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock index 85ca866494936..444107ddf8bd0 100644 --- a/decidim-generators/Gemfile.lock +++ b/decidim-generators/Gemfile.lock @@ -17,7 +17,6 @@ PATH decidim-pages (= 0.32.0.dev) decidim-participatory_processes (= 0.32.0.dev) decidim-proposals (= 0.32.0.dev) - decidim-sortitions (= 0.32.0.dev) decidim-surveys (= 0.32.0.dev) decidim-system (= 0.32.0.dev) decidim-verifications (= 0.32.0.dev) @@ -187,11 +186,6 @@ PATH decidim-core (= 0.32.0.dev) doc2text (~> 0.4.0, >= 0.4.8) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.32.0.dev) - decidim-admin (= 0.32.0.dev) - decidim-comments (= 0.32.0.dev) - decidim-core (= 0.32.0.dev) - decidim-proposals (= 0.32.0.dev) decidim-surveys (0.32.0.dev) decidim-core (= 0.32.0.dev) decidim-forms (= 0.32.0.dev) @@ -342,7 +336,7 @@ GEM fast-stemmer (~> 1.0) matrix (~> 0.4) cmdparse (3.0.7) - commonmarker (0.23.11) + commonmarker (0.23.12) concurrent-ruby (1.3.5) connection_pool (2.5.4) crack (1.0.0) @@ -934,7 +928,7 @@ DEPENDENCIES web-console (~> 4.2) RUBY VERSION - ruby 3.3.4p94 + ruby 3.4.7p58 BUNDLED WITH 2.4.20 diff --git a/decidim-generators/decidim-generators.gemspec b/decidim-generators/decidim-generators.gemspec index 078ba9acc0dd0..bb97cc67019b2 100644 --- a/decidim-generators/decidim-generators.gemspec +++ b/decidim-generators/decidim-generators.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-generators" diff --git a/decidim-generators/exe/decidim b/decidim-generators/exe/decidim index 0e047a7add583..f778b9ce4e838 100755 --- a/decidim-generators/exe/decidim +++ b/decidim-generators/exe/decidim @@ -9,25 +9,25 @@ if File.exist?(File.expand_path("../../.git", __dir__)) end case ARGV[0] -when "--component" +when "--component", "-c" ARGV.replace(["component", *ARGV[1..-1]]) require "decidim/generators/component_generator" Decidim::Generators::ComponentGenerator.start -when "--version" +when "--version", "-v" require "decidim/core/version" puts Decidim::Core.version -when "--help" +when "--help", "-h" require "decidim/core/version" puts "Decidim #{Decidim::Core.version} Syntax: decidim [options] [App or Module name] https://decidim.org Options: - --help display this help and exit - --version output version information and exit - --component [name] creates a component for Decidim + -h, --help display this help and exit + -v, --version output version information and exit + -c, --component [name] creates a component for Decidim [name] creates an application based on Decidim App generation extra options (ignored if the --component flag is on): @@ -48,6 +48,10 @@ App generation extra options (ignored if the --component flag is on): --seed_db [true|false] Seed the database: generate demo data for each participatory space and component --recreate_db Recreate the database after installing Decidim +Component generation extra options (ignored if the --component flag is not defined) + --external To create a new module external to the main decidim repository + --destination-folder IF you want to point to an existing folder or give it a custom name + Examples: decidim my-application decidim --storage=s3 my-application @@ -55,6 +59,9 @@ Examples: decidim --locales=en,ca,es,fr my-application decidim --queue sidekiq my-application decidim --queue sidekiq --storage s3 my-application + + decidim --component --external my_component + decidim --component --external my_component --destination-folder my-comp " else require "decidim/generators/app_generator" diff --git a/decidim-generators/lib/decidim/generators/app_generator.rb b/decidim-generators/lib/decidim/generators/app_generator.rb index 344f2329303cf..d9dcaaa69e581 100644 --- a/decidim-generators/lib/decidim/generators/app_generator.rb +++ b/decidim-generators/lib/decidim/generators/app_generator.rb @@ -323,8 +323,7 @@ def modify_gitignore # Ignore the files and folders generated through Webpack /public/decidim-packs /public/packs-test - /public/sw.js - /public/sw.js.map + /public/sw.js* # Ignore node modules /node_modules diff --git a/decidim-generators/lib/decidim/generators/app_templates/.ruby-version b/decidim-generators/lib/decidim/generators/app_templates/.ruby-version index a0891f563f38b..2aa5131992119 100644 --- a/decidim-generators/lib/decidim/generators/app_templates/.ruby-version +++ b/decidim-generators/lib/decidim/generators/app_templates/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.7 diff --git a/decidim-generators/lib/decidim/generators/component_templates/.ruby-version b/decidim-generators/lib/decidim/generators/component_templates/.ruby-version index a0891f563f38b..2aa5131992119 100644 --- a/decidim-generators/lib/decidim/generators/component_templates/.ruby-version +++ b/decidim-generators/lib/decidim/generators/component_templates/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.7 diff --git a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb index afe754f4f9f99..a79d068133eee 100644 --- a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb +++ b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb @@ -18,7 +18,7 @@ def base_query end def search_field_predicate - :title_or_description_or_id_string_or_author_name_or_author_nickname_cont + :title_or_description_or_author_name_or_author_nickname_cont end def filters diff --git a/decidim-initiatives/app/models/decidim/initiative.rb b/decidim-initiatives/app/models/decidim/initiative.rb index 93bfcd3476409..df2118eb55a85 100644 --- a/decidim-initiatives/app/models/decidim/initiative.rb +++ b/decidim-initiatives/app/models/decidim/initiative.rb @@ -450,6 +450,10 @@ def user_allowed_to_comment?(user) ActionAuthorizer.new(user, "comment", self, nil).authorize.ok? end + def user_allowed_to_vote_comment?(user) + ActionAuthorizer.new(user, "vote_comment", self, nil).authorize.ok? + end + def shareable_url(share_token) EngineRouter.main_proxy(self).initiative_url(self, share_token: share_token.token) end diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb index 19a54708fd59a..83c31bc92a853 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb @@ -19,7 +19,6 @@
| <%= t("models.initiatives.fields.id", scope: "decidim.admin") %> | <%= t("models.initiatives.fields.title", scope: "decidim.admin") %> | <%= t("models.initiatives.fields.state", scope: "decidim.admin") %> | <%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %> | @@ -31,7 +30,6 @@||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| "><%= initiative.id %> | "> <% if allowed_to? :edit, :initiative, initiative: initiative %> <%= link_to translated_attribute(initiative.title), diff --git a/decidim-initiatives/config/locales/ar.yml b/decidim-initiatives/config/locales/ar.yml index d56a3199a3994..85925b7e0ad35 100644 --- a/decidim-initiatives/config/locales/ar.yml +++ b/decidim-initiatives/config/locales/ar.yml @@ -68,7 +68,6 @@ ar: initiatives: fields: created_at: أنشئت في - id: هوية شخصية state: الحالة supports_count: توقيعات title: المبادرات diff --git a/decidim-initiatives/config/locales/bg.yml b/decidim-initiatives/config/locales/bg.yml index e1ed9cf8c1dbf..48c836ebc93f4 100644 --- a/decidim-initiatives/config/locales/bg.yml +++ b/decidim-initiatives/config/locales/bg.yml @@ -111,7 +111,6 @@ bg: initiatives: fields: created_at: Създадено на - id: ID published_at: Публикувано на state: Статус supports_count: Подписи diff --git a/decidim-initiatives/config/locales/ca-IT.yml b/decidim-initiatives/config/locales/ca-IT.yml index 44ec84876aaeb..450b14f52f788 100644 --- a/decidim-initiatives/config/locales/ca-IT.yml +++ b/decidim-initiatives/config/locales/ca-IT.yml @@ -96,7 +96,7 @@ ca-IT: type_id_eq: label: Tipus search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria + title_or_description_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria initiatives_settings: update: error: S'ha produït un error en actualitzar la configuració de les iniciatives. @@ -118,7 +118,6 @@ ca-IT: initiatives: fields: created_at: Data de creació - id: ID published_at: Publicat el state: Estat supports_count: Signatures @@ -687,6 +686,7 @@ ca-IT: initiative: actions: comment: Comentar + vote_comment: Votar el comentari initiatives_type: actions: create: Crear una iniciativa diff --git a/decidim-initiatives/config/locales/ca.yml b/decidim-initiatives/config/locales/ca.yml index cda6777ada941..7825a93223e6e 100644 --- a/decidim-initiatives/config/locales/ca.yml +++ b/decidim-initiatives/config/locales/ca.yml @@ -96,7 +96,7 @@ ca: type_id_eq: label: Tipus search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria + title_or_description_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria initiatives_settings: update: error: S'ha produït un error en actualitzar la configuració de les iniciatives. @@ -118,7 +118,6 @@ ca: initiatives: fields: created_at: Data de creació - id: ID published_at: Publicat el state: Estat supports_count: Signatures @@ -687,6 +686,7 @@ ca: initiative: actions: comment: Comentar + vote_comment: Votar el comentari initiatives_type: actions: create: Crear una iniciativa diff --git a/decidim-initiatives/config/locales/cs.yml b/decidim-initiatives/config/locales/cs.yml index 73903772a73f2..b84342d94c7ed 100644 --- a/decidim-initiatives/config/locales/cs.yml +++ b/decidim-initiatives/config/locales/cs.yml @@ -122,7 +122,6 @@ cs: initiatives: fields: created_at: Vytvořeno v - id: ID published_at: Publikováno v state: Stav supports_count: Podpisy diff --git a/decidim-initiatives/config/locales/de.yml b/decidim-initiatives/config/locales/de.yml index dd86a8a6c8bfd..8949af2e45cff 100644 --- a/decidim-initiatives/config/locales/de.yml +++ b/decidim-initiatives/config/locales/de.yml @@ -95,8 +95,6 @@ de: validating: Technische Validierung type_id_eq: label: Typ - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Suche in %{collection} nach Titel, Beschreibung, ID oder Autoren initiatives_settings: update: error: Beim Aktualisieren der Initiativeneinstellungen ist ein Fehler aufgetreten. @@ -118,7 +116,6 @@ de: initiatives: fields: created_at: Erstellt am - id: ID published_at: Veröffentlicht am state: Status supports_count: Unterschriften diff --git a/decidim-initiatives/config/locales/el.yml b/decidim-initiatives/config/locales/el.yml index 1e7434e586960..4c1c277aa2155 100644 --- a/decidim-initiatives/config/locales/el.yml +++ b/decidim-initiatives/config/locales/el.yml @@ -66,7 +66,6 @@ el: initiatives: fields: created_at: Δημιουργήθηκε στις - id: Αναγνωριστικό published_at: Δημοσιεύτηκε στις state: Κατάσταση supports_count: Υπογραφές diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml index 92827bf22f216..60adc39386bcf 100644 --- a/decidim-initiatives/config/locales/en.yml +++ b/decidim-initiatives/config/locales/en.yml @@ -97,7 +97,7 @@ en: type_id_eq: label: Type search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Search %{collection} by title, description, ID or author name + title_or_description_or_author_name_or_author_nickname_cont: Search %{collection} by title, description, or author name initiatives_settings: update: error: There was a problem updating the initiatives settings. @@ -119,7 +119,6 @@ en: initiatives: fields: created_at: Created at - id: ID published_at: Published at state: Status supports_count: Signatures @@ -688,6 +687,7 @@ en: initiative: actions: comment: Comment + vote_comment: Vote comment initiatives_type: actions: create: Create an initiative diff --git a/decidim-initiatives/config/locales/es-MX.yml b/decidim-initiatives/config/locales/es-MX.yml index c6d2597552805..236ecf58b917a 100644 --- a/decidim-initiatives/config/locales/es-MX.yml +++ b/decidim-initiatives/config/locales/es-MX.yml @@ -96,7 +96,7 @@ es-MX: type_id_eq: label: Tipo search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría + title_or_description_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría initiatives_settings: update: error: Se produjo un problema al actualizar la configuración de las iniciativas. @@ -118,7 +118,6 @@ es-MX: initiatives: fields: created_at: Creado en - id: CARNÉ DE IDENTIDAD published_at: Publicada en state: Estado supports_count: Firmas @@ -687,6 +686,7 @@ es-MX: initiative: actions: comment: Comentar + vote_comment: Votar el comentario initiatives_type: actions: create: Crear una iniciativa diff --git a/decidim-initiatives/config/locales/es-PY.yml b/decidim-initiatives/config/locales/es-PY.yml index 9b6f30f9d3e46..fc51b30d3dd40 100644 --- a/decidim-initiatives/config/locales/es-PY.yml +++ b/decidim-initiatives/config/locales/es-PY.yml @@ -96,7 +96,7 @@ es-PY: type_id_eq: label: Tipo search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría + title_or_description_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría initiatives_settings: update: error: Se produjo un problema al actualizar la configuración de las iniciativas. @@ -118,7 +118,6 @@ es-PY: initiatives: fields: created_at: Creado en - id: CARNÉ DE IDENTIDAD published_at: Publicada en state: Estado supports_count: Firmas @@ -687,6 +686,7 @@ es-PY: initiative: actions: comment: Comentar + vote_comment: Votar el comentario initiatives_type: actions: create: Crear una iniciativa diff --git a/decidim-initiatives/config/locales/es.yml b/decidim-initiatives/config/locales/es.yml index 812a353df7273..95543251355d3 100644 --- a/decidim-initiatives/config/locales/es.yml +++ b/decidim-initiatives/config/locales/es.yml @@ -96,7 +96,7 @@ es: type_id_eq: label: Tipo search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría + title_or_description_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría initiatives_settings: update: error: Se produjo un problema al actualizar la configuración de las iniciativas. @@ -118,7 +118,6 @@ es: initiatives: fields: created_at: Creado en - id: ID published_at: Publicada el state: Estado supports_count: Firmas @@ -687,6 +686,7 @@ es: initiative: actions: comment: Comentar + vote_comment: Votar el comentario initiatives_type: actions: create: Crear una iniciativa diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml index 12346f4bb34dc..3bc1263ba7b8e 100644 --- a/decidim-initiatives/config/locales/eu.yml +++ b/decidim-initiatives/config/locales/eu.yml @@ -95,8 +95,6 @@ eu: validating: Baliozkotze teknikoa type_id_eq: label: Mota - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Bilatu %{collection} izenburuaren, deskribapenaren, IDaren edo egiletzaren arabera initiatives_settings: update: error: Arazo bat izan da ekimenen konfigurazioak eguneratzean. @@ -118,7 +116,6 @@ eu: initiatives: fields: created_at: Sortze-data - id: ID published_at: Argitaratze-data state: Egoera supports_count: Sinadurak diff --git a/decidim-initiatives/config/locales/fi-plain.yml b/decidim-initiatives/config/locales/fi-plain.yml index 794e55b6339eb..22ea49a2e9554 100644 --- a/decidim-initiatives/config/locales/fi-plain.yml +++ b/decidim-initiatives/config/locales/fi-plain.yml @@ -95,8 +95,6 @@ fi-pl: validating: Teknisessä validoinnissa type_id_eq: label: Tyyppi - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Hae kohteesta %{collection} otsikon, kuvauksen, ID-numeron tai tekijän nimen perusteella initiatives_settings: update: error: Aloitteiden asetusten päivittäminen epäonnistui. @@ -118,7 +116,6 @@ fi-pl: initiatives: fields: created_at: Luontiaika - id: ID published_at: Julkaisuaika state: Maakunta/osavaltio supports_count: Allekirjoituksia diff --git a/decidim-initiatives/config/locales/fi.yml b/decidim-initiatives/config/locales/fi.yml index 94569eb72433c..5d622d101e8a3 100644 --- a/decidim-initiatives/config/locales/fi.yml +++ b/decidim-initiatives/config/locales/fi.yml @@ -95,8 +95,6 @@ fi: validating: Teknisessä validoinnissa type_id_eq: label: Tyyppi - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Hae kohteesta %{collection} otsikon, kuvauksen, ID-numeron tai tekijän nimen perusteella initiatives_settings: update: error: Aloitteiden asetusten päivittäminen epäonnistui. @@ -118,7 +116,6 @@ fi: initiatives: fields: created_at: Luontiaika - id: ID published_at: Julkaisuaika state: Tila supports_count: Allekirjoitusta diff --git a/decidim-initiatives/config/locales/fr-CA.yml b/decidim-initiatives/config/locales/fr-CA.yml index 2334d76e6e1a6..71b433a759466 100644 --- a/decidim-initiatives/config/locales/fr-CA.yml +++ b/decidim-initiatives/config/locales/fr-CA.yml @@ -94,7 +94,7 @@ fr-CA: type_id_eq: label: Type d'initiative search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description, ID ou nom de l'auteur + title_or_description_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description ou nom de l'auteur initiatives_settings: update: success: Les paramètres des pétitions ont bien été mis à jour. @@ -115,7 +115,6 @@ fr-CA: initiatives: fields: created_at: Créé à - id: ID published_at: Publiée à state: État supports_count: Signatures @@ -572,6 +571,7 @@ fr-CA: initiative: actions: comment: Commenter + vote_comment: Vote sur le commentaire initiatives_type: actions: title: Actions diff --git a/decidim-initiatives/config/locales/fr.yml b/decidim-initiatives/config/locales/fr.yml index 024f96cb54f51..0136ce82712a3 100644 --- a/decidim-initiatives/config/locales/fr.yml +++ b/decidim-initiatives/config/locales/fr.yml @@ -94,7 +94,7 @@ fr: type_id_eq: label: Type de pétition search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description, ID ou nom de l'auteur + title_or_description_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description ou nom de l'auteur initiatives_settings: update: success: Les paramètres des pétitions ont bien été mis à jour. @@ -115,7 +115,6 @@ fr: initiatives: fields: created_at: Créé à - id: ID published_at: Publiée à state: État supports_count: Signatures @@ -572,6 +571,7 @@ fr: initiative: actions: comment: Commenter + vote_comment: Vote sur le commentaire initiatives_type: actions: title: Actions diff --git a/decidim-initiatives/config/locales/ga-IE.yml b/decidim-initiatives/config/locales/ga-IE.yml index 71cb86bd126b2..179674e5350cd 100644 --- a/decidim-initiatives/config/locales/ga-IE.yml +++ b/decidim-initiatives/config/locales/ga-IE.yml @@ -37,7 +37,6 @@ ga: models: initiatives: fields: - id: ID state: Stádas initiatives_type_scope: fields: diff --git a/decidim-initiatives/config/locales/gl.yml b/decidim-initiatives/config/locales/gl.yml index 3db7e3af43b67..9d9bfe1f052bc 100644 --- a/decidim-initiatives/config/locales/gl.yml +++ b/decidim-initiatives/config/locales/gl.yml @@ -58,7 +58,6 @@ gl: initiatives: fields: created_at: Creado en - id: ID state: Estado supports_count: Sinaturas title: Iniciativas diff --git a/decidim-initiatives/config/locales/hu.yml b/decidim-initiatives/config/locales/hu.yml index 4fb31cb31bbde..bf2cab5327663 100644 --- a/decidim-initiatives/config/locales/hu.yml +++ b/decidim-initiatives/config/locales/hu.yml @@ -102,7 +102,6 @@ hu: initiatives: fields: created_at: 'Létrehozva:' - id: ID published_at: Publikálás ideje state: Állapot supports_count: Aláírások diff --git a/decidim-initiatives/config/locales/id-ID.yml b/decidim-initiatives/config/locales/id-ID.yml index 48ba6bf066a59..3f6ab86ecb35d 100644 --- a/decidim-initiatives/config/locales/id-ID.yml +++ b/decidim-initiatives/config/locales/id-ID.yml @@ -53,7 +53,6 @@ id: initiatives: fields: created_at: Dibuat di - id: ID state: Negara supports_count: Tanda tangan title: Inisiatif diff --git a/decidim-initiatives/config/locales/it.yml b/decidim-initiatives/config/locales/it.yml index 282eaa3bfc8b7..7fee86bd4165d 100644 --- a/decidim-initiatives/config/locales/it.yml +++ b/decidim-initiatives/config/locales/it.yml @@ -88,7 +88,6 @@ it: initiatives: fields: created_at: Creato il - id: ID published_at: Pubblicato il state: Stato supports_count: Firme diff --git a/decidim-initiatives/config/locales/ja.yml b/decidim-initiatives/config/locales/ja.yml index 8f34ea4a8521c..ec4b11ebd5fe9 100644 --- a/decidim-initiatives/config/locales/ja.yml +++ b/decidim-initiatives/config/locales/ja.yml @@ -92,8 +92,6 @@ ja: validating: 技術的検証 type_id_eq: label: タイプ - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: '%{collection} をタイトル、説明、ID、著者名で検索' initiatives_settings: update: error: イニシアチブ設定の更新中に問題が発生しました。 @@ -115,7 +113,6 @@ ja: initiatives: fields: created_at: 作成日時 - id: ID published_at: 公開日時 state: ステータス supports_count: 署名 diff --git a/decidim-initiatives/config/locales/lb.yml b/decidim-initiatives/config/locales/lb.yml index 6eb5b0b1eaf94..9220ab06b52ac 100644 --- a/decidim-initiatives/config/locales/lb.yml +++ b/decidim-initiatives/config/locales/lb.yml @@ -85,7 +85,6 @@ lb: initiatives: fields: created_at: Erstellt am - id: ID published_at: Veröffentlicht am state: Status supports_count: Unterschriften diff --git a/decidim-initiatives/config/locales/lt.yml b/decidim-initiatives/config/locales/lt.yml index 73347a4409052..e510452887251 100644 --- a/decidim-initiatives/config/locales/lt.yml +++ b/decidim-initiatives/config/locales/lt.yml @@ -111,7 +111,6 @@ lt: initiatives: fields: created_at: Sukurta - id: ID published_at: Publikuota state: Būsena supports_count: Parašai diff --git a/decidim-initiatives/config/locales/nl.yml b/decidim-initiatives/config/locales/nl.yml index 81466883883dc..cd6f6459ce634 100644 --- a/decidim-initiatives/config/locales/nl.yml +++ b/decidim-initiatives/config/locales/nl.yml @@ -69,7 +69,6 @@ nl: initiatives: fields: created_at: Aangemaakt op - id: ID kaart published_at: Gepubliceerd op state: Status supports_count: Handtekeningen diff --git a/decidim-initiatives/config/locales/no.yml b/decidim-initiatives/config/locales/no.yml index 1bc89c9bcc240..3b795d018cc33 100644 --- a/decidim-initiatives/config/locales/no.yml +++ b/decidim-initiatives/config/locales/no.yml @@ -86,7 +86,6 @@ initiatives: fields: created_at: Opprettet på - id: ID published_at: Publisert i state: Status supports_count: Underskrifter diff --git a/decidim-initiatives/config/locales/pl.yml b/decidim-initiatives/config/locales/pl.yml index fe020ce12e2ca..ae790c50bef07 100644 --- a/decidim-initiatives/config/locales/pl.yml +++ b/decidim-initiatives/config/locales/pl.yml @@ -117,7 +117,6 @@ pl: initiatives: fields: created_at: Utworzono - id: ID published_at: Opublikowano state: Stan supports_count: Podpisy diff --git a/decidim-initiatives/config/locales/pt-BR.yml b/decidim-initiatives/config/locales/pt-BR.yml index 18faf2c67f14f..5e01705bcb1a4 100644 --- a/decidim-initiatives/config/locales/pt-BR.yml +++ b/decidim-initiatives/config/locales/pt-BR.yml @@ -94,7 +94,6 @@ pt-BR: initiatives: fields: created_at: Criado em - id: identidade published_at: Publicado em state: Estado supports_count: Assinaturas diff --git a/decidim-initiatives/config/locales/pt.yml b/decidim-initiatives/config/locales/pt.yml index 715590bdc0fe6..2ec4eb919075f 100644 --- a/decidim-initiatives/config/locales/pt.yml +++ b/decidim-initiatives/config/locales/pt.yml @@ -85,7 +85,6 @@ pt: initiatives: fields: created_at: Criado em - id: Identidade published_at: Publicado em state: Estado supports_count: Assinaturas diff --git a/decidim-initiatives/config/locales/ro-RO.yml b/decidim-initiatives/config/locales/ro-RO.yml index 4204d5c137e2f..b1359215bf439 100644 --- a/decidim-initiatives/config/locales/ro-RO.yml +++ b/decidim-initiatives/config/locales/ro-RO.yml @@ -100,7 +100,6 @@ ro: initiatives: fields: created_at: Creat la - id: ID published_at: Publicat la state: Status supports_count: Semnături diff --git a/decidim-initiatives/config/locales/sk.yml b/decidim-initiatives/config/locales/sk.yml index 5de6c91811186..c63ae655ec065 100644 --- a/decidim-initiatives/config/locales/sk.yml +++ b/decidim-initiatives/config/locales/sk.yml @@ -60,7 +60,6 @@ sk: initiatives: fields: created_at: Vytvorené u - id: ID state: Štát supports_count: Podpisy title: Iniciatívy diff --git a/decidim-initiatives/config/locales/sv.yml b/decidim-initiatives/config/locales/sv.yml index 312bc7f0adb47..a7b8f1aa2eba6 100644 --- a/decidim-initiatives/config/locales/sv.yml +++ b/decidim-initiatives/config/locales/sv.yml @@ -93,8 +93,6 @@ sv: validating: Teknisk validering type_id_eq: label: Typ - search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Sök %{collection} med titel, beskrivning, ID eller författarnamn initiatives_settings: update: error: Det gick inte att uppdatera inställningarna för initiativ. @@ -116,7 +114,6 @@ sv: initiatives: fields: created_at: Skapad - id: ID published_at: Publicerad state: Status supports_count: Underskrifter diff --git a/decidim-initiatives/config/locales/tr-TR.yml b/decidim-initiatives/config/locales/tr-TR.yml index 82d0df5b36d5f..2c8de984dc3da 100644 --- a/decidim-initiatives/config/locales/tr-TR.yml +++ b/decidim-initiatives/config/locales/tr-TR.yml @@ -83,7 +83,6 @@ tr: initiatives: fields: created_at: Düzenlendi - id: İD published_at: Tarihinde yayınlandı state: Belirtmek, bildirmek supports_count: İmzalar diff --git a/decidim-initiatives/config/locales/zh-CN.yml b/decidim-initiatives/config/locales/zh-CN.yml index af8dc822f9398..0cad7d1a7bf1f 100644 --- a/decidim-initiatives/config/locales/zh-CN.yml +++ b/decidim-initiatives/config/locales/zh-CN.yml @@ -80,7 +80,6 @@ zh-CN: initiatives: fields: created_at: 创建于 - id: ID published_at: 发布于 state: 状态 supports_count: 签名 diff --git a/decidim-initiatives/config/locales/zh-TW.yml b/decidim-initiatives/config/locales/zh-TW.yml index 3cf9a08793845..8421676f0b850 100644 --- a/decidim-initiatives/config/locales/zh-TW.yml +++ b/decidim-initiatives/config/locales/zh-TW.yml @@ -102,7 +102,6 @@ zh-TW: initiatives: fields: created_at: 建立於 - id: ID published_at: 發佈於 state: 狀態 supports_count: 簽名 diff --git a/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb b/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb new file mode 100644 index 0000000000000..3484b1f1d0ff1 --- /dev/null +++ b/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromInitiativesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_initiatives_types, :banner_image, :string + end +end diff --git a/decidim-initiatives/decidim-initiatives.gemspec b/decidim-initiatives/decidim-initiatives.gemspec index b69cdc05bb6b9..de517f4cd23f5 100644 --- a/decidim-initiatives/decidim-initiatives.gemspec +++ b/decidim-initiatives/decidim-initiatives.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| "homepage_uri" => "https://decidim.org", "source_code_uri" => "https://github.com/decidim/decidim" } - s.required_ruby_version = "~> 3.3.0" + s.required_ruby_version = "~> 3.4.0" s.name = "decidim-initiatives" s.summary = "Decidim initiatives module" diff --git a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb index 487945432d998..c25dbaebc0f3d 100644 --- a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb +++ b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb @@ -23,7 +23,7 @@ participatory_space.breadcrumb_cell = "decidim/initiatives/initiative_dropdown_metadata" participatory_space.register_resource(:initiative) do |resource| - resource.actions = %w(comment) + resource.actions = %w(comment vote_comment) resource.permissions_class_name = "Decidim::Initiatives::Permissions" resource.model_class_name = "Decidim::Initiative" resource.card = "decidim/initiatives/initiative" @@ -57,8 +57,8 @@ ] participatory_space.exports :initiatives do |export| - export.collection do - Decidim::Initiative.public_spaces + export.collection do |participatory_space, _user| + Decidim::Initiative.public_spaces.where(id: participatory_space) end export.include_in_open_data = true diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb index 28bc1d65f0a08..84c0eb88ab9f7 100644 --- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb +++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb @@ -113,12 +113,6 @@ def initiative_without_area(area) expect(page).to have_content(translated(open_initiative.title)) end - it "can be searched by id" do - search_by_text(open_initiative.id) - - expect(page).to have_content(translated(open_initiative.title)) - end - it "can be searched by author name" do search_by_text(open_initiative.author.name) diff --git a/decidim-initiatives/spec/system/authorized_comments_spec.rb b/decidim-initiatives/spec/system/authorized_comments_spec.rb index ad819d87cd0b3..6b1f32c848902 100644 --- a/decidim-initiatives/spec/system/authorized_comments_spec.rb +++ b/decidim-initiatives/spec/system/authorized_comments_spec.rb @@ -40,19 +40,44 @@ end end - context "when the initiative has no restriction on commenting" do + shared_examples_for "allowed to vote a comment" do + it do + within "#comment_#{comments[0].id}" do + page.find(".js-comment__votes--up").click + end + + expect(page).to have_css(".js-comment__votes--up", text: /1/) + end + end + + shared_examples_for "not allowed to vote a comment" do + it "does not allow voting" do + within "#comment_#{comments[0].id}" do + expect(page).to have_css(".js-comment__votes--up", text: /0/) + page.find(".js-comment__votes--up").click + # The vote counter should not have changed + expect(page).to have_css(".js-comment__votes--up", text: /0/) + end + end + end + + context "when the initiative has no restriction on commenting and voting comments" do before do visit resource_path end it_behaves_like "allowed to comment" + it_behaves_like "allowed to vote a comment" end - context "when the initiative has restrictions on commenting" do + context "when the initiative has restrictions on commenting and/or voting comments" do let!(:resource_permission) { commentable.create_resource_permission(permissions:) } let(:comment_permission) do { comment: authorization_handlers } end + let(:vote_comment_permission) do + { vote_comment: authorization_handlers } + end let(:authorization_handlers) do { authorization_handlers: { authorization_handler_name => { "options" => {} } } } end @@ -70,6 +95,19 @@ it_behaves_like "not allowed to comment" end + + describe "restricted vote_comment action" do + let(:permissions) { vote_comment_permission } + + it_behaves_like "not allowed to vote a comment" + end + + describe "restricted comment and vote_comment action" do + let(:permissions) { comment_permission.merge(vote_comment_permission) } + + it_behaves_like "not allowed to comment" + it_behaves_like "not allowed to vote a comment" + end end context "and user is verified" do @@ -80,6 +118,19 @@ it_behaves_like "allowed to comment" end + + describe "restricted vote_comment action" do + let(:permissions) { vote_comment_permission } + + it_behaves_like "allowed to vote a comment" + end + + describe "restricted comment and vote_comment action" do + let(:permissions) { comment_permission.merge(vote_comment_permission) } + + it_behaves_like "allowed to comment" + it_behaves_like "allowed to vote a comment" + end end end end diff --git a/decidim-initiatives/spec/system/initiative_types_spec.rb b/decidim-initiatives/spec/system/initiative_types_spec.rb index 0ecd93d52e2e1..bfcfc2e635925 100644 --- a/decidim-initiatives/spec/system/initiative_types_spec.rb +++ b/decidim-initiatives/spec/system/initiative_types_spec.rb @@ -8,21 +8,12 @@ let(:base_initiative) do create(:initiative, organization:) end - let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) } before do switch_to_host(organization.host) end context "when initiative types and scopes have not been created" do - it "does not show the menu link" do - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_no_content("Initiatives") - end - end - it "does not let access to the initiatives" do visit decidim_initiatives.initiatives_path @@ -36,17 +27,6 @@ create(:initiative, organization:) end - it "shows the menu link" do - type = create(:initiatives_type, organization:) - create(:initiatives_type_scope, type:) - - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_content("Initiatives") - end - end - context "when there are some published initiatives" do let!(:initiative) { base_initiative } let!(:unpublished_initiative) do @@ -75,13 +55,9 @@ it "the menu link is shown" do visit decidim_initiatives.initiatives_path - find_by_id("main-dropdown-summary").hover - within ".menu-bar__dropdown-menu" do + within "#menu-bar" do expect(page).to have_content("Initiatives") - click_on "Initiatives" end - - expect(page).to have_current_path(decidim_initiatives.initiatives_path) end end diff --git a/decidim-initiatives/spec/system/initiatives_spec.rb b/decidim-initiatives/spec/system/initiatives_spec.rb index faeb4857b299a..44d2df87efa0c 100644 --- a/decidim-initiatives/spec/system/initiatives_spec.rb +++ b/decidim-initiatives/spec/system/initiatives_spec.rb @@ -8,21 +8,12 @@ let(:base_initiative) do create(:initiative, organization:) end - let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) } before do switch_to_host(organization.host) end context "when initiative types and scopes have not been created" do - it "does not show the menu link" do - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_no_content("Initiatives") - end - end - it "does not let access to the initiatives" do visit decidim_initiatives.initiatives_path @@ -36,17 +27,6 @@ create(:initiative, organization:) end - it "shows the menu link" do - type = create(:initiatives_type, organization:) - create(:initiatives_type_scope, type:) - - visit decidim.root_path - - within "#home__menu" do - expect(page).to have_content("Initiatives") - end - end - context "when there are some published initiatives" do let!(:initiative) { base_initiative } let!(:unpublished_initiative) do diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb b/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb index e9ae6a277f9b3..a6e47514c13cc 100644 --- a/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb +++ b/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb @@ -16,12 +16,7 @@ def show private def card_size - case @options[:size] - when :s - "decidim/meetings/meeting_s" - else - "decidim/meetings/meeting_l" - end + "decidim/meetings/meeting_l" end def resource_icon diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb b/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb deleted file mode 100644 index cde9e16e665b8..0000000000000 --- a/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module Meetings - # This cell renders the Search (:s) meeting card - # for a given instance of a Meeting - class MeetingSCell < Decidim::CardSCell - private - - def metadata_cell - "decidim/meetings/meeting_card_metadata" - end - end - end -end diff --git a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb index 3ee6589bdf8c5..b65690789a4f8 100644 --- a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb +++ b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb @@ -45,10 +45,6 @@ def filters_with_values } end - def search_field_predicate - :id_string_or_title_cont - end - def meeting_types Meeting::TYPE_OF_MEETING end diff --git a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb index f209131c97ffa..be43cad6c15e9 100644 --- a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb +++ b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb @@ -201,6 +201,16 @@ def previous_space rescue NameError, LoadError nil end + + def add_breadcrumb_item + return {} if meeting.blank? + + { + label: translated_attribute(meeting.title), + url: Decidim::EngineRouter.main_proxy(current_component).meeting_path(meeting), + active: false + } + end end end end diff --git a/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb index f43d416399fcf..d7d33bbc463a5 100644 --- a/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb +++ b/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb @@ -9,6 +9,16 @@ class VersionsController < Decidim::Meetings::ApplicationController def versioned_resource @versioned_resource ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id]) end + + def add_breadcrumb_item + return {} if versioned_resource.blank? + + { + label: translated_attribute(versioned_resource.title), + url: Decidim::EngineRouter.main_proxy(current_component).meeting_path(versioned_resource), + active: false + } + end end end end diff --git a/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb index 4bb2461857ba8..f1867fe1ba9a0 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb @@ -48,7 +48,7 @@ | <% if invite.sent_at %> - <%= l invite.sent_at, format: :long %> + <%= l invite.sent_at, format: :decidim_short %> <% end %> | diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb index 560f69ff903c0..7d1a58b7100b2 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb @@ -1,9 +1,6 @@ <% is_linked = meeting.decidim_component_id != current_component.id %> | ||||||||||||||||||||||||||||||||||||||
| ">
- <%= meeting.id %> - |
"> <% if allowed_to? :update, :meeting, meeting: meeting %> <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %> @@ -13,12 +10,12 @@ | "> <% if meeting.start_time %> - <%= l meeting.start_time, format: :long %> + <%= l meeting.start_time, format: :decidim_short %> <% end %> | "> <% if meeting.end_time %> - <%= l meeting.end_time, format: :long %> + <%= l meeting.end_time, format: :decidim_short %> <% end %> | ">
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
index eb7eb20d0a364..b0ea27d239202 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
@@ -1,8 +1,5 @@
|
- <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
- |
<%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
|
diff --git a/decidim-meetings/config/locales/ar.yml b/decidim-meetings/config/locales/ar.yml
index ecd6f37b5188c..2f001756ff2c1 100644
--- a/decidim-meetings/config/locales/ar.yml
+++ b/decidim-meetings/config/locales/ar.yml
@@ -498,7 +498,6 @@ ar:
fields:
closed: مغلق
end_time: تاريخ الانتهاء
- id: المعرف ID
map: خريطة
official_meeting: الاجتماع الرسمي
start_time: تاريخ البدء
diff --git a/decidim-meetings/config/locales/bg.yml b/decidim-meetings/config/locales/bg.yml
index 0eeb869901590..e822eaffee073 100644
--- a/decidim-meetings/config/locales/bg.yml
+++ b/decidim-meetings/config/locales/bg.yml
@@ -548,7 +548,6 @@ bg:
fields:
closed: Затворен
end_time: Крайна дата
- id: ID
map: Карта
official_meeting: Официална среща
start_time: Начална дата
diff --git a/decidim-meetings/config/locales/ca-IT.yml b/decidim-meetings/config/locales/ca-IT.yml
index e4078877a027f..95ebb175e7297 100644
--- a/decidim-meetings/config/locales/ca-IT.yml
+++ b/decidim-meetings/config/locales/ca-IT.yml
@@ -162,6 +162,7 @@ ca-IT:
comment: Comentar
join: Inscriu-t'hi
reply_poll: Respondre el sondeig/consulta en directe
+ vote_comment: Votar el comentari
name: Trobades
settings:
global:
@@ -677,7 +678,6 @@ ca-IT:
fields:
closed: Tancada
end_time: Data de finalització
- id: ID
map: Mapa
official_meeting: Trobada oficial
published: Publicada
diff --git a/decidim-meetings/config/locales/ca.yml b/decidim-meetings/config/locales/ca.yml
index 2bead4f65f194..f2397b057db03 100644
--- a/decidim-meetings/config/locales/ca.yml
+++ b/decidim-meetings/config/locales/ca.yml
@@ -162,6 +162,7 @@ ca:
comment: Comentar
join: Inscriu-t'hi
reply_poll: Respondre el sondeig/consulta en directe
+ vote_comment: Votar el comentari
name: Trobades
settings:
global:
@@ -677,7 +678,6 @@ ca:
fields:
closed: Tancada
end_time: Data de finalització
- id: ID
map: Mapa
official_meeting: Trobada oficial
published: Publicada
diff --git a/decidim-meetings/config/locales/cs.yml b/decidim-meetings/config/locales/cs.yml
index 5cbf38d745e0f..a1d38d6063c96 100644
--- a/decidim-meetings/config/locales/cs.yml
+++ b/decidim-meetings/config/locales/cs.yml
@@ -676,7 +676,6 @@ cs:
fields:
closed: Zavřeno
end_time: Datum ukončení
- id: ID
map: Mapa
official_meeting: Oficiální schůzka
published: Zveřejněno
diff --git a/decidim-meetings/config/locales/de.yml b/decidim-meetings/config/locales/de.yml
index 2a91825a52b43..90f5358d1c48d 100644
--- a/decidim-meetings/config/locales/de.yml
+++ b/decidim-meetings/config/locales/de.yml
@@ -498,8 +498,8 @@ de:
copy_calendar_url: Kopieren
copy_calendar_url_clarification: Kalender-URL in Zwischenablage kopieren
copy_calendar_url_copied: Kopiert!
- copy_calendar_url_description: Sie können alle veröffentlichten Veranstaltungen in Ihrer Kalenderanwendung oder bei Ihrem Kalender-Anbieter sehen. Kopieren und fügen Sie diese URL mit der Option "Neuen Kalender von einer URL hinzufügen" in Ihren Kalender ein.
- copy_calendar_url_explanation: Bitte beachten Sie, dass Sie eine Auswahl von Veranstaltungen exportieren, da es aktive Filter gibt. Wenn Sie alle Veranstaltungen exportieren möchten, setzen Sie zuerst alle Filter zurück.
+ copy_calendar_url_description: Sie können alle veröffentlichten Veranstaltungen auf Ihrer Kalenderanwendung anzeigen. Kopieren Sie diese URL und fügen Sie den Kalender mit der Option "Neuen Kalender von einer URL abonnieren" hinzu.
+ copy_calendar_url_explanation: Bitte beachten Sie, dass nur eine Auswahl von Veranstaltungen exportiert wird, weil Filter aktiv sind. Wenn Sie alle Veranstaltungen exportieren möchten, setzen Sie zuerst alle Filter zurück.
copy_calendar_url_message: Die URL wurde erfolgreich in die Zwischenablage kopiert.
export_calendar: Kalender exportieren
close_meeting_reminder_mailer:
@@ -673,7 +673,6 @@ de:
fields:
closed: Geschlossen
end_time: Endtermin
- id: ID
map: Karte
official_meeting: Offizielle Besprechung
start_time: Anfangsdatum
diff --git a/decidim-meetings/config/locales/el.yml b/decidim-meetings/config/locales/el.yml
index 091ef63fc26a2..6011349a52a97 100644
--- a/decidim-meetings/config/locales/el.yml
+++ b/decidim-meetings/config/locales/el.yml
@@ -505,7 +505,6 @@ el:
fields:
closed: Κλειστό
end_time: Ημερομηνία λήξης
- id: ID
map: Χάρτης
official_meeting: Επίσημη συνάντηση
start_time: Ημερομηνία έναρξης
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 951b3cc2ae536..82dbc8c729ea3 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -163,6 +163,7 @@ en:
comment: Comment
join: Join
reply_poll: Reply poll
+ vote_comment: Vote comment
name: Meetings
settings:
global:
@@ -678,7 +679,6 @@ en:
fields:
closed: Closed
end_time: End date
- id: ID
map: Map
official_meeting: Official meeting
published: Published
diff --git a/decidim-meetings/config/locales/es-MX.yml b/decidim-meetings/config/locales/es-MX.yml
index 2d3d1dc6ae29d..0d9c02799b85e 100644
--- a/decidim-meetings/config/locales/es-MX.yml
+++ b/decidim-meetings/config/locales/es-MX.yml
@@ -162,6 +162,7 @@ es-MX:
comment: Comentar
join: Unirse
reply_poll: Responder la consulta
+ vote_comment: Votar el comentario
name: Encuentros
settings:
global:
@@ -677,7 +678,6 @@ es-MX:
fields:
closed: Cerrado
end_time: Fecha de finalización
- id: ID
map: Mapa
official_meeting: Encuentro oficial
published: Publicado
diff --git a/decidim-meetings/config/locales/es-PY.yml b/decidim-meetings/config/locales/es-PY.yml
index a889e47077ebe..0bbfddbc7ba7b 100644
--- a/decidim-meetings/config/locales/es-PY.yml
+++ b/decidim-meetings/config/locales/es-PY.yml
@@ -162,6 +162,7 @@ es-PY:
comment: Comentar
join: Unirse
reply_poll: Responder la consulta
+ vote_comment: Votar el comentario
name: Encuentros
settings:
global:
@@ -677,7 +678,6 @@ es-PY:
fields:
closed: Cerrado
end_time: Fecha de finalización
- id: ID
map: Mapa
official_meeting: Encuentro oficial
published: Publicado
diff --git a/decidim-meetings/config/locales/es.yml b/decidim-meetings/config/locales/es.yml
index a94a45da5bfc6..536b2689a0994 100644
--- a/decidim-meetings/config/locales/es.yml
+++ b/decidim-meetings/config/locales/es.yml
@@ -162,6 +162,7 @@ es:
comment: Comentar
join: Unirse
reply_poll: Responder la consulta
+ vote_comment: Votar el comentario
name: Encuentros
settings:
global:
@@ -677,7 +678,6 @@ es:
fields:
closed: Cerrado
end_time: Fecha de finalización
- id: ID
map: Mapa
official_meeting: Encuentro oficial
published: Publicado
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index faf7b1f0a82d0..81013957c8f1d 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -677,7 +677,6 @@ eu:
fields:
closed: Itxita
end_time: Bukaera-data
- id: ID
map: Mapa
official_meeting: Topaketa ofiziala
published: Argitaratua
diff --git a/decidim-meetings/config/locales/fi-plain.yml b/decidim-meetings/config/locales/fi-plain.yml
index 451082aea94dd..dd9330737ca69 100644
--- a/decidim-meetings/config/locales/fi-plain.yml
+++ b/decidim-meetings/config/locales/fi-plain.yml
@@ -677,7 +677,6 @@ fi-pl:
fields:
closed: Suljettu
end_time: Päättymispäivä
- id: ID
map: Kartta
official_meeting: Virallinen tapahtuma
published: Julkaistu
diff --git a/decidim-meetings/config/locales/fi.yml b/decidim-meetings/config/locales/fi.yml
index 11829fd36e687..166c0c7f25372 100644
--- a/decidim-meetings/config/locales/fi.yml
+++ b/decidim-meetings/config/locales/fi.yml
@@ -677,7 +677,6 @@ fi:
fields:
closed: Suljettu
end_time: Päättymispäivä
- id: ID
map: Kartta
official_meeting: Virallinen tapaaminen
published: Julkaistu
diff --git a/decidim-meetings/config/locales/fr-CA.yml b/decidim-meetings/config/locales/fr-CA.yml
index 229fd4f52e597..82a2ae1585fa4 100644
--- a/decidim-meetings/config/locales/fr-CA.yml
+++ b/decidim-meetings/config/locales/fr-CA.yml
@@ -162,6 +162,7 @@ fr-CA:
comment: Commenter
join: Rejoindre
reply_poll: Répondre au sondage
+ vote_comment: Vote sur le commentaire
name: Rencontres
settings:
global:
@@ -664,7 +665,6 @@ fr-CA:
fields:
closed: Fermée
end_time: Date de fin
- id: ID
map: Carte
official_meeting: Réunion officielle
published: Publiée
diff --git a/decidim-meetings/config/locales/fr.yml b/decidim-meetings/config/locales/fr.yml
index a4249e60d3569..fe6b170b268ec 100644
--- a/decidim-meetings/config/locales/fr.yml
+++ b/decidim-meetings/config/locales/fr.yml
@@ -162,6 +162,7 @@ fr:
comment: Commenter
join: Rejoindre
reply_poll: Répondre au sondage
+ vote_comment: Vote sur le commentaire
name: Rencontres
settings:
global:
@@ -664,7 +665,6 @@ fr:
fields:
closed: Fermée
end_time: Date de fin
- id: ID
map: Carte
official_meeting: Rencontre officielle
published: Publiée
diff --git a/decidim-meetings/config/locales/ja.yml b/decidim-meetings/config/locales/ja.yml
index 95fa86b161261..1527b90e67791 100644
--- a/decidim-meetings/config/locales/ja.yml
+++ b/decidim-meetings/config/locales/ja.yml
@@ -670,7 +670,6 @@ ja:
fields:
closed: クローズ済み
end_time: 終了日
- id: ID
map: 地図
official_meeting: 公式ミーティング
published: 公開済み
diff --git a/decidim-meetings/config/locales/lt.yml b/decidim-meetings/config/locales/lt.yml
index 356e5e91e68a0..3c8daf560d690 100644
--- a/decidim-meetings/config/locales/lt.yml
+++ b/decidim-meetings/config/locales/lt.yml
@@ -525,7 +525,6 @@ lt:
fields:
closed: Uždaryta
end_time: Pabaigos data
- id: ID
map: Žemėlapis
official_meeting: Oficialus susirinkimas
start_time: Pradžios data
diff --git a/decidim-meetings/config/locales/nl.yml b/decidim-meetings/config/locales/nl.yml
index 5aa17260a0cf4..86027323d2673 100644
--- a/decidim-meetings/config/locales/nl.yml
+++ b/decidim-meetings/config/locales/nl.yml
@@ -436,7 +436,6 @@ nl:
fields:
closed: Gesloten
end_time: Einddatum
- id: ID
map: Kaart
official_meeting: Officiële vergadering
start_time: Startdatum
diff --git a/decidim-meetings/config/locales/pl.yml b/decidim-meetings/config/locales/pl.yml
index 2c75495698c16..676c8287398c6 100644
--- a/decidim-meetings/config/locales/pl.yml
+++ b/decidim-meetings/config/locales/pl.yml
@@ -562,7 +562,6 @@ pl:
fields:
closed: Zakończone
end_time: Data zakończenia
- id: Numer ID
map: Mapa
official_meeting: Spotkanie oficjalne
start_time: Data rozpoczęcia
diff --git a/decidim-meetings/config/locales/pt-BR.yml b/decidim-meetings/config/locales/pt-BR.yml
index e355ae79038ed..96cbb06b593e5 100644
--- a/decidim-meetings/config/locales/pt-BR.yml
+++ b/decidim-meetings/config/locales/pt-BR.yml
@@ -536,7 +536,6 @@ pt-BR:
fields:
closed: Fechadas
end_time: Data final
- id: ID
map: Mapa
official_meeting: Reunião oficial
start_time: Data de início
diff --git a/decidim-meetings/config/locales/sv.yml b/decidim-meetings/config/locales/sv.yml
index a1e163fa5f85f..d88b37215060a 100644
--- a/decidim-meetings/config/locales/sv.yml
+++ b/decidim-meetings/config/locales/sv.yml
@@ -661,7 +661,6 @@ sv:
fields:
closed: Avslutade
end_time: Slutdatum
- id: ID
map: Karta
official_meeting: Officiellt möte
published: Publicerad
diff --git a/decidim-meetings/config/locales/zh-TW.yml b/decidim-meetings/config/locales/zh-TW.yml
index cb4721d00adf5..5dfb7e3f21da2 100644
--- a/decidim-meetings/config/locales/zh-TW.yml
+++ b/decidim-meetings/config/locales/zh-TW.yml
@@ -499,7 +499,6 @@ zh-TW:
fields:
closed: 關閉
end_time: 結束日期
- id: ID
map: 地圖
official_meeting: 官方會議
start_time: 開始日期
diff --git a/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb b/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb
new file mode 100644
index 0000000000000..d8945d02bdb1a
--- /dev/null
+++ b/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ChangeSendRemindersBeforeHoursForLegacyMeetings < ActiveRecord::Migration[7.2]
+ class Meeting < ApplicationRecord
+ self.table_name = "decidim_meetings_meetings"
+ end
+
+ def up
+ Meeting.where(send_reminders_before_hours: nil).update_all(send_reminders_before_hours: 48) # rubocop:disable Rails/SkipsModelValidations
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/decidim-meetings/decidim-meetings.gemspec b/decidim-meetings/decidim-meetings.gemspec
index 31e69aa0d7034..466ea3533977c 100644
--- a/decidim-meetings/decidim-meetings.gemspec
+++ b/decidim-meetings/decidim-meetings.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-meetings"
s.summary = "Decidim meetings module"
diff --git a/decidim-meetings/lib/decidim/meetings/component.rb b/decidim-meetings/lib/decidim/meetings/component.rb
index 6954b33c63452..20917949c7256 100644
--- a/decidim-meetings/lib/decidim/meetings/component.rb
+++ b/decidim-meetings/lib/decidim/meetings/component.rb
@@ -23,7 +23,7 @@
resource.template = "decidim/meetings/meetings/linked_meetings"
resource.card = "decidim/meetings/meeting"
resource.reported_content_cell = "decidim/meetings/reported_content"
- resource.actions = %w(join comment reply_poll)
+ resource.actions = %w(join comment reply_poll vote_comment)
resource.searchable = true
end
diff --git a/decidim-meetings/lib/decidim/meetings/test/factories.rb b/decidim-meetings/lib/decidim/meetings/test/factories.rb
index cdd1eb934fc58..d61a323b6dba4 100644
--- a/decidim-meetings/lib/decidim/meetings/test/factories.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/factories.rb
@@ -182,7 +182,7 @@
factory :meeting_link, class: "Decidim::Meetings::MeetingLink" do
meeting
- component
+ component { meeting.component }
end
factory :registration, class: "Decidim::Meetings::Registration" do
@@ -190,7 +190,7 @@
skip_injection { false }
end
meeting
- user
+ user { create(:user, :confirmed, organization: meeting.component.organization, skip_injection:) }
end
factory :agenda, class: "Decidim::Meetings::Agenda" do
@@ -236,7 +236,7 @@
skip_injection { false }
end
meeting
- user
+ user { create(:user, :confirmed, organization: meeting.component.organization, skip_injection:) }
sent_at { 1.day.ago }
accepted_at { nil }
rejected_at { nil }
diff --git a/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb
deleted file mode 100644
index dcad111f0bb46..0000000000000
--- a/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Meetings
- describe MeetingSCell, type: :cell do
- controller Decidim::Meetings::MeetingsController
-
- subject { my_cell.call }
-
- let!(:meeting) { create(:meeting, :published) }
- let(:my_cell) { cell("decidim/meetings/meeting_s", meeting) }
-
- context "when rendering" do
- it "renders the card" do
- expect(subject).to have_css("div#meeting_#{meeting.id}")
- end
- end
-
- context "when title contains special html entities" do
- let!(:original_title) { meeting.title["en"] }
-
- before do
- meeting.update!(title: { en: "#{original_title} &'<" })
- meeting.reload
- end
-
- it "escapes them correctly" do
- title = decidim_html_escape(original_title).gsub(""", '"')
- expect(subject.to_s).to include("<strong>#{title}</strong> &'<")
- end
- end
- end
-end
diff --git a/decidim-meetings/spec/models/decidim/meetings/invite_spec.rb b/decidim-meetings/spec/models/decidim/meetings/invite_spec.rb
index 7378d811cb7c0..927bff50fca0b 100644
--- a/decidim-meetings/spec/models/decidim/meetings/invite_spec.rb
+++ b/decidim-meetings/spec/models/decidim/meetings/invite_spec.rb
@@ -20,7 +20,8 @@ module Meetings
end
context "without a meeting" do
- let(:invite) { build(:invite, meeting: nil) }
+ let!(:user) { create(:user, :confirmed) }
+ let(:invite) { build(:invite, meeting: nil, user:) }
it { is_expected.not_to be_valid }
end
diff --git a/decidim-meetings/spec/shared/export_meetings_examples.rb b/decidim-meetings/spec/shared/export_meetings_examples.rb
index 53a909dceae1b..5464c858c0079 100644
--- a/decidim-meetings/spec/shared/export_meetings_examples.rb
+++ b/decidim-meetings/spec/shared/export_meetings_examples.rb
@@ -9,7 +9,7 @@
context "with query" do
before do
- fill_in "q[id_string_or_title_cont]", with: translated(meetings.last.title)
+ fill_in "q[title_cont]", with: translated(meetings.last.title)
find("button[aria-label='Search']").click
end
diff --git a/decidim-meetings/spec/system/admin/admin_access_spec.rb b/decidim-meetings/spec/system/admin/admin_access_spec.rb
new file mode 100644
index 0000000000000..941331b8a24a5
--- /dev/null
+++ b/decidim-meetings/spec/system/admin/admin_access_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "decidim/admin/test/admin_participatory_space_component_access_examples"
+
+describe "AdminAccess" do
+ let(:manifest_name) { "meetings" }
+ let!(:meeting) { create(:meeting, :published, component:) }
+ let(:title) { "Meetings" }
+
+ include_context "when managing a component as an admin"
+ include_examples "accessing the component in a participatory space"
+end
diff --git a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
index 23fe788e57505..70abcb86e05a1 100644
--- a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
@@ -102,7 +102,7 @@ def meeting_without_type(type)
end
end
- context "when searching by ID or title" do
+ context "when searching by title" do
let!(:meeting1) { create(:meeting, component:) }
let!(:meeting2) { create(:meeting, component:) }
let!(:meeting1_title) { translated(meeting1.title) }
@@ -110,12 +110,6 @@ def meeting_without_type(type)
before { visit_component_admin }
- it "can be searched by ID" do
- search_by_text(meeting1.id)
-
- expect(page).to have_content(meeting1_title)
- end
-
it "can be searched by title" do
search_by_text(meeting2_title)
diff --git a/decidim-meetings/spec/system/explore_meetings_spec.rb b/decidim-meetings/spec/system/explore_meetings_spec.rb
index 40f213a136f21..a59311e7a6ef0 100644
--- a/decidim-meetings/spec/system/explore_meetings_spec.rb
+++ b/decidim-meetings/spec/system/explore_meetings_spec.rb
@@ -28,6 +28,11 @@
describe "index" do
it "shows all meetings for the given process" do
visit_component
+
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ end
+
expect(page).to have_selector(meetings_selector, count: meetings_count)
meetings.each do |meeting|
diff --git a/decidim-meetings/spec/system/explore_versions_spec.rb b/decidim-meetings/spec/system/explore_versions_spec.rb
index f7ce7cc6a50da..cb06ce317d540 100644
--- a/decidim-meetings/spec/system/explore_versions_spec.rb
+++ b/decidim-meetings/spec/system/explore_versions_spec.rb
@@ -48,6 +48,10 @@
end
it "lists all versions" do
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ expect(page).to have_content(translated(meeting.reload.title))
+ end
expect(page).to have_link("Version 1 of 2")
expect(page).to have_link("Version 2 of 2")
end
diff --git a/decidim-meetings/spec/system/show_spec.rb b/decidim-meetings/spec/system/show_spec.rb
index e948ec005f7b9..77cea893e7ab7 100644
--- a/decidim-meetings/spec/system/show_spec.rb
+++ b/decidim-meetings/spec/system/show_spec.rb
@@ -41,6 +41,11 @@
end
it "shows the correct time zone" do
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ expect(page).to have_content(translated(meeting.reload.title))
+ end
+
expect(page).to have_content("HST")
end
end
diff --git a/decidim-pages/decidim-pages.gemspec b/decidim-pages/decidim-pages.gemspec
index d7cb3405a148a..ddd12a8c6376a 100644
--- a/decidim-pages/decidim-pages.gemspec
+++ b/decidim-pages/decidim-pages.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-pages"
s.summary = "Decidim pages module"
diff --git a/decidim-pages/spec/system/admin_access_spec.rb b/decidim-pages/spec/system/admin_access_spec.rb
new file mode 100644
index 0000000000000..66ff844bcb0d6
--- /dev/null
+++ b/decidim-pages/spec/system/admin_access_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "decidim/admin/test/admin_participatory_space_component_access_examples"
+
+describe "AdminAccess" do
+ let(:manifest_name) { "pages" }
+ let(:title) { "Edit page" }
+
+ # This does not work for pages
+ #
+ # let!(:page) { create(:page, component:) }
+ #
+ # So, we need to do a workaround
+ before do
+ create(:page, component:)
+ end
+
+ include_context "when managing a component as an admin"
+ include_examples "accessing the component in a participatory space"
+end
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
index 8d387b2ee1c41..47a2ad106aaae 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
@@ -50,6 +50,9 @@ class ParticipatoryProcessForm < Form
validates :weight, presence: true
+ validates :start_date, date: { before: :end_date, allow_blank: true, if: proc { |obj| obj.end_date.present? } }
+ validates :end_date, date: { after: :start_date, allow_blank: true, if: proc { |obj| obj.start_date.present? } }
+
alias organization current_organization
def map_model(model)
diff --git a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
index 79aa4d3b0e1f7..4dd6f8691b90b 100644
--- a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
+++ b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
@@ -154,7 +154,7 @@ def user_can_enter_processes_space_area?
permission_action.subject == :space_area &&
context.fetch(:space_name, nil) == :processes
- toggle_allow(user.admin? || user_has_any_role?(user, process, broad_check: true) || has_manageable_processes?)
+ toggle_allow(user.admin? || has_manageable_processes?)
end
# Only organization admins can manage process groups.
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
index a334c7dbafbf0..5f71fdcf7ac99 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
@@ -33,12 +33,12 @@
">
<% if step.start_date %>
- <%= l step.start_date, format: :long %>
+ <%= l step.start_date, format: :decidim_short %>
<% end %>
|
">
<% if step.end_date %>
- <%= l step.end_date, format: :long %>
+ <%= l step.end_date, format: :decidim_short %>
<% end %>
|
">
diff --git a/decidim-participatory_processes/config/locales/en.yml b/decidim-participatory_processes/config/locales/en.yml
index 0e78b29e3a099..5755e225b94b6 100644
--- a/decidim-participatory_processes/config/locales/en.yml
+++ b/decidim-participatory_processes/config/locales/en.yml
@@ -341,6 +341,7 @@ en:
participatory_processes:
announcement: The announcement (callout) information
area: The area where the process is taking place
+ component_settings: The component settings of the process
created_at: The date this space was created
description: A long description of the process
developer_group: The developer group of the process. This is the organization that is promoting the process.
diff --git a/decidim-participatory_processes/config/locales/eu.yml b/decidim-participatory_processes/config/locales/eu.yml
index 247f5a2cb0fc1..628367fc21bbc 100644
--- a/decidim-participatory_processes/config/locales/eu.yml
+++ b/decidim-participatory_processes/config/locales/eu.yml
@@ -267,7 +267,7 @@ eu:
titles:
participatory_process_groups: Partaidetza-prozesuen taldeak
participatory_process_types: Partaidetza-prozesu motak
- participatory_processes: Prozesu pare-hartzaileak
+ participatory_processes: Partaidetza-prozesuak
participatory_processes_deleted: Ezabatutako partaidetza-prozesuak
tooltips:
deleted_processes_info: Prozesu bat soilik ezabatu daiteke egoera "Argitaratugabea" bada.
diff --git a/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb b/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb
new file mode 100644
index 0000000000000..ba8b3f9571c27
--- /dev/null
+++ b/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveLegacyImagesFromParticipatoryProcessesModule < ActiveRecord::Migration[7.2]
+ def change
+ remove_column :decidim_participatory_processes, :hero_image, :string
+
+ remove_column :decidim_participatory_process_groups, :hero_image, :string
+ end
+end
diff --git a/decidim-participatory_processes/decidim-participatory_processes.gemspec b/decidim-participatory_processes/decidim-participatory_processes.gemspec
index fa3d28f62c6cc..824bf669e6dfc 100644
--- a/decidim-participatory_processes/decidim-participatory_processes.gemspec
+++ b/decidim-participatory_processes/decidim-participatory_processes.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-participatory_processes"
s.summary = "Decidim participatory processes module"
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
index 67e229f6df4af..43ae5ec4ae0d3 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
@@ -42,8 +42,8 @@
end
participatory_space.exports :participatory_processes do |export|
- export.collection do
- Decidim::ParticipatoryProcess.public_spaces
+ export.collection do |participatory_space, _user|
+ Decidim::ParticipatoryProcess.public_spaces.where(id: participatory_space)
end
export.include_in_open_data = true
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
index 87fe7aecc25d9..04fae369103d8 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
@@ -44,6 +44,8 @@ module Admin
ca: "Descripció curta"
}
end
+ let(:start_date) { 1.month.ago }
+ let(:end_date) { 1.month.from_now }
let(:slug) { "slug" }
let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
let(:attributes) do
@@ -62,6 +64,8 @@ module Admin
"short_description_en" => short_description[:en],
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
+ "start_date" => start_date,
+ "end_date" => end_date,
"hero_image" => attachment,
"slug" => slug,
"taxonomies" => [taxonomies.first.id, taxonomies.second.id]
@@ -176,6 +180,45 @@ module Admin
end
end
end
+
+ context "when the start_date is later than end_date" do
+ let(:start_date) { 1.month.from_now }
+ let(:end_date) { 2.months.ago }
+
+ it { is_expected.to be_invalid }
+
+ it "has an error" do
+ subject.valid?
+
+ expect(subject.errors).not_to be_empty
+ expect(subject.errors[:end_date]).not_to be_empty
+ expect(subject.errors[:start_date]).not_to be_empty
+ end
+ end
+
+ context "when start_date is present" do
+ let(:start_date) { 3.months.ago }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when end_date is present" do
+ let(:end_date) { 2.months.from_now }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when start_date is not present" do
+ let(:start_date) { nil }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "when end_date is not present" do
+ let(:end_date) { nil }
+
+ it { is_expected.to be_valid }
+ end
end
end
end
diff --git a/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb b/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
index 360c53d8c5fd6..6dc595da5530f 100644
--- a/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
@@ -372,6 +372,47 @@ def participatory_space
participatory_process
end
+ describe "does not reorder components after edit" do
+ let!(:component1) { create(:component, name: { en: "Component 1" }, participatory_space:) }
+ let!(:component2) { create(:component, name: { en: "Component 2" }, participatory_space:) }
+ let!(:component3) { create(:component, name: { en: "Component 3" }, participatory_space:) }
+
+ before do
+ visit participatory_space_components_path(participatory_space)
+ end
+
+ it "does not reorder when component updates" do
+ expect(page.text.index("Component 1")).to be < page.text.index("Component 2")
+ expect(page.text.index("Component 2")).to be < page.text.index("Component 3")
+ within ".component-#{component1.id}" do
+ find("button[data-controller='dropdown']").click
+ click_on "Configure"
+ end
+ within ".edit_component" do
+ fill_in_i18n(
+ :component_name,
+ "#component-name-tabs",
+ **attributes[:name].except("machine_translations")
+ )
+ within ".global-settings" do
+ all("input[type=checkbox]").last.click
+ end
+
+ within "#panel-step_settings" do
+ all("input[type=checkbox]").first.click
+ end
+
+ click_on "Update"
+ end
+ expect(page).to have_admin_callout("The component was updated successfully.")
+ expect(page).to have_content(translated(attributes[:name]))
+ expect(page).to have_content("Component 2")
+ expect(page).to have_content("Component 3")
+ expect(page.text.index(translated(attributes[:name]))).to be < page.text.index("Component 2")
+ expect(page.text.index("Component 2")).to be < page.text.index("Component 3")
+ end
+ end
+
def participatory_space_components_path(participatory_space)
decidim_admin_participatory_processes.components_path(participatory_space)
end
diff --git a/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb b/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb
index e83b34bf6f7ec..cc4c68fad8128 100644
--- a/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb
@@ -53,8 +53,8 @@
within "#steps table" do
expect(page).to have_content(translated(attributes[:title]))
- expect(page).to have_content("#{Time.new.utc.day},")
- expect(page).to have_content("#{(Time.new.utc + 2.days).day},")
+ expect(page).to have_content(Time.new.utc.day)
+ expect(page).to have_content((Time.new.utc + 2.days).day)
end
visit decidim_admin.root_path
expect(page).to have_content("created the #{translated(attributes[:title])} phase in")
diff --git a/decidim-participatory_processes/spec/shared/process_announcements_examples.rb b/decidim-participatory_processes/spec/shared/process_announcements_examples.rb
index de81e137af698..06c2e267640c0 100644
--- a/decidim-participatory_processes/spec/shared/process_announcements_examples.rb
+++ b/decidim-participatory_processes/spec/shared/process_announcements_examples.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
shared_examples "manage processes announcements" do
- let!(:participatory_process) { create(:participatory_process, :with_content_blocks, organization:, blocks_manifests: [:announcement]) }
+ let!(:participatory_process) { create(:participatory_process, :with_content_blocks, organization:, blocks_manifests: [:announcement], announcement: {}) }
it "can customize a general announcement for the process" do
within "tr", text: translated(participatory_process.title) do
@@ -39,4 +39,39 @@
expect(page).to have_content("An important announcement")
end
end
+
+ it "remove announcement element if announcement body is empty" do
+ within "tr", text: translated(participatory_process.title) do
+ click_on translated(participatory_process.title)
+ end
+
+ within_admin_sidebar_menu do
+ click_on "About this process"
+ end
+
+ find_by_id("participatory_process-announcement-tabs").click
+ send_keys("T")
+ send_keys(:backspace)
+
+ within ".edit_participatory_process" do
+ find("*[type=submit]").click
+ end
+
+ expect(page).to have_admin_callout("successfully")
+
+ visit decidim_admin_participatory_processes.participatory_processes_path
+
+ new_window = window_opened_by do
+ within("tr", text: translated(participatory_process.title)) do
+ find("button[data-controller='dropdown']").click
+ click_on "Preview"
+ end
+ end
+
+ page.within_window(new_window) do
+ expect(page).to have_no_css(".flash")
+ expect(page).to have_no_css(".flash__message")
+ expect(page).to have_no_css(".announcement")
+ end
+ end
end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_access_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_access_spec.rb
index 3fc81c863aade..9e32973897a97 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_access_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_access_spec.rb
@@ -16,6 +16,9 @@
let(:participatory_space_path) { decidim_participatory_processes.participatory_process_path(participatory_space) }
it_behaves_like "admin participatory space access"
+ it_behaves_like "admin menu shows only assigned space",
+ space_name: "Processes",
+ other_spaces: %w(Assemblies Initiatives Conferences)
describe "edit button" do
let(:target_path) { decidim_admin_participatory_processes.edit_participatory_process_landing_page_path(participatory_space) }
diff --git a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
index d3c242ee6f361..f32e1dc6f20cc 100644
--- a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
@@ -28,18 +28,6 @@
end
end
- context "when there are no processes and accessing from the homepage" do
- let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) }
-
- it "does not show the menu link" do
- visit decidim.root_path
-
- within "#home__menu" do
- expect(page).to have_no_content("Processes")
- end
- end
- end
-
context "when the process does not exist" do
it_behaves_like "a 404 page" do
let(:target_path) { decidim_participatory_processes.participatory_process_path(99_999_999) }
@@ -57,18 +45,6 @@
let(:target_path) { decidim_participatory_processes.participatory_processes_path }
end
end
-
- context "and accessing from the homepage" do
- let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) }
-
- it "the menu link is not shown" do
- visit decidim.root_path
-
- within "#home__menu" do
- expect(page).to have_no_content("Processes")
- end
- end
- end
end
context "when there are some published processes" do
@@ -96,20 +72,6 @@
it_behaves_like "accessible page"
- context "and accessing from the homepage" do
- let!(:menu_content_block) { create(:content_block, organization:, manifest_name: :global_menu, scope_name: :homepage) }
-
- it "the menu link is not shown" do
- visit decidim.root_path
-
- within "#home__menu" do
- click_on "Processes"
- end
-
- expect(page).to have_current_path decidim_participatory_processes.participatory_processes_path
- end
- end
-
context "with highlighted processes" do
before do
promoted_process.title["en"] = "D'Artagnan #{promoted_process.title["en"]}"
diff --git a/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb b/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb
index 0c9a4349a098b..21bad67ffba8c 100644
--- a/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb
+++ b/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb
@@ -32,10 +32,6 @@ def accessible_proposals_collection
collection.with_evaluation_assigned_to(current_user, current_participatory_space)
end
- def search_field_predicate
- :id_string_or_title_cont
- end
-
def filter_config
@filter_config ||= Decidim::AdminFilter.new(:proposals).build_for(self)
end
diff --git a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
index 7fbededb0c7f3..c4022c86680bb 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
@@ -20,7 +20,7 @@ class ProposalsController < Decidim::Proposals::ApplicationController
before_action :authenticate_user!, only: [:new, :create]
before_action :ensure_is_draft, only: [:preview, :publish, :edit_draft, :update_draft, :destroy_draft]
- before_action :set_proposal, only: [:show, :edit, :update, :withdraw]
+ before_action :proposal, only: [:show, :edit, :update, :withdraw]
before_action :edit_form, only: [:edit_draft, :edit]
before_action :set_view_mode, only: [:index]
@@ -216,8 +216,8 @@ def ensure_is_draft
redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path unless @proposal.draft?
end
- def set_proposal
- @proposal = Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
+ def proposal
+ @proposal ||= Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
end
# Returns true if the proposal is NOT an emendation or the user IS an admin.
@@ -289,6 +289,24 @@ def set_view_mode
def default_view_mode
@default_view_mode ||= current_component.settings.attachments_allowed? ? "grid" : "list"
end
+
+ def add_breadcrumb_item
+ return {} if proposal.blank?
+
+ if proposal.emendation?
+ {
+ label: translated_attribute(proposal.amendable.title),
+ url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal.amendable),
+ active: false
+ }
+ else
+ {
+ label: translated_attribute(proposal.title),
+ url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal),
+ active: false
+ }
+ end
+ end
end
end
end
diff --git a/decidim-proposals/app/controllers/decidim/proposals/versions_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/versions_controller.rb
index 953d320d1018b..7529ca3880f97 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/versions_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/versions_controller.rb
@@ -11,11 +11,21 @@ class VersionsController < Decidim::Proposals::ApplicationController
def versioned_resource
@versioned_resource ||=
if params[:proposal_id]
- present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
+ Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id])
else
CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
end
end
+
+ def add_breadcrumb_item
+ return {} if versioned_resource.blank?
+
+ {
+ label: translated_attribute(versioned_resource.title),
+ url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(versioned_resource),
+ active: false
+ }
+ end
end
end
end
diff --git a/decidim-proposals/app/packs/stylesheets/decidim/proposals/proposals.scss b/decidim-proposals/app/packs/stylesheets/decidim/proposals/proposals.scss
index 1420d1fe9f58a..7e92bdcd1953c 100644
--- a/decidim-proposals/app/packs/stylesheets/decidim/proposals/proposals.scss
+++ b/decidim-proposals/app/packs/stylesheets/decidim/proposals/proposals.scss
@@ -112,7 +112,7 @@
&__list-list {
.card__proposals-item {
- @apply border-l-4 rounded-[10px] md:rounded-md border-[#F5F5F5] hover:border-tertiary focus-visible:border-tertiary flex flex-col md:items-center md:flex-row md:justify-between min-h-0 md:min-h-[127px] lg:min-h-[83px];
+ @apply border-l-4 rounded-[10px] md:rounded-md border-neutral-100 hover:border-tertiary focus-visible:border-tertiary flex flex-col md:items-center md:flex-row md:justify-between min-h-0 md:min-h-[127px] lg:min-h-[83px];
.card__list {
@apply border-none md:flex-1 md:items-center mb-2.5 md:mb-0;
@@ -128,7 +128,7 @@
.card__proposals-votes,
.card__proposals-votes-hidden {
- @apply flex md:flex-col lg:flex-row bg-[#F5F5F5] justify-around md:flex-[0.6] lg:flex-[0.8] items-center md:items-stretch lg:items-center lg:min-w-[196px] h-[68px] md:h-auto lg:h-[68px];
+ @apply flex md:flex-col lg:flex-row bg-neutral-100 justify-around md:flex-[0.6] lg:flex-[0.8] items-center md:items-stretch lg:items-center lg:min-w-[196px] h-[68px] md:h-auto lg:h-[68px];
button {
@apply bg-[var(--secondary)];
@@ -217,7 +217,7 @@
@apply md:gap-4;
.card__proposals-item {
- @apply flex flex-col justify-between border-solid border-[#D3D5D9] border rounded;
+ @apply flex flex-col mt-6 justify-between border-solid border-[#D3D5D9] border rounded;
.card__grid {
@apply mb-2.5 md:mb-0 flex-1 justify-between;
diff --git a/decidim-proposals/config/locales/ca-IT.yml b/decidim-proposals/config/locales/ca-IT.yml
index d5a91c8acf8f0..548f89df6d409 100644
--- a/decidim-proposals/config/locales/ca-IT.yml
+++ b/decidim-proposals/config/locales/ca-IT.yml
@@ -145,8 +145,6 @@ ca-IT:
values:
state_not_published: Sense resposta
state_published: Amb resposta
- search_placeholder:
- id_string_or_title_cont: Cerca %{collection} per ID o títol
tooltips:
cannot_edit_proposal_info: No es pot editar aquesta proposta perquè ha estat creada per un participant o ha rebut algun vot
deleted_proposal_states_info: No es pot eliminar aquest estat de resposta perquè hi ha propostes assignades a aquest estat
diff --git a/decidim-proposals/config/locales/ca.yml b/decidim-proposals/config/locales/ca.yml
index 915c157cb19f7..6e1280fdf6180 100644
--- a/decidim-proposals/config/locales/ca.yml
+++ b/decidim-proposals/config/locales/ca.yml
@@ -145,8 +145,6 @@ ca:
values:
state_not_published: Sense resposta
state_published: Amb resposta
- search_placeholder:
- id_string_or_title_cont: Cerca %{collection} per ID o títol
tooltips:
cannot_edit_proposal_info: No es pot editar aquesta proposta perquè ha estat creada per un participant o ha rebut algun vot
deleted_proposal_states_info: No es pot eliminar aquest estat de resposta perquè hi ha propostes assignades a aquest estat
diff --git a/decidim-proposals/config/locales/de.yml b/decidim-proposals/config/locales/de.yml
index eca158d33add7..0d58a4e0df184 100644
--- a/decidim-proposals/config/locales/de.yml
+++ b/decidim-proposals/config/locales/de.yml
@@ -145,8 +145,6 @@ de:
values:
state_not_published: Unbeantwortet
state_published: Beantwortet
- search_placeholder:
- id_string_or_title_cont: In %{collection} nach ID oder Titel suchen
tooltips:
cannot_edit_proposal_info: Dieser Vorschlag kann nicht bearbeitet werden, da er von einem Teilnehmenden erstellt wurde oder bereits Stimmen erhalten hat
deleted_proposal_states_info: Dieser Vorschlagsstatus kann nicht gelöscht werden, da ihm Vorschläge zugewiesen sind
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index 126b43b360eff..0b7db59b1814c 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -146,8 +146,6 @@ en:
values:
state_not_published: Not answered
state_published: Answered
- search_placeholder:
- id_string_or_title_cont: Search %{collection} by ID or title
tooltips:
cannot_edit_proposal_info: Cannot edit this proposal as it is created by a participant or it has received any vote
deleted_proposal_states_info: Cannot delete this proposal state because there are proposals assigned to it
diff --git a/decidim-proposals/config/locales/es-MX.yml b/decidim-proposals/config/locales/es-MX.yml
index 1466b7653b363..7ff83e15cf56a 100644
--- a/decidim-proposals/config/locales/es-MX.yml
+++ b/decidim-proposals/config/locales/es-MX.yml
@@ -145,8 +145,6 @@ es-MX:
values:
state_not_published: Sin respuesta
state_published: Respondidas
- search_placeholder:
- id_string_or_title_cont: Buscar %{collection} por ID o título
tooltips:
cannot_edit_proposal_info: No se puede editar esta propuesta ya que ha sido creada por un participante o ha recibido algún voto
deleted_proposal_states_info: No se puede eliminar este estado de respuesta porque hay propuestas asignadas a este estado
diff --git a/decidim-proposals/config/locales/es-PY.yml b/decidim-proposals/config/locales/es-PY.yml
index 8b6eeee4d98ba..f67655e4d61b2 100644
--- a/decidim-proposals/config/locales/es-PY.yml
+++ b/decidim-proposals/config/locales/es-PY.yml
@@ -145,8 +145,6 @@ es-PY:
values:
state_not_published: Sin respuesta
state_published: Respondidas
- search_placeholder:
- id_string_or_title_cont: Buscar %{collection} por ID o título
tooltips:
cannot_edit_proposal_info: No se puede editar esta propuesta ya que ha sido creada por un participante o ha recibido algún voto
deleted_proposal_states_info: No se puede eliminar este estado de respuesta porque hay propuestas asignadas a este estado
diff --git a/decidim-proposals/config/locales/es.yml b/decidim-proposals/config/locales/es.yml
index 26950d02aa1fc..0291d775c475e 100644
--- a/decidim-proposals/config/locales/es.yml
+++ b/decidim-proposals/config/locales/es.yml
@@ -145,8 +145,6 @@ es:
values:
state_not_published: Sin respuesta
state_published: Respondidas
- search_placeholder:
- id_string_or_title_cont: Buscar %{collection} por ID o título
tooltips:
cannot_edit_proposal_info: No se puede editar esta propuesta ya que ha sido creada por un participante o ha recibido algún voto
deleted_proposal_states_info: No se puede eliminar este estado de respuesta porque hay propuestas asignadas a este estado
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index c391fc40c1c52..6d27b4da114a2 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -145,8 +145,6 @@ eu:
values:
state_not_published: Erantzun gabe
state_published: Erantzun da
- search_placeholder:
- id_string_or_title_cont: Bilatu %{collection} edo ID edo izenburuaren arabera
tooltips:
cannot_edit_proposal_info: Ezin da editatu proposamen hau parte-hartzaile batek sortua bezala edo botorik jaso badu
deleted_proposal_states_info: Ezin da ezabatu proposamen-egoera hau, proposamen batzuk esleitu baitzaizkio
@@ -712,7 +710,7 @@ eu:
delete: "%{user_name} k desesleitu du ebaluatzaile bat %{proposal_title} proposamenetik"
proposal:
answer: "%{user_name} parte-hartzaileak %{resource_name} %{space_name} espazioko proposamenari erantzun dio"
- create: "%{user_name} -k sortu zuen %{resource_name} proposamena %{space_name} esparruko %{merged_count} proposamenen bat egitetik"
+ create: "%{user_name} parte-hartzaileak sortu zuen %{resource_name} proposamena %{space_name} esparruko %{merged_count} proposamenen bat egitetik"
publish_answer: "%{user_name} parte-hartzaileak argitaratu du %{resource_name} proposamenaren erantzuna %{space_name} espazioan"
restore: "%{user_name} parte-hartzailea berreskuratu du %{resource_name} proposamena %{space_name} espazioan"
soft_delete: "%{user_name} parte-hartzailea eraman du %{resource_name} proposamena %{space_name} espaziora"
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index e98abde43a7b9..4919dbaa2804c 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -145,8 +145,6 @@ fi-pl:
values:
state_not_published: Ei vastattu
state_published: Vastattu
- search_placeholder:
- id_string_or_title_cont: Hae kohteesta %{collection} ID-numeron tai otsikon perusteella
tooltips:
cannot_edit_proposal_info: Tätä ehdotusta ei voi muokata, koska se on osallistujan luoma tai sitä on jo äänestetty
deleted_proposal_states_info: Tätä ehdotusten tilaa ei voi poistaa, koska kyseinen tila on määritetty joillekin ehdotuksille
diff --git a/decidim-proposals/config/locales/fi.yml b/decidim-proposals/config/locales/fi.yml
index a335ab69df6ff..249fd01973f8c 100644
--- a/decidim-proposals/config/locales/fi.yml
+++ b/decidim-proposals/config/locales/fi.yml
@@ -145,8 +145,6 @@ fi:
values:
state_not_published: Ei vastattu
state_published: Vastattu
- search_placeholder:
- id_string_or_title_cont: Hae kohteesta %{collection} ID-numeron tai otsikon perusteella
tooltips:
cannot_edit_proposal_info: Tätä ehdotusta ei voi muokata, koska se on osallistujan luoma tai sitä on jo äänestetty
deleted_proposal_states_info: Tätä ehdotusten tilaa ei voi poistaa, koska kyseinen tila on määritetty joillekin ehdotuksille
diff --git a/decidim-proposals/config/locales/fr-CA.yml b/decidim-proposals/config/locales/fr-CA.yml
index e6dd7d6a7de8d..e4f570ccde030 100644
--- a/decidim-proposals/config/locales/fr-CA.yml
+++ b/decidim-proposals/config/locales/fr-CA.yml
@@ -136,8 +136,6 @@ fr-CA:
values:
state_not_published: Non répondue
state_published: Répondue
- search_placeholder:
- id_string_or_title_cont: Rechercher %{collection} par ID ou titre
tooltips:
cannot_edit_proposal_info: Impossible de modifier cette proposition car elle a été créée par un participant ou elle a reçu un vote
deleted_proposal_states_info: Impossible de supprimer cet état de proposition car il y a des propositions qui lui sont assignées
diff --git a/decidim-proposals/config/locales/fr.yml b/decidim-proposals/config/locales/fr.yml
index a520999c0f53c..0987e6c20cc81 100644
--- a/decidim-proposals/config/locales/fr.yml
+++ b/decidim-proposals/config/locales/fr.yml
@@ -136,8 +136,6 @@ fr:
values:
state_not_published: Non répondue
state_published: Répondue
- search_placeholder:
- id_string_or_title_cont: Rechercher %{collection} par ID ou titre
tooltips:
cannot_edit_proposal_info: Impossible de modifier cette proposition car elle a été créée par un participant ou elle a reçu un vote
deleted_proposal_states_info: Impossible de supprimer cet état de proposition car il y a des propositions qui lui sont assignées
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index c79dfd51d3b96..23a9d86d77cbc 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -141,8 +141,6 @@ ja:
values:
state_not_published: 未回答
state_published: 回答済み
- search_placeholder:
- id_string_or_title_cont: '%{collection} をIDまたはタイトルで検索'
tooltips:
cannot_edit_proposal_info: この提案は参加者によって作成されたか投票されているため編集できません
deleted_proposal_states_info: 提案に割り当てられているため、この提案状態は削除できません
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index a68921767e9d1..99befa96a9ba9 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -143,8 +143,6 @@ sv:
values:
state_not_published: Ej besvarade
state_published: Besvarade
- search_placeholder:
- id_string_or_title_cont: Sök %{collection} efter ID eller titel
tooltips:
cannot_edit_proposal_info: Kan inte redigera detta förslag eftersom det är skapat av en deltagare eller redan har fått någon röst
deleted_proposal_states_info: Kan inte ta bort detta tillstånd eftersom det finns förslag som är kopplade till det
diff --git a/decidim-proposals/decidim-proposals.gemspec b/decidim-proposals/decidim-proposals.gemspec
index be8fa8ae0fe04..c041725f9dfd2 100644
--- a/decidim-proposals/decidim-proposals.gemspec
+++ b/decidim-proposals/decidim-proposals.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.3.0"
+ s.required_ruby_version = "~> 3.4.0"
s.name = "decidim-proposals"
s.summary = "Decidim proposals module"
diff --git a/decidim-proposals/lib/decidim/proposals/commentable_proposal.rb b/decidim-proposals/lib/decidim/proposals/commentable_proposal.rb
index b02491c3c2bf9..1716becf98168 100644
--- a/decidim-proposals/lib/decidim/proposals/commentable_proposal.rb
+++ b/decidim-proposals/lib/decidim/proposals/commentable_proposal.rb
@@ -24,12 +24,6 @@ def users_to_notify_on_comment_created
followers
end
-
- def user_allowed_to_vote_comment?(user)
- return unless can_participate_in_space?(user)
-
- ActionAuthorizer.new(user, "vote_comment", component, self).authorize.ok?
- end
end
end
end
diff --git a/decidim-proposals/spec/shared/export_proposals_examples.rb b/decidim-proposals/spec/shared/export_proposals_examples.rb
index 426a2ddac5921..f7a9f36da71b9 100644
--- a/decidim-proposals/spec/shared/export_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/export_proposals_examples.rb
@@ -10,7 +10,7 @@
context "with query" do
before do
- fill_in "q[id_string_or_title_cont]", with: translated(proposals.last.title)
+ fill_in "q[title_cont]", with: translated(proposals.last.title)
find("button[aria-label='Search']").click
end
diff --git a/decidim-proposals/spec/system/admin/admin_access_spec.rb b/decidim-proposals/spec/system/admin/admin_access_spec.rb
new file mode 100644
index 0000000000000..83a6b2c22e02f
--- /dev/null
+++ b/decidim-proposals/spec/system/admin/admin_access_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "decidim/admin/test/admin_participatory_space_component_access_examples"
+
+describe "AdminAccess" do
+ let(:manifest_name) { "proposals" }
+ let!(:proposal) { create(:proposal, :official, component:) }
+ let(:title) { "Proposals" }
+
+ include_context "when managing a component as an admin"
+ include_examples "accessing the component in a participatory space"
+end
diff --git a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
index 2f8769208f937..2003cd3c4b8ed 100644
--- a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
+++ b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
@@ -212,7 +212,7 @@ def proposal_without_state(token)
end
end
- context "when searching by ID or title" do
+ context "when searching by title" do
let!(:proposal1) { create(:proposal, component:) }
let!(:proposal2) { create(:proposal, component:) }
let!(:proposal1_title) { ActionView::Base.full_sanitizer.sanitize(translated(proposal1.title)) }
@@ -220,12 +220,6 @@ def proposal_without_state(token)
before { visit_component_admin }
- it "can be searched by ID" do
- search_by_text(proposal1.id)
-
- expect(page).to have_content(proposal1_title)
- end
-
it "can be searched by title" do
search_by_text(proposal2_title)
diff --git a/decidim-proposals/spec/system/edit_proposal_spec.rb b/decidim-proposals/spec/system/edit_proposal_spec.rb
index 5f9ace7a74881..0126c3c1cc8c9 100644
--- a/decidim-proposals/spec/system/edit_proposal_spec.rb
+++ b/decidim-proposals/spec/system/edit_proposal_spec.rb
@@ -98,7 +98,7 @@
click_on("Edit attachments")
within ".upload-modal" do
expect(page).to have_content("Has to be an image or a document")
- expect(page).to have_content("If it is an image, it preferably be a landscape image that does not have any text. The service crops the image.")
+ expect(page).to have_content("If it is an image, it preferably be a landscape image that does not have any text. The platform crops the image.")
within "[data-filename='city.jpeg']" do
find("input[type='text']").set(attachment_image_title)
end
diff --git a/decidim-proposals/spec/system/proposal_show_spec.rb b/decidim-proposals/spec/system/proposal_show_spec.rb
index 2f775e3297852..60e99f5cf1200 100644
--- a/decidim-proposals/spec/system/proposal_show_spec.rb
+++ b/decidim-proposals/spec/system/proposal_show_spec.rb
@@ -65,6 +65,9 @@ def visit_proposal
end
it "successfully shows the page" do
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ end
expect(page).to have_content("Deleted participant")
end
end
diff --git a/decidim-proposals/spec/system/proposals_spec.rb b/decidim-proposals/spec/system/proposals_spec.rb
index 0c483739de399..a3b78bd55fb55 100644
--- a/decidim-proposals/spec/system/proposals_spec.rb
+++ b/decidim-proposals/spec/system/proposals_spec.rb
@@ -89,6 +89,11 @@
end
it "shows the author as official" do
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ expect(page).to have_content(translated(official_proposal.title))
+ end
+
expect(page).to have_content("Official proposal")
end
diff --git a/decidim-proposals/spec/system/proposals_versions_spec.rb b/decidim-proposals/spec/system/proposals_versions_spec.rb
index 1d428ad0c8258..34896c771ac05 100644
--- a/decidim-proposals/spec/system/proposals_versions_spec.rb
+++ b/decidim-proposals/spec/system/proposals_versions_spec.rb
@@ -130,6 +130,11 @@
visit current_path
click_on("Version 3 of 3")
+ within(".menu-bar") do
+ expect(page).to have_content(translated(component.name))
+ expect(page).to have_content(translated(proposal.reload.title))
+ end
+
within "#diff-for-state" do
expect(page).to have_content("State")
within ".diff > ul > .ins" do
diff --git a/decidim-sortitions/README.md b/decidim-sortitions/README.md
deleted file mode 100644
index db4e9be596b65..0000000000000
--- a/decidim-sortitions/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Decidim::Sortitions
-
-This module makes possible to select among a set of proposals by sortition.
-
-## Usage
-
-Simply include it in your Decidim instance.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'decidim-sortitions'
-```
-
-And then execute:
-
-```bash
-bundle
-```
-
-## Import migrations
-
-After installing the gem you must import and execute the migrations bundled with the gem:
-
-```bash
-bundle exec rails decidim_sortitions:install:migrations
-bundle exec rails db:migrate
-```
-
-## Contributing
-
-See [Decidim](https://github.com/decidim/decidim).
-
-## License
-
-See [Decidim](https://github.com/decidim/decidim).
diff --git a/decidim-sortitions/Rakefile b/decidim-sortitions/Rakefile
deleted file mode 100644
index 447b5c1bf263a..0000000000000
--- a/decidim-sortitions/Rakefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "decidim/dev/common_rake"
diff --git a/decidim-sortitions/app/cells/decidim/sortitions/sortition_cell.rb b/decidim-sortitions/app/cells/decidim/sortitions/sortition_cell.rb
deleted file mode 100644
index 5362c6d9effb3..0000000000000
--- a/decidim-sortitions/app/cells/decidim/sortitions/sortition_cell.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require "cell/partial"
-
-module Decidim
- module Sortitions
- # This cell renders the card for an instance of a Sortition
- # the default size is the Medium Card (:m)
- class SortitionCell < Decidim::ViewModel
- def show
- cell card_size, model, @options
- end
-
- private
-
- def card_size
- "decidim/sortitions/sortition_l"
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/cells/decidim/sortitions/sortition_l_cell.rb b/decidim-sortitions/app/cells/decidim/sortitions/sortition_l_cell.rb
deleted file mode 100644
index 4efe149f6e30e..0000000000000
--- a/decidim-sortitions/app/cells/decidim/sortitions/sortition_l_cell.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "cell/partial"
-
-module Decidim
- module Sortitions
- # This cell renders a sortition with its L-size card.
- class SortitionLCell < Decidim::CardLCell
- include Decidim::Sortitions::Engine.routes.url_helpers
-
- private
-
- def has_author?
- false
- end
-
- def has_state?
- true
- end
-
- def metadata_cell
- "decidim/sortitions/sortition_metadata"
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/cells/decidim/sortitions/sortition_metadata_cell.rb b/decidim-sortitions/app/cells/decidim/sortitions/sortition_metadata_cell.rb
deleted file mode 100644
index e963fb00f69e9..0000000000000
--- a/decidim-sortitions/app/cells/decidim/sortitions/sortition_metadata_cell.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- # This cell renders the assembly metadata for l card
- class SortitionMetadataCell < Decidim::CardMetadataCell
- include Decidim::Sortitions::SortitionsHelper
-
- delegate :state, to: :model
-
- def initialize(*)
- super
-
- @items.prepend(*sortition_items)
- end
-
- def sortition_items
- [count_item, seed_item, badge_item]
- end
-
- def count_item
- {
- text: data_with_text(proposals_count, t("decidim.sortitions.sortitions.sortition.selected_proposals", count: proposals_count)),
- icon: "chat-new-line"
- }
- end
-
- def seed_item
- {
- text: data_with_text(model.seed, t("random_seed", scope: "decidim.sortitions.sortitions.sortition")),
- icon: "seedling-line"
- }
- end
-
- def badge_item
- {
- text: content_tag(:span, class: "label #{state_classes}") { badge_name }
- }
- end
-
- def has_badge?
- false
- end
-
- def badge_name
- return t("filters.cancelled", scope: "decidim.sortitions.sortitions") if model.cancelled?
-
- t("filters.active", scope: "decidim.sortitions.sortitions")
- end
-
- def data_with_text(data, text)
- "#{content_tag(:strong) { data }}#{content_tag(:span) { text }}".html_safe
- end
-
- def state_classes
- return "alert" if model.cancelled?
-
- "success"
- end
-
- def proposals_count
- @proposals_count = model.proposals.count
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb
deleted file mode 100644
index e07abfabc6edb..0000000000000
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # Command that creates a sortition that selects proposals
- class CreateSortition < Decidim::Command
- # Public: Initializes the command.
- #
- # form - A form object with the params.
- def initialize(form)
- @form = form
- end
-
- # Executes the command. Broadcasts these events:
- #
- # - :ok when everything is valid.
- # - :invalid if the form was not valid and we could not proceed.
- #
- # Returns nothing.
- def call
- return broadcast(:invalid) if form.invalid?
-
- ActiveRecord::Base.transaction do
- sortition = create_sortition
- select_proposals_for(sortition)
- send_notification(sortition)
-
- broadcast(:ok, sortition)
- end
- end
-
- private
-
- attr_reader :form
-
- def create_sortition
- Decidim.traceability.create!(
- Sortition,
- form.current_user,
- component: form.current_component,
- title: form.title,
- decidim_proposals_component_id: form.decidim_proposals_component_id,
- request_timestamp: Time.now.utc,
- author: form.current_user,
- dice: form.dice,
- target_items: form.target_items,
- witnesses: form.witnesses,
- additional_info: form.additional_info,
- selected_proposals: [],
- candidate_proposals: [],
- taxonomizations: form.taxonomizations
- )
- end
-
- def select_proposals_for(sortition)
- draw = Draw.new(sortition.reload)
-
- sortition.update(
- selected_proposals: draw.results,
- candidate_proposals: draw.proposals.pluck(:id)
- )
- end
-
- def send_notification(sortition)
- Decidim::EventsManager.publish(
- event: "decidim.events.sortitions.sortition_created",
- event_class: Decidim::Sortitions::CreateSortitionEvent,
- resource: sortition,
- followers: sortition.participatory_space.followers
- )
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb
deleted file mode 100644
index 31f7b8a89bdcb..0000000000000
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # Command that cancels a sortition
- class DestroySortition < Decidim::Command
- # Public: Initializes the command.
- #
- # form - A form object with the params.
- def initialize(form)
- @form = form
- end
-
- # Executes the command. Broadcasts these events:
- #
- # - :ok when everything is valid.
- # - :invalid if the form was not valid and we could not proceed.
- #
- # Returns nothing.
- def call
- return broadcast(:invalid) if form.invalid?
-
- destroy_sortition
- broadcast(:ok, sortition)
- end
-
- private
-
- attr_reader :form
-
- def destroy_sortition
- Decidim.traceability.perform_action!(
- :delete,
- sortition,
- form.current_user
- ) do
- sortition.update(
- cancel_reason: form.cancel_reason,
- cancelled_on: Time.now.utc,
- cancelled_by_user: form.current_user
- )
- end
- end
-
- def sortition
- @sortition ||= Sortition.find(form.id)
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb
deleted file mode 100644
index bd902e265f518..0000000000000
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # Command that creates a sortition that selects proposals
- class UpdateSortition < Decidim::Command
- # Public: Initializes the command.
- #
- # form - A form object with the params.
- def initialize(form)
- @form = form
- end
-
- # Executes the command. Broadcasts these events:
- #
- # - :ok when everything is valid.
- # - :invalid if the form was not valid and we could not proceed.
- #
- # Returns nothing.
- def call
- return broadcast(:invalid) if form.invalid?
-
- update_sortition
- broadcast(:ok, sortition)
- end
-
- private
-
- attr_reader :form
-
- def update_sortition
- Decidim.traceability.update!(
- sortition,
- form.current_user,
- title: form.title,
- additional_info: form.additional_info
- )
- end
-
- def sortition
- @sortition ||= Sortition.find(form.id)
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/controllers/concerns/decidim/sortitions/orderable.rb b/decidim-sortitions/app/controllers/concerns/decidim/sortitions/orderable.rb
deleted file mode 100644
index bd6dbd466d5ab..0000000000000
--- a/decidim-sortitions/app/controllers/concerns/decidim/sortitions/orderable.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
- module Sortitions
- # Common logic to ordering resources
- module Orderable
- extend ActiveSupport::Concern
-
- included do
- include Decidim::Orderable
-
- private
-
- # Available orders based on enabled settings
- def available_orders
- %w(random recent)
- end
-
- def default_order
- "recent"
- end
-
- def reorder(sortitions)
- case order
- when "random"
- sortitions.order_randomly(random_seed)
- when "recent"
- sortitions.order(created_at: :desc)
- end
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/admin/application_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/admin/application_controller.rb
deleted file mode 100644
index 931879e941ee4..0000000000000
--- a/decidim-sortitions/app/controllers/decidim/sortitions/admin/application_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # This controller is the abstract class from which all other controllers of
- # this engine inherit.
- #
- # Note that it inherits from `Decidim::Components::BaseController`, which
- # override its layout and provide all kinds of useful methods.
- class ApplicationController < Decidim::Admin::Components::BaseController
- helper_method :sortitions, :sortition
-
- def sortitions
- @sortitions ||= Decidim::Sortitions::FilteredSortitions
- .for(current_component)
- .order(created_at: :desc)
- .page(params[:page])
- .per(Decidim::Sortitions.items_per_page)
- end
-
- def sortition
- @sortition ||= sortitions.find(params[:id])
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/admin/sortitions_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/admin/sortitions_controller.rb
deleted file mode 100644
index d141be3116e16..0000000000000
--- a/decidim-sortitions/app/controllers/decidim/sortitions/admin/sortitions_controller.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # Controller responsible of the sortition that selects proposals from
- # a participatory space.
- class SortitionsController < Admin::ApplicationController
- helper Decidim::ApplicationHelper
- helper_method :proposal_components
-
- def index; end
-
- def show
- enforce_permission_to :read, :sortition, sortition:
- end
-
- def edit
- enforce_permission_to(:update, :sortition, sortition:)
-
- @form = edit_sortition_form.from_model(sortition, current_participatory_space:)
- end
-
- def update
- enforce_permission_to(:update, :sortition, sortition:)
-
- @form = edit_sortition_form.from_params(params, current_participatory_space:)
- UpdateSortition.call(@form) do
- on(:ok) do |_sortition|
- flash[:notice] = I18n.t("sortitions.update.success", scope: "decidim.sortitions.admin")
- redirect_to action: :index
- end
-
- on(:invalid) do
- flash.now[:alert] = I18n.t("sortitions.update.error", scope: "decidim.sortitions.admin")
- render :edit, status: :unprocessable_entity
- end
- end
- end
-
- def new
- enforce_permission_to :create, :sortition
-
- @form = sortition_form.instance(current_participatory_space:)
- end
-
- def create
- enforce_permission_to :create, :sortition
-
- @form = sortition_form.from_params(params, current_participatory_space:)
- CreateSortition.call(@form) do
- on(:ok) do |sortition|
- flash[:notice] = I18n.t("sortitions.create.success", scope: "decidim.sortitions.admin")
- redirect_to action: :show, id: sortition.id
- end
-
- on(:invalid) do
- flash.now[:alert] = I18n.t("sortitions.create.error", scope: "decidim.sortitions.admin")
- render :new, status: :unprocessable_entity
- end
- end
- end
-
- def confirm_destroy
- enforce_permission_to(:destroy, :sortition, sortition:)
-
- @form = destroy_sortition_form.from_model(sortition, current_participatory_space:)
- end
-
- def destroy
- enforce_permission_to(:destroy, :sortition, sortition:)
-
- @form = destroy_sortition_form.from_params(params, current_participatory_space:)
- DestroySortition.call(@form) do
- on(:ok) do |_sortition|
- flash[:notice] = I18n.t("sortitions.destroy.success", scope: "decidim.sortitions.admin")
- redirect_to action: :index
- end
-
- on(:invalid) do
- flash.now[:alert] = I18n.t("sortitions.destroy.error", scope: "decidim.sortitions.admin")
- render :confirm_destroy, status: :unprocessable_entity
- end
- end
- end
-
- private
-
- def sortition_form
- form(SortitionForm)
- end
-
- def edit_sortition_form
- form(EditSortitionForm)
- end
-
- def destroy_sortition_form
- form(DestroySortitionForm)
- end
-
- def proposal_components
- ParticipatorySpaceProposalComponents.for(current_participatory_space)
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb
deleted file mode 100644
index c4cf388be48de..0000000000000
--- a/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- # This controller is the abstract class from which all other controllers of
- # this engine inherit.
- #
- # Note that it inherits from `Decidim::Components::BaseController`, which
- # override its layout and provide all kinds of useful methods.
- class ApplicationController < Decidim::Components::BaseController
- end
- end
-end
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb
deleted file mode 100644
index 16bff994db426..0000000000000
--- a/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- # Exposes the sortition resource so users can view them
- class SortitionsController < Decidim::Sortitions::ApplicationController
- include FilterResource
- include Decidim::Sortitions::Orderable
- include Paginable
-
- helper_method :sortition
-
- helper Decidim::Proposals::ApplicationHelper
-
- def index
- @sortitions = search
- .result
- .includes(:taxonomies)
-
- @sortitions = reorder(@sortitions)
- @sortitions = paginate(@sortitions)
- end
-
- def show
- raise ActionController::RoutingError, "Not Found" unless sortition
- end
-
- private
-
- def sortition
- search_collection.find_by(id: params[:id])
- end
-
- def search_collection
- Sortition.where(component: current_component)
- end
-
- def default_filter_params
- {
- search_text_cont: "",
- with_any_taxonomies: nil,
- with_any_state: "active"
- }
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/events/decidim/sortitions/create_sortition_event.rb b/decidim-sortitions/app/events/decidim/sortitions/create_sortition_event.rb
deleted file mode 100644
index 77ef4e07de555..0000000000000
--- a/decidim-sortitions/app/events/decidim/sortitions/create_sortition_event.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- class CreateSortitionEvent < Decidim::Events::SimpleEvent
- end
- end
-end
diff --git a/decidim-sortitions/app/forms/decidim/sortitions/admin/destroy_sortition_form.rb b/decidim-sortitions/app/forms/decidim/sortitions/admin/destroy_sortition_form.rb
deleted file mode 100644
index 5a25c9a7ee1d8..0000000000000
--- a/decidim-sortitions/app/forms/decidim/sortitions/admin/destroy_sortition_form.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- class DestroySortitionForm < Form
- include TranslatableAttributes
-
- mimic :sortition
-
- translatable_attribute :cancel_reason, Decidim::Attributes::RichText
-
- validates :cancel_reason, translatable_presence: true
-
- delegate :current_participatory_space, to: :context
- delegate :current_component, to: :context
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/forms/decidim/sortitions/admin/edit_sortition_form.rb b/decidim-sortitions/app/forms/decidim/sortitions/admin/edit_sortition_form.rb
deleted file mode 100644
index a63bd7f58d111..0000000000000
--- a/decidim-sortitions/app/forms/decidim/sortitions/admin/edit_sortition_form.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- class EditSortitionForm < Form
- include TranslatableAttributes
-
- mimic :sortition
-
- translatable_attribute :title, String
- translatable_attribute :additional_info, Decidim::Attributes::RichText
-
- validates :title, translatable_presence: true
- validates :additional_info, translatable_presence: true
-
- delegate :current_participatory_space, to: :context
- delegate :current_component, to: :context
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/forms/decidim/sortitions/admin/sortition_form.rb b/decidim-sortitions/app/forms/decidim/sortitions/admin/sortition_form.rb
deleted file mode 100644
index d7c1d745fd60e..0000000000000
--- a/decidim-sortitions/app/forms/decidim/sortitions/admin/sortition_form.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- class SortitionForm < Form
- include Decidim::TranslatableAttributes
- include Decidim::HasTaxonomyFormAttributes
-
- mimic :sortition
-
- translatable_attribute :title, String
- attribute :decidim_proposals_component_id, Integer
- attribute :dice, Integer
- attribute :target_items, Integer
- translatable_attribute :witnesses, Decidim::Attributes::RichText
- translatable_attribute :additional_info, Decidim::Attributes::RichText
-
- validates :title, translatable_presence: true
- validates :decidim_proposals_component_id, presence: true
- validates :witnesses, translatable_presence: true
- validates :additional_info, translatable_presence: true
- validates :dice,
- presence: true,
- numericality: {
- only_integer: true,
- greater_than_or_equal_to: 1,
- less_than_or_equal_to: 6
- }
-
- validates :target_items,
- presence: true,
- numericality: {
- only_integer: true,
- greater_than_or_equal_to: 1
- }
-
- delegate :current_participatory_space, to: :context
- delegate :current_component, to: :context
-
- def participatory_space_manifest
- @participatory_space_manifest ||= current_component.participatory_space.manifest.name
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/helpers/decidim/sortitions/admin/sortitions_helper.rb b/decidim-sortitions/app/helpers/decidim/sortitions/admin/sortitions_helper.rb
deleted file mode 100644
index 5738b747c7d33..0000000000000
--- a/decidim-sortitions/app/helpers/decidim/sortitions/admin/sortitions_helper.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- module SortitionsHelper
- include Decidim::TranslationsHelper
- include Decidim::PaginateHelper
- include Decidim::SanitizeHelper
-
- # Converts a list of components into a list of selectable options
- def components_options(components)
- components.map do |f|
- [translated_attribute(f.name), f.id]
- end
- end
-
- def sortition_taxonomies(sortition)
- taxonomies = sortition.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", ")
- return taxonomies if taxonomies.present?
-
- I18n.t("sortitions.form.all_taxonomies", scope: "decidim.sortitions.admin")
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/helpers/decidim/sortitions/sortitions_helper.rb b/decidim-sortitions/app/helpers/decidim/sortitions/sortitions_helper.rb
deleted file mode 100644
index aee3f69e959f4..0000000000000
--- a/decidim-sortitions/app/helpers/decidim/sortitions/sortitions_helper.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module SortitionsHelper
- include Decidim::SanitizeHelper
- include Decidim::TranslationsHelper
-
- def proposal_path(proposal)
- EngineRouter.main_proxy(proposal.component).proposal_path(proposal)
- end
-
- def component_name
- (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.sortitions.name")
- end
-
- # Generates the sortition taxonomy labels
- def sortition_taxonomy_labels(sortition)
- if sortition.taxonomies.present?
- return I18n.t("show.taxonomies",
- scope: "decidim.sortitions.sortitions",
- taxonomies: sortition.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", "))
- end
-
- I18n.t("show.any_taxonomy", scope: "decidim.sortitions.sortitions")
- end
-
- # Show list of candidate proposals for a sortition. Selected sortition ids will appear with bold font.
- def sortition_proposal_candidate_ids(sortition)
- result = sortition.candidate_proposals.map do |proposal_id|
- if sortition.selected_proposals.include? proposal_id
- "#{proposal_id}"
- else
- proposal_id.to_s
- end
- end
-
- result.join(" - ").html_safe
- end
-
- def filter_sections_sortitions
- sections = [{ method: :with_any_state, collection: filter_state_values, label: t("decidim.sortitions.sortitions.filters.state"), id: "state" }]
- current_component.available_taxonomy_filters.each do |taxonomy_filter|
- sections.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
- collection: filter_taxonomy_values_for(taxonomy_filter),
- label: decidim_sanitize_translated(taxonomy_filter.name),
- id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
- end
- sections.reject { |item| item[:collection].blank? }
- end
-
- def filter_state_values
- [
- ["all", t("all", scope: "decidim.sortitions.sortitions.filters")],
- ["active", t("active", scope: "decidim.sortitions.sortitions.filters")],
- ["cancelled", t("cancelled", scope: "decidim.sortitions.sortitions.filters")]
- ]
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/models/decidim/sortitions/application_record.rb b/decidim-sortitions/app/models/decidim/sortitions/application_record.rb
deleted file mode 100644
index b13b03ac11a62..0000000000000
--- a/decidim-sortitions/app/models/decidim/sortitions/application_record.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- class ApplicationRecord < ActiveRecord::Base
- self.abstract_class = true
- end
- end
-end
diff --git a/decidim-sortitions/app/models/decidim/sortitions/sortition.rb b/decidim-sortitions/app/models/decidim/sortitions/sortition.rb
deleted file mode 100644
index dd76e50716957..0000000000000
--- a/decidim-sortitions/app/models/decidim/sortitions/sortition.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- # Model that encapsulates the parameters of a sortition
- class Sortition < ApplicationRecord
- include Decidim::Resourceable
- include Decidim::HasCategory
- include Decidim::Taxonomizable
- include Decidim::Authorable
- include Decidim::HasComponent
- include Decidim::HasReference
- include Decidim::Traceable
- include Decidim::Loggable
- include Decidim::Comments::CommentableWithComponent
- include Decidim::Randomable
- include Decidim::TranslatableResource
- include Decidim::FilterableResource
-
- component_manifest_name "sortitions"
-
- translatable_fields :title, :witnesses, :additional_info, :cancel_reason
-
- belongs_to :decidim_proposals_component,
- class_name: "Decidim::Component"
-
- belongs_to :cancelled_by_user,
- class_name: "Decidim::User",
- optional: true
-
- scope :active, -> { where(cancelled_on: nil) }
- scope :cancelled, -> { where.not(cancelled_on: nil) }
-
- scope_search_multi :with_any_state, [:active, :cancelled]
-
- def self.log_presenter_class_for(_log)
- Decidim::Sortitions::AdminLog::SortitionPresenter
- end
-
- def presenter
- Decidim::Sortitions::SortitionPresenter.new(self)
- end
-
- def proposals
- Decidim::Proposals::Proposal.where(id: selected_proposals)
- end
-
- def similar_count
- Sortition.where(component:)
- .where(decidim_proposals_component:)
- .with_taxonomies(*taxonomies.map(&:id))
- .where(target_items:)
- .count
- end
-
- def seed
- request_timestamp.to_i * dice
- end
-
- def cancelled?
- cancelled_on.present?
- end
-
- # Public: Overrides the `accepts_new_comments?` Commentable concern method.
- def accepts_new_comments?
- commentable?
- end
-
- # Public: Overrides the `comments_have_alignment?` Commentable concern method.
- def comments_have_alignment?
- true
- end
-
- # Public: Overrides the `comments_have_votes?` Commentable concern method.
- def comments_have_votes?
- true
- end
-
- # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
- def allow_resource_permissions?
- true
- end
-
- # Create i18n ransackers for :title, :additional_info and :witnesses.
- # Create the :search_text ransacker alias for searching from all of these.
- ransacker_i18n_multi :search_text, [:title, :additional_info, :witnesses]
-
- def self.ransackable_scopes(_auth_object = nil)
- [:with_any_state, :with_any_taxonomies]
- end
-
- def self.ransackable_attributes(_auth_object = nil)
- %w(additional_info cancel_reason cancelled_by_user_id cancelled_on candidate_proposals comments_count created_at decidim_author_id
- decidim_author_type decidim_component_id decidim_proposals_component_id dice id reference request_timestamp search_text selected_proposals
- target_items title updated_at witnesses)
- end
-
- def self.ransackable_associations(_auth_object = nil)
- %w(author cancelled_by_user taxonomies comment_threads comments component decidim_proposals_component resource_links_from
- resource_links_to resource_permission versions)
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/packs/entrypoints/decidim_sortitions.js b/decidim-sortitions/app/packs/entrypoints/decidim_sortitions.js
deleted file mode 100644
index 4714ea2999817..0000000000000
--- a/decidim-sortitions/app/packs/entrypoints/decidim_sortitions.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Images
-require.context("../images", true)
-
-// CSS
-import "stylesheets/sortitions.scss"
diff --git a/decidim-sortitions/app/packs/images/decidim/sortitions/icon.svg b/decidim-sortitions/app/packs/images/decidim/sortitions/icon.svg
deleted file mode 100644
index 18a213251e924..0000000000000
--- a/decidim-sortitions/app/packs/images/decidim/sortitions/icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/decidim-sortitions/app/packs/stylesheets/sortitions.scss b/decidim-sortitions/app/packs/stylesheets/sortitions.scss
deleted file mode 100644
index b33b7ecedc640..0000000000000
--- a/decidim-sortitions/app/packs/stylesheets/sortitions.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.sortition {
- &__aside-element {
- &-item {
- @apply border-b border-gray-3 py-4 first:pt-0 last:pb-0 last:border-b-0;
- }
-
- &-item__title {
- @apply text-sm block text-gray-2 mb-1;
- }
-
- &-item__text {
- @apply text-md block font-semibold text-gray-2;
- }
-
- &-item__numbers {
- @apply text-md block text-gray-2;
- }
- }
-
- &__aside__count-number {
- @apply text-5xl block text-center text-gray-2 font-bold;
- }
-
- &__aside__count-text {
- @apply text-gray-2 text-sm block text-center;
- }
-}
-
-a.sortition__aside-element-item__title {
- @apply text-secondary underline;
-}
diff --git a/decidim-sortitions/app/permissions/decidim/sortitions/admin/permissions.rb b/decidim-sortitions/app/permissions/decidim/sortitions/admin/permissions.rb
deleted file mode 100644
index f6862148055d3..0000000000000
--- a/decidim-sortitions/app/permissions/decidim/sortitions/admin/permissions.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- class Permissions < Decidim::DefaultPermissions
- def permissions
- return permission_action unless user
-
- return permission_action if permission_action.scope != :admin
-
- return permission_action if permission_action.subject != :sortition
-
- case permission_action.action
- when :destroy
- permission_action.allow! if sortition.present? && !sortition.cancelled?
- when :update
- permission_action.allow! if sortition.present?
- when :create, :read
- permission_action.allow!
- end
-
- permission_action
- end
-
- private
-
- def sortition
- @sortition ||= context.fetch(:sortition, nil)
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/permissions/decidim/sortitions/permissions.rb b/decidim-sortitions/app/permissions/decidim/sortitions/permissions.rb
deleted file mode 100644
index 06868f0ef0e6c..0000000000000
--- a/decidim-sortitions/app/permissions/decidim/sortitions/permissions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- class Permissions < Decidim::DefaultPermissions
- def permissions
- return permission_action unless user
-
- return Decidim::Sortitions::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
-
- permission_action
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb b/decidim-sortitions/app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb
deleted file mode 100644
index 9b3e58631d184..0000000000000
--- a/decidim-sortitions/app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module AdminLog
- # This class holds the logic to present a `Decidim::Sortitions::Sortition`
- # for the `AdminLog` log.
- #
- # Usage should be automatic and you should not need to call this class
- # directly, but here is an example:
- #
- # action_log = Decidim::ActionLog.last
- # view_helpers # => this comes from the views
- # SortitionPresenter.new(action_log, view_helpers).present
- class SortitionPresenter < Decidim::Log::BasePresenter
- private
-
- def action_string
- case action
- when "create", "delete", "update"
- "decidim.sortitions.admin_log.sortition.#{action}"
- else
- super
- end
- end
-
- def diff_fields_mapping
- {
- cancel_reason: :i18n,
- dice: :integer,
- request_timestamp: :date,
- witnesses: :i18n,
- additional_info: :i18n,
- title: :i18n,
- reference: :string,
- decidim_proposals_component_id: :component
- }
- end
-
- def i18n_labels_scope
- "activemodel.attributes.sortition"
- end
-
- def diff_actions
- super + %w(delete)
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/presenters/decidim/sortitions/sortition_presenter.rb b/decidim-sortitions/app/presenters/decidim/sortitions/sortition_presenter.rb
deleted file mode 100644
index 7dce97178ed43..0000000000000
--- a/decidim-sortitions/app/presenters/decidim/sortitions/sortition_presenter.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- class SortitionPresenter < Decidim::ResourcePresenter
- def sortition
- __getobj__
- end
-
- def title(html_escape: false, all_locales: false)
- return unless sortition
-
- super(sortition.title, html_escape, all_locales)
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
deleted file mode 100644
index f666fc73db64b..0000000000000
--- a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # Query that retrieves a list of proposal components
- class ParticipatorySpaceProposalComponents < Decidim::Query
- attr_reader :participatory_space
-
- # Sugar syntax. Allow retrieving all proposal components for the
- # given participatory space.
- def self.for(participatory_space)
- new(participatory_space).query
- end
-
- # Initializes the query
- def initialize(participatory_space)
- @participatory_space = participatory_space
- end
-
- def query
- Component
- .where(participatory_space:, manifest_name: "proposals")
- .published
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
deleted file mode 100644
index c436449f8d629..0000000000000
--- a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- class ParticipatorySpaceProposals < Decidim::Query
- # Sugar syntax. Retrieve all proposals for the given sortition.
- def self.for(sortition)
- new(sortition).query
- end
-
- # Initializes the class.
- #
- # sortition - a sortition to select proposals
- def initialize(sortition)
- @sortition = sortition
- @taxonomies = sortition.taxonomies
- @request_timestamp = sortition.request_timestamp
- end
-
- # Given a participatory process retrieves its proposals
- #
- # Returns an ActiveRecord::Relation.
- def query
- proposals = Decidim::Proposals::Proposal
- .not_withdrawn
- .published
- .not_hidden
- .where(decidim_proposals_proposals: { created_at: ...request_timestamp })
- .where(component: sortition.decidim_proposals_component)
- proposals = proposals.where.not(id: proposals.only_status(:rejected))
-
- return proposals.order(id: :asc) if taxonomies.blank?
-
- # taxonomization -> taxonomy
- proposals.with_taxonomies(*taxonomies.map(&:id)).order(id: :asc)
- end
-
- private
-
- attr_reader :sortition, :taxonomies, :request_timestamp
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb b/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb
deleted file mode 100644
index fd5d2f9bf595a..0000000000000
--- a/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- # A class used to find sortitions filtered by components and a date range
- class FilteredSortitions < Decidim::Query
- # Syntactic sugar to initialize the class and return the queried objects.
- #
- # components - An array of Decidim::Component
- # start_at - A date to filter resources created after it
- # end_at - A date to filter resources created before it.
- def self.for(components, start_at = nil, end_at = nil)
- new(components, start_at, end_at).query
- end
-
- # Initializes the class.
- #
- # components - An array of Decidim::Component
- # start_at - A date to filter resources created after it
- # end_at - A date to filter resources created before it.
- def initialize(components, start_at = nil, end_at = nil)
- @components = components
- @start_at = start_at
- @end_at = end_at
- end
-
- # Finds the Proposals scoped to an array of components and filtered
- # by a range of dates.
- def query
- sortitions = Decidim::Sortitions::Sortition.where(component: @components)
- sortitions = sortitions.where(created_at: @start_at..) if @start_at.present?
- sortitions = sortitions.where(created_at: ..@end_at) if @end_at.present?
- sortitions
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/services/decidim/sortitions/admin/draw.rb b/decidim-sortitions/app/services/decidim/sortitions/admin/draw.rb
deleted file mode 100644
index e438153512e4e..0000000000000
--- a/decidim-sortitions/app/services/decidim/sortitions/admin/draw.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Sortitions
- module Admin
- # This class represents a draw for selecting proposals.
- class Draw
- attr_reader :sortition
-
- # Sugar syntax. Retrieves the list of selected proposals.
- def self.for(sortition)
- new(sortition).results
- end
-
- # Initializes the draw class. Receives a sortition.
- def initialize(sortition)
- @sortition = sortition
- end
-
- # Executes the draw and return the selected proposal ids.
- def results
- proposals.sample(sortition.target_items, random: Random.new(sortition.seed)).pluck(:id)
- end
-
- def proposals
- @proposals ||= ParticipatorySpaceProposals.for(sortition).to_a
- end
- end
- end
- end
-end
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/_form.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/_form.html.erb
deleted file mode 100644
index 25489287a47dc..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/_form.html.erb
+++ /dev/null
@@ -1,54 +0,0 @@
- |
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/confirm_destroy.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/confirm_destroy.html.erb
deleted file mode 100644
index b84c52b574ba6..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/confirm_destroy.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% add_decidim_page_title(t(".title")) %>
-
-
-
-
- <% if @form.taxonomy_filters&.any? %>
-
-
-
-
-
- <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
-
-
-
- <%= form.select :decidim_proposals_component_id,
- components_options(proposal_components),
- prompt: t(".select_proposal_component") %>
-
-
-
- <% end %>
-
-
-
-
-
- <%= t(".select_taxonomies") %>- <% @form.taxonomy_filters.each do |filter| %> -
- <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
-
- <% end %>
-
-
-
-
-
-
-
- <%= form.number_field :target_items, min: 1, step: 1 %>
-
-
-
- <%= form.translated :editor, :witnesses, lines: 10, toolbar: :content, aria: { label: :witnesses } %>
-
-
-
- <%= form.translated :editor, :additional_info, lines: 10, aria: { label: :additional_info } %>
-
-
-
- <%= form.number_field :dice, min: 1, max: 6, step: 1 %>
-
-
-
-
-- <%= t(".title") %> --
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/edit.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/edit.html.erb
deleted file mode 100644
index d0358527b7607..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/edit.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% add_decidim_page_title(translated_attribute(sortition.title)) %>
-
- <%= decidim_form_for(@form, html: { class: "form form-defaults confirm_destroy_sortition" }, method: :delete) do |form| %>
-
-
-
-
-
-
-
-
-
-
-
- <%= form.translated :editor, :cancel_reason, lines: 10, toolbar: :content, aria: { label: :cancel_reason } %>
-
-
-
- <% end %>
-
- <%= form.submit t(".destroy"), data: { confirm: t(".confirm_destroy") }, class: "button button__sm button__secondary" %>
-
-
-
-- <%= t ".title" %> --
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/index.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/index.html.erb
deleted file mode 100644
index 77e1e10651261..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/index.html.erb
+++ /dev/null
@@ -1,91 +0,0 @@
-<% add_decidim_page_title(t(".title")) %>
-
- <%= decidim_form_for(@form, html: { class: "form-defaults form edit_sortition" }) do |form| %>
-
-
-
- <% end %>
-
-
-
-
-
-
-
- <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
-
-
-
- <%= form.translated :editor, :additional_info, lines: 10, aria: { label: :additional_info } %>
-
-
-
-
- <%= form.submit t(".update"), class: "button button__sm button__secondary" %>
-
-
-
-<%= decidim_paginate sortitions %>
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/new.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/new.html.erb
deleted file mode 100644
index d57a32493dc62..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/new.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% add_decidim_page_title(t(".title")) %>
-
-
-
- - <%= t(".title") %> - <% if allowed_to? :create, :sortition %> - <%= link_to t("actions.new_sortition", scope: "decidim.sortitions.admin"), new_sortition_path, class: "button button__sm button__secondary" %> - <% end %> - <%= render partial: "decidim/admin/components/resource_action" %> --<%= t("deprecation_warning_html", scope: "decidim.sortitions.admin") %>
-
-
-
-
-
-- <%= t ".title" %> --
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb
deleted file mode 100644
index 18add8ae23136..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-<% add_decidim_page_title(translated_attribute(sortition.title)) %>
-
- <%= decidim_form_for(@form, html: { class: "form-defaults form new_sortition" }) do |f| %>
- <%= render partial: "form", object: f %>
-
-
-
- <% end %>
-
- <%= f.submit t(".create"), data: { confirm: t(".confirm") }, class: "button button__sm button__secondary" %>
-
-
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_count.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_count.html.erb
deleted file mode 100644
index 751caf9872db1..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_count.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= t(".proposals_count", count: proposals.count) %>
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb
deleted file mode 100644
index af624f2addb25..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- - <%= decidim_escape_translated(sortition.title) %> --
-
-
-
-
- <% resources.each do |sortition| %>
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_proposal.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_proposal.html.erb
deleted file mode 100644
index 04692b7c4dbcb..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_proposal.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= card_for proposal, url_extra_params: { included_in: sortition.to_gid } %>
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_results_count.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_results_count.html.erb
deleted file mode 100644
index eea6586761e8d..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_results_count.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- <% end %>
-
- <%= link_to resource_locator(sortition).path do %>
- <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
- <% end %>
-
-
- <%= link_to resource_locator(sortition).path, class: "card__link" do %>
-
- <%= decidim_escape_translated(sortition.title) %>- <% end %> - -
-
- <%= sortition.selected_proposals.size %>
- <%= t(".selected_proposals", count: proposal.selected_proposals.size) %>
-
-
-
- <%= sortition.selected_proposals.count %>
-
-
- <%= t(".count", count: sortition.selected_proposals.count) %>
-
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition.html.erb
deleted file mode 100644
index 6045fd9f04c28..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= card_for sortition %>
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_author.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_author.html.erb
deleted file mode 100644
index 23b62a738f5cf..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_author.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb
deleted file mode 100644
index bab9a58be200a..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortitions.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortitions.html.erb
deleted file mode 100644
index 1b11c51a35efe..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_sortitions.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% if @sortitions.any? %>
- <%= t("count", scope: "decidim.sortitions.sortitions.sortitions_count", count: @sortitions.total_count) %>- - <%= order_selector available_orders, i18n_scope: "decidim.sortitions.sortitions.orders" %> - -
- <%= render @sortitions %>
-
-
- <%= decidim_paginate @sortitions %>
-<% else %>
- <%= cell "decidim/announcement", t("empty", scope: "decidim.sortitions.sortitions.index") %>
-<% end %>
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/index.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/index.html.erb
deleted file mode 100644
index 6d61bbc0b71c6..0000000000000
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/index.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% add_decidim_meta_tags(
- description: translated_attribute(current_component.participatory_space.try(:description)),
- title: t("decidim.components.pagination.page_title",
- component_name: component_name,
- current_page: @sortitions.current_page,
- total_pages: @sortitions.total_pages ),
- url: sortitions_url,
- resource: current_component) %>
-
-<% content_for :aside do %>
- <%= component_name %>- - <%= render layout: "decidim/shared/filters", locals: { filter_sections: filter_sections_sortitions, search_variable: :search_text_cont, skip_to_id: "sortitions" } do %> - <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %> - <% end %> -<% end %> - -<%= render layout: "layouts/decidim/shared/layout_two_col" do %> -- <%= decidim_escape_translated(sortition.title) %> -- -
- <%= decidim_sanitize_editor_admin translated_attribute sortition.additional_info %>
-
- - <%= t("witnesses", scope: "decidim.sortitions.sortitions.show") %> --
- <%= decidim_sanitize_editor translated_attribute sortition.witnesses %>
-
- - <%= t("proposals_selected_by_sortition", scope: "decidim.sortitions.sortitions.show") %> --
- <%= render partial: "proposal", collection: sortition.proposals %>
-
- - <%= t("cancelled", scope: "decidim.sortitions.sortitions.show") %> -- - <%= cell("decidim/announcement", decidim_sanitize_editor(translated_attribute(sortition.cancel_reason)), callout_class: "alert") %> -
- <%= t("sortition_reproducibility_details", scope: "decidim.sortitions.sortitions.show") %>
-
-
-
-
-
- <%= t("dice_result", scope: "decidim.sortitions.sortitions.show") %>
-
-
- <%= sortition.dice %>º
-
-
-
-
- <%= t("time_seed", scope: "decidim.sortitions.sortitions.show") %>
-
-
- <%= sortition.request_timestamp.to_i %>
-
-
-
-
- <%= t("mathematical_result", scope: "decidim.sortitions.sortitions.show") %>
-
-
- <%= sortition.seed %>
-
-
-
- <%= link_to t("algorithm", scope: "decidim.sortitions.sortitions.show"), Decidim::Sortitions.sortition_algorithm, class: "text-secondary sortition__aside-element-item__title underline" %>
-
-
- <%= t("candidate_proposal_ids", scope: "decidim.sortitions.sortitions.show") %>
-
-
-
-
-
- <%= t("candidate_proposals_info", scope: "decidim.sortitions.sortitions.show", taxonomy_labels: sortition_taxonomy_labels(sortition)) %>
-
-
- <%= sortition_proposal_candidate_ids sortition %>
-
-
- ", " ") { Decidim::Faker::Localized.sentence(word_count: 4) } } - let(:additional_info) { Decidim::Faker::Localized.wrapped("", " ") { Decidim::Faker::Localized.sentence(word_count: 4) } } - let(:title) { Decidim::Faker::Localized.sentence(word_count: 3) } - let(:taxonomy) { create(:taxonomy, :with_parent, organization:) } - let(:taxonomies) { [] } - let(:params) do - { - decidim_proposals_component_id: proposal_component.id, - taxonomies:, - dice:, - title:, - target_items:, - witnesses:, - additional_info: - } - end - - let(:sortition_component) { create(:sortition_component, participatory_space: participatory_process) } - - let(:context) do - { - current_component: sortition_component, - current_user: author - } - end - - let(:form) { SortitionForm.from_params(sortition: params).with_context(context) } - let(:command) { described_class.new(form) } - - describe "when the form is not valid" do - before do - allow(form).to receive(:invalid?).and_return(true) - end - - it "broadcasts invalid" do - expect { command.call }.to broadcast(:invalid) - end - - it "does not create the sortition" do - expect do - command.call - end.not_to(change { Sortition.where(component: sortition_component).count }) - end - end - - describe "when the form is valid" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - before do - allow(form).to receive(:invalid?).and_return(false) - end - - it "broadcasts ok" do - expect { command.call }.to broadcast(:ok) - end - - it "creates a sortition" do - expect do - command.call - end.to change { Sortition.where(component: sortition_component).count }.by(1) - end - - it "traces the action", versioning: true do - expect(Decidim.traceability) - .to receive(:create!) - .with(Sortition, author, kind_of(Hash)) - .and_call_original - - expect { command.call }.to change(Decidim::ActionLog, :count) - action_log = Decidim::ActionLog.last - expect(action_log.version).to be_present - end - - it "the created sortition contains a list of selected proposals" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).not_to be_empty - end - - it "the created sortition contains a list of candidate proposals" do - command.call - sortition = Sortition.where(component: sortition_component).last - - expect(sortition.candidate_proposals).not_to be_empty - end - - it "has no taxonomies" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.taxonomies).to be_blank - end - - context "when restricted to a taxonomy without proposals" do - let!(:taxonomies) { [taxonomy.id] } - - it "has taxonomies" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.taxonomies).to eq([taxonomy]) - end - - it "the created sortition has not proposals" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to be_empty - end - end - - context "when proposals has been moderated" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :hidden, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to be_empty - end - end - - context "when proposals are rejected" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :rejected, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to be_empty - end - end - - context "when proposals are withdrawn" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :withdrawn, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to be_empty - end - end - - context "when proposals are draft" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :draft, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to be_empty - end - end - - context "when restricted to taxonomies with proposals" do - let!(:taxonomies) { [taxonomy.id] } - let!(:proposal) { create(:proposal, component: proposal_component, taxonomies: [taxonomy]) } - - it "the created sortition contains proposals" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).not_to be_empty - expect(sortition.selected_proposals.first).to eq(proposal.id) - end - - context "when proposals has been moderated" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :hidden, - taxonomies: [taxonomy], - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to eq([proposal.id]) - end - end - - context "when proposals are rejected" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :rejected, - taxonomies: [taxonomy], - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to eq([proposal.id]) - end - end - - context "when proposals are withdrawn" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :withdrawn, - taxonomies: [taxonomy], - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to eq([proposal.id]) - end - end - - context "when proposals are draft" do - let!(:proposals) do - create_list(:proposal, target_items.to_i, - :draft, - taxonomies: [taxonomy], - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - - it "returns empty" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.selected_proposals).to eq([proposal.id]) - end - end - end - - it "has a reference" do - command.call - sortition = Sortition.where(component: sortition_component).last - expect(sortition.reference).not_to be_blank - end - - it "sends a notification to the participatory space followers" do - follower = create(:user, organization:) - create(:follow, followable: participatory_process, user: follower) - - expect(Decidim::EventsManager) - .to receive(:publish) - .with( - event: "decidim.events.sortitions.sortition_created", - event_class: Decidim::Sortitions::CreateSortitionEvent, - resource: kind_of(Sortition), - followers: [follower] - ) - - command.call - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb b/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb deleted file mode 100644 index e90f6dc58dd8a..0000000000000 --- a/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb +++ /dev/null @@ -1,88 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe DestroySortition do - let(:organization) { create(:organization) } - let(:admin) { create(:user, :admin, organization:) } - let(:participatory_process) { create(:participatory_process, organization:) } - let(:sortition_component) { create(:sortition_component, participatory_space: participatory_process) } - let(:sortition) { create(:sortition, component: sortition_component) } - let(:cancel_reason) do - Decidim::Faker::Localized.wrapped("", " ") { Decidim::Faker::Localized.sentence(word_count: 4) } - end - - let(:params) do - { - id: sortition.id, - sortition: { - cancel_reason: - } - } - end - - let(:context) do - { - current_component: sortition_component, - current_user: admin - } - end - - let(:form) { DestroySortitionForm.from_params(sortition: params).with_context(context) } - let(:command) { described_class.new(form) } - - describe "when the form is not valid" do - before do - allow(form).to receive(:invalid?).and_return(true) - end - - it "broadcasts invalid" do - expect { command.call }.to broadcast(:invalid) - end - - it "does not cancel the sortition" do - command.call - sortition.reload - expect(sortition).not_to be_cancelled - end - end - - describe "when the form is valid" do - before do - allow(form).to receive(:invalid?).and_return(false) - end - - it "broadcasts ok" do - expect { command.call }.to broadcast(:ok) - end - - it "Cancels the sortition" do - command.call - sortition.reload - expect(sortition).to be_cancelled - end - - it "traces the action", versioning: true do - expect(Decidim.traceability) - .to receive(:perform_action!) - .with(:delete, sortition, admin) - .and_call_original - - expect { command.call }.to change(Decidim::ActionLog, :count) - action_log = Decidim::ActionLog.last - expect(action_log.version).to be_present - end - - it "Data from the user who cancelled the sortition is stored" do - command.call - sortition.reload - expect(sortition.cancelled_by_user).to eq(admin) - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb b/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb deleted file mode 100644 index bb19188fcb37a..0000000000000 --- a/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb +++ /dev/null @@ -1,78 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe UpdateSortition do - let(:additional_info) { Decidim::Faker::Localized.wrapped("", " ") { Decidim::Faker::Localized.sentence(word_count: 4) }.except("machine_translations") } - let(:title) { Decidim::Faker::Localized.sentence(word_count: 3).except(:machine_translations) } - let(:sortition) { create(:sortition) } - let(:user) { create(:user, :admin, :confirmed) } - let(:params) do - { - id: sortition.id, - sortition: { - title:, - additional_info: - } - } - end - - let(:context) do - { - current_user: user, - current_component: sortition.component - } - end - - let(:form) { EditSortitionForm.from_params(params).with_context(context) } - let(:command) { described_class.new(form) } - - describe "when the form is not valid" do - before do - allow(form).to receive(:invalid?).and_return(true) - end - - it "broadcasts invalid" do - expect { command.call }.to broadcast(:invalid) - end - end - - describe "when the form is valid" do - before do - allow(form).to receive(:invalid?).and_return(false) - end - - it "broadcasts ok" do - expect { command.call }.to broadcast(:ok) - end - - it "Updates the title" do - command.call - sortition.reload - expect(sortition.title.except("machine_translations")).to eq(title) - end - - it "Updates the additional info" do - command.call - sortition.reload - expect(sortition.additional_info.except("machine_translations")).to eq(additional_info) - end - - it "traces the action", versioning: true do - expect(Decidim.traceability) - .to receive(:update!) - .with(sortition, user, kind_of(Hash)) - .and_call_original - - expect { command.call }.to change(Decidim::ActionLog, :count) - action_log = Decidim::ActionLog.last - expect(action_log.version).to be_present - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb b/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb deleted file mode 100644 index 28b3d418177bd..0000000000000 --- a/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb +++ /dev/null @@ -1,235 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe SortitionsController do - let(:component) { sortition.component } - let(:sortition) { create(:sortition) } - let(:user) { create(:user, :confirmed, :admin, organization: component.organization) } - - before do - request.env["decidim.current_organization"] = component.organization - request.env["decidim.current_component"] = component - sign_in user, scope: :user - end - - describe "show" do - let(:sortition) { create(:sortition) } - let(:params) do - { - component_id: sortition.component.id, - participatory_process_slug: sortition.component.participatory_space.slug, - id: sortition.id - } - end - - it "renders the show template" do - get(:show, params:) - expect(response).to render_template(:show) - end - end - - describe "new" do - let(:params) do - { participatory_process_slug: component.participatory_space.slug } - end - - it "renders the new template" do - get(:new, params:) - expect(response).to render_template(:new) - end - end - - describe "create" do - let(:decidim_taxonomy_ids) { nil } - let(:dice) { ::Faker::Number.between(from: 1, to: 6) } - let(:target_items) { ::Faker::Number.between(from: 1, to: 10) } - let(:params) do - { - participatory_process_slug: sortition.component.participatory_space.slug, - sortition: { - decidim_proposals_component_id:, - decidim_taxonomy_ids:, - dice:, - target_items:, - title: { - en: "Title", - es: "Título", - ca: "Títol" - }, - witnesses: { - en: "Witnesses", - es: "Testigos", - ca: "Testimonis" - }, - additional_info: { - en: "Additional information", - es: "Información adicional", - ca: "Informació adicional" - } - } - } - end - - context "with invalid params" do - let(:decidim_proposals_component_id) { nil } - - it "renders the new template" do - post(:create, params:) - expect(response).to render_template(:new) - end - end - - context "with valid params" do - let(:proposal_component) { create(:proposal_component, participatory_space: component.participatory_space) } - let(:decidim_proposals_component_id) { proposal_component.id } - - it "redirects to show newly created sortition" do - expect(controller).to receive(:redirect_to) do |params| - expect(params).to eq(action: :show, id: Sortition.last.id) - end - - post :create, params: - end - - it "Sortition author is the current user" do - expect(controller).to receive(:redirect_to) do |params| - expect(params).to eq(action: :show, id: Sortition.last.id) - end - - post(:create, params:) - expect(Sortition.last.author).to eq(user) - end - end - end - - describe "confirm_destroy" do - let(:sortition) { create(:sortition) } - let(:params) do - { - component_id: sortition.component.id, - participatory_process_slug: sortition.component.participatory_space.slug, - id: sortition.id - } - end - - it "renders the confirm_destroy template" do - get(:confirm_destroy, params:) - expect(response).to render_template(:confirm_destroy) - end - end - - describe "destroy" do - let(:cancel_reason) do - { - en: "Cancel reason", - es: "Motivo de la cancelación", - ca: "Motiu de la cancelació" - } - end - let(:params) do - { - participatory_process_slug: component.participatory_space.slug, - id: sortition.id, - sortition: { - cancel_reason: - } - } - end - - context "with invalid params" do - let(:cancel_reason) do - { - en: "", - es: "", - ca: "" - } - end - - it "renders the confirm_destroy template" do - delete(:destroy, params:) - expect(response).to render_template(:confirm_destroy) - end - end - - context "with valid params" do - it "redirects to sortitions list newly created sortition" do - expect(controller).to receive(:redirect_to).with(action: :index) - - delete :destroy, params: - end - end - end - - describe "edit" do - let(:sortition) { create(:sortition) } - let(:params) do - { - participatory_process_slug: component.participatory_space.slug, - component_id: sortition.component.id, - id: sortition.id - } - end - - it "renders the edit template" do - get(:edit, params:) - expect(response).to render_template(:edit) - end - end - - describe "update" do - let(:title) do - { - en: "Title", - es: "Título", - ca: "Títol" - } - end - let(:additional_info) do - { - en: "Additional info", - es: "Información adicional", - ca: "Informació adicional" - } - end - let(:params) do - { - participatory_process_slug: component.participatory_space.slug, - id: sortition.id, - sortition: { - title:, - additional_info: - } - } - end - - context "with invalid params" do - let(:title) do - { - en: "", - es: "", - ca: "" - } - end - - it "renders the edit template" do - patch(:update, params:) - expect(response).to render_template(:edit) - end - end - - context "with valid params" do - it "redirects to sortitions list newly created sortition" do - expect(controller).to receive(:redirect_to).with(action: :index) - - patch :update, params: - end - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/events/decidim/sortitions/create_sortition_event_spec.rb b/decidim-sortitions/spec/events/decidim/sortitions/create_sortition_event_spec.rb deleted file mode 100644 index baaf06426e70b..0000000000000 --- a/decidim-sortitions/spec/events/decidim/sortitions/create_sortition_event_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Sortitions::CreateSortitionEvent do - let(:resource) { create(:sortition) } - let(:notification_title) { "The sortition #{resource_title} has been added to #{participatory_space_title}" } - let(:email_outro) { "You have received this notification because you are following \"#{participatory_space_title}\". You can unfollow it from the previous link." } - let(:email_intro) { "The sortition \"#{resource_title}\" has been added to \"#{participatory_space_title}\" that you are following." } - let(:email_subject) { "New sortition added to #{decidim_sanitize_translated(participatory_space.title)}" } - let(:event_name) { "decidim.events.sortitions.sortition_created" } - - include_context "when a simple event" - it_behaves_like "a simple event" - it_behaves_like "a simple event email" - it_behaves_like "a simple event notification" -end diff --git a/decidim-sortitions/spec/factories.rb b/decidim-sortitions/spec/factories.rb deleted file mode 100644 index c6e793fb624ce..0000000000000 --- a/decidim-sortitions/spec/factories.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -require "decidim/core/test/factories" -require "decidim/proposals/test/factories" -require "decidim/sortitions/test/factories" -require "decidim/comments/test/factories" diff --git a/decidim-sortitions/spec/forms/decidim/sortitions/admin/destroy_sortition_form_spec.rb b/decidim-sortitions/spec/forms/decidim/sortitions/admin/destroy_sortition_form_spec.rb deleted file mode 100644 index 1bd768281fd1a..0000000000000 --- a/decidim-sortitions/spec/forms/decidim/sortitions/admin/destroy_sortition_form_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe DestroySortitionForm do - subject { form } - - let(:organization) { build(:organization) } - - let(:cancel_reason) do - { - en: "Cancel reason", - es: "Motivo de la cancelación", - ca: "Motiu de la cancelació" - } - end - let(:params) do - { - sortition: { - cancel_reason_en: cancel_reason[:en], - cancel_reason_es: cancel_reason[:es], - cancel_reason_ca: cancel_reason[:ca] - } - } - end - - let(:form) { described_class.from_params(params).with_context(current_organization: organization) } - - context "when everything is OK" do - it { is_expected.to be_valid } - end - - context "when no cancel_reason" do - let(:cancel_reason) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - end - end - end -end diff --git a/decidim-sortitions/spec/forms/decidim/sortitions/admin/edit_sortition_form_spec.rb b/decidim-sortitions/spec/forms/decidim/sortitions/admin/edit_sortition_form_spec.rb deleted file mode 100644 index 25f8beb8e9926..0000000000000 --- a/decidim-sortitions/spec/forms/decidim/sortitions/admin/edit_sortition_form_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe EditSortitionForm do - subject { form } - - let(:organization) { build(:organization) } - - let(:title) do - { - en: "Title", - es: "Título", - ca: "Títol" - } - end - let(:additional_info) do - { - en: "Additional info", - es: "Información adicional", - ca: "Informació adicional" - } - end - let(:params) do - { - sortition: { - title_en: title[:en], - title_es: title[:es], - title_ca: title[:ca], - additional_info_en: additional_info[:en], - additional_info_es: additional_info[:es], - additional_info_ca: additional_info[:ca] - } - } - end - - let(:form) { described_class.from_params(params).with_context(current_organization: organization) } - - context "when everything is OK" do - it { is_expected.to be_valid } - end - - context "when no title" do - let(:title) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - - context "when no additional info" do - let(:additional_info) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - end - end - end -end diff --git a/decidim-sortitions/spec/forms/decidim/sortitions/admin/sortition_form_spec.rb b/decidim-sortitions/spec/forms/decidim/sortitions/admin/sortition_form_spec.rb deleted file mode 100644 index 8106681245c44..0000000000000 --- a/decidim-sortitions/spec/forms/decidim/sortitions/admin/sortition_form_spec.rb +++ /dev/null @@ -1,128 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe SortitionForm do - subject(:form) { described_class.from_params(params).with_context(context) } - - let(:organization) { create(:organization) } - let(:context) do - { - current_organization: organization, - current_component:, - current_participatory_space: participatory_process - } - end - let(:participatory_process) { create(:participatory_process, organization:) } - let(:current_component) { create(:component, participatory_space: participatory_process, manifest_name: "sortitions") } - - let(:decidim_proposals_component_id) { ::Faker::Number.number(digits: 10) } - let(:dice) { ::Faker::Number.between(from: 1, to: 6) } - let(:target_items) { ::Faker::Number.number(digits: 2) } - let(:taxonomies) { [] } - let(:title) do - { - en: "Title", - es: "Título", - ca: "Títol" - } - end - let(:witnesses) do - { - en: "Witnesses", - es: "Testigos", - ca: "Testimonis" - } - end - let(:additional_info) do - { - en: "Additional info", - es: "Información adicional", - ca: "Informació adicional" - } - end - let(:params) do - { - sortition: { - decidim_proposals_component_id:, - taxonomies:, - dice:, - target_items:, - title_en: title[:en], - title_es: title[:es], - title_ca: title[:ca], - witnesses_en: witnesses[:en], - witnesses_es: witnesses[:es], - witnesses_ca: witnesses[:ca], - additional_info_en: additional_info[:en], - additional_info_es: additional_info[:es], - additional_info_ca: additional_info[:ca] - } - } - end - - context "when everything is OK" do - it { is_expected.to be_valid } - end - - context "when there is no proposals component selected" do - let(:decidim_proposals_component_id) { nil } - - it { is_expected.to be_invalid } - end - - describe "taxonomies" do - let(:component) { current_component } - let(:participatory_space) { participatory_process } - - it_behaves_like "a taxonomizable resource" - end - - context "when there is no dice value selected" do - let(:dice) { nil } - - it { is_expected.to be_invalid } - end - - context "when dice value is invalid" do - let(:dice) { "7" } - - it { is_expected.to be_invalid } - end - - context "when there is no target items value selected" do - let(:target_items) { nil } - - it { is_expected.to be_invalid } - end - - context "when target items value is invalid" do - let(:target_items) { "0" } - - it { is_expected.to be_invalid } - end - - context "when no title" do - let(:title) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - - context "when no witnesses" do - let(:witnesses) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - - context "when no additional info" do - let(:additional_info) { { es: "", en: "", ca: "" } } - - it { is_expected.to be_invalid } - end - end - end - end -end diff --git a/decidim-sortitions/spec/helpers/decidim/sortitions/admin/sortitions_helper_spec.rb b/decidim-sortitions/spec/helpers/decidim/sortitions/admin/sortitions_helper_spec.rb deleted file mode 100644 index ff32439242d9e..0000000000000 --- a/decidim-sortitions/spec/helpers/decidim/sortitions/admin/sortitions_helper_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe SortitionsHelper do - describe "components_options" do - let(:components) { [double(id: 1, name: { "en" => "Component name" })] } - - it "Returns a list of selectable components" do - expect(helper.components_options(components)).to include(["Component name", 1]) - end - end - - describe "sortition_taxonomies" do - let(:sortition) { double(taxonomies:) } - - context "when taxonomy is null" do - let(:taxonomies) { [] } - - it "Returns all taxonomies" do - expect(helper.sortition_taxonomies(sortition)).to eq("All taxonomies") - end - end - - context "when taxonomy is not null" do - let(:taxonomies) { [double(name: { "en" => "Taxonomy name" })] } - - it "Returns the taxonomy name" do - expect(helper.sortition_taxonomies(sortition)).to eq("Taxonomy name") - end - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/helpers/decidim/sortitions/sortitions_helper_spec.rb b/decidim-sortitions/spec/helpers/decidim/sortitions/sortitions_helper_spec.rb deleted file mode 100644 index 99cdf686d3463..0000000000000 --- a/decidim-sortitions/spec/helpers/decidim/sortitions/sortitions_helper_spec.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - describe SortitionsHelper do - describe "proposal_path" do - let(:proposal) { create(:proposal) } - - it "Returns a path for a proposal" do - expect(helper.proposal_path(proposal)).not_to be_blank - end - end - - describe "sortition_taxonomy_labels" do - let(:sortition) { create(:sortition) } - - context "when sortition has no taxonomies" do - it "returns from all taxonomies" do - expect(helper.sortition_taxonomy_labels(sortition)).to eq("from all taxonomies") - end - end - - context "when sortition has taxonomies" do - let(:taxonomy) { create(:taxonomy, :with_parent, skip_injection: true, organization: sortition.organization) } - - before do - sortition.taxonomies << taxonomy - end - - it "returns from the given taxonomy" do - expect(helper.sortition_taxonomy_labels(sortition)).to eq("from the #{taxonomy.name["en"]} taxonomies") - end - end - end - - describe "sortition_proposal_candidate_ids" do - let(:sortition) { create(:sortition) } - let!(:label) { helper.sortition_proposal_candidate_ids(sortition) } - - it "Contains all candidate proposal ids" do - sortition.candidate_proposals.each do |proposal_id| - expect(label).to include proposal_id.to_s - end - end - - it "Selected proposal ids appear in bold" do - sortition.selected_proposals.each do |proposal_id| - expect(label).to include "#{proposal_id}" - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/lib/decidim/sortitions/component_spec.rb b/decidim-sortitions/spec/lib/decidim/sortitions/component_spec.rb deleted file mode 100644 index 7e27bec7f31df..0000000000000 --- a/decidim-sortitions/spec/lib/decidim/sortitions/component_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe "Accountability component" do # rubocop:disable RSpec/DescribeClass - let!(:component) { create(:sortition_component) } - let(:organization) { component.organization } - let!(:current_user) { create(:user, :confirmed, :admin, organization:) } - - describe "on edit", type: :system do - let(:edit_component_path) do - Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id) - end - - before do - switch_to_host(organization.host) - login_as current_user, scope: :user - end - - context "when comments_max_length is empty" do - it_behaves_like "has mandatory config setting", :comments_max_length - end - end -end diff --git a/decidim-sortitions/spec/lib/decidim/sortitions/engine_spec.rb b/decidim-sortitions/spec/lib/decidim/sortitions/engine_spec.rb deleted file mode 100644 index b5f633d0e84e4..0000000000000 --- a/decidim-sortitions/spec/lib/decidim/sortitions/engine_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Sortitions::Engine do - it_behaves_like "clean engine" -end diff --git a/decidim-sortitions/spec/models/decidim/module/sortitions/sortition_spec.rb b/decidim-sortitions/spec/models/decidim/module/sortitions/sortition_spec.rb deleted file mode 100644 index 9e7bf151bc9a2..0000000000000 --- a/decidim-sortitions/spec/models/decidim/module/sortitions/sortition_spec.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - describe Sortition do - subject { sortition } - - let(:sortition) { build(:sortition) } - - it { is_expected.to be_valid } - it { is_expected.to be_versioned } - - include_examples "has taxonomies" - - describe "seed" do - it "is the multiplication of timestamp per dice value" do - expect(sortition.seed).to eq(sortition.request_timestamp.to_i * sortition.dice) - end - end - - describe "similar_count" do - let(:sortition) { create(:sortition) } - let(:taxonomy1) { create(:taxonomy, :with_parent, organization: sortition.organization) } - let(:taxonomy2) { create(:taxonomy, :with_parent, organization: sortition.organization) } - - before do - sortition.taxonomies = [taxonomy1, taxonomy2] - sortition.reload - end - - context "when first sortition" do - it "is one" do - expect(sortition.similar_count).to eq(1) - end - end - - context "when following sortitions" do - let(:repetitions) { 2 } - - before do - create_list(:sortition, repetitions, - component: sortition.component, - decidim_proposals_component: sortition.decidim_proposals_component, - target_items: sortition.target_items).each do |sortition| - Decidim::Taxonomization.create!(taxonomy_id: taxonomy1.id, taxonomizable: sortition) - end - - create_list(:sortition, repetitions, - component: sortition.component, - decidim_proposals_component: sortition.decidim_proposals_component, - target_items: sortition.target_items) - end - - it "Counts similar sortitions" do - expect(sortition.similar_count).to eq(1 + repetitions) - end - end - end - - describe "proposals" do - it "returns a list of selected proposals" do - expect(sortition.proposals).to eq(Decidim::Proposals::Proposal.where(id: sortition.selected_proposals)) - end - end - - describe "cancelled" do - it "is true when cancelled_on has value" do - sortition = build(:sortition, cancelled_on: Time.now.utc) - expect(sortition).to be_cancelled - end - - it "is false when cancelled_on is nil" do - sortition = build(:sortition, cancelled_on: nil) - expect(sortition).not_to be_cancelled - end - end - end - end -end diff --git a/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb b/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb deleted file mode 100644 index 96fab5d3945d0..0000000000000 --- a/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb +++ /dev/null @@ -1,93 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Sortitions::Admin::Permissions do - subject { described_class.new(user, permission_action, context).permissions.allowed? } - - let(:user) { create(:user, organization: sortition_component.organization) } - let(:context) do - { - current_component: sortition_component, - sortition: - } - end - let(:sortition_component) { create(:sortition_component) } - let(:sortition) { create(:sortition, component: sortition_component) } - let(:permission_action) { Decidim::PermissionAction.new(**action) } - let(:registrations_enabled) { true } - let(:action) do - { scope: :admin, action: action_name, subject: :sortition } - end - let(:action_name) { :foo } - - context "when scope is not admin" do - let(:action) do - { scope: :foo, action: :vote, subject: :sortition } - end - - it_behaves_like "permission is not set" - end - - context "when subject is not a sortition" do - let(:action) do - { scope: :admin, action: :vote, subject: :foo } - end - - it_behaves_like "permission is not set" - end - - context "when action is a random one" do - let(:action_name) { :foo } - - it_behaves_like "permission is not set" - end - - context "when reading a sortition" do - let(:action_name) { :read } - - it { is_expected.to be true } - end - - context "when creating a sortition" do - let(:action_name) { :create } - - it { is_expected.to be true } - end - - context "when destroying a sortition" do - let(:action_name) { :destroy } - - context "when sortition is present" do - context "when sortition is not cancelled" do - it { is_expected.to be true } - end - - context "when sortition is cancelled" do - let(:sortition) { create(:sortition, :cancelled, component: sortition_component) } - - it_behaves_like "permission is not set" - end - end - - context "when sortition is missing" do - let(:sortition) { nil } - - it_behaves_like "permission is not set" - end - end - - context "when updating a sortition" do - let(:action_name) { :update } - - context "when sortition is present" do - it { is_expected.to be true } - end - - context "when sortition is missing" do - let(:sortition) { nil } - - it_behaves_like "permission is not set" - end - end -end diff --git a/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb b/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb deleted file mode 100644 index 05be490cec42d..0000000000000 --- a/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Sortitions::Permissions do - subject { described_class.new(user, permission_action, context).permissions.allowed? } - - let(:user) { create(:user, organization: sortition_component.organization) } - let(:context) do - { - current_component: sortition_component, - sortition: - } - end - let(:sortition_component) { create(:sortition_component) } - let(:sortition) { create(:sortition, component: sortition_component) } - let(:permission_action) { Decidim::PermissionAction.new(**action) } - let(:registrations_enabled) { true } - - context "when scope is admin" do - let(:action) do - { scope: :admin, action: :vote, subject: :sortition } - end - - it_behaves_like "delegates permissions to", Decidim::Sortitions::Admin::Permissions - end - - context "when any other condition" do - let(:action) do - { scope: :foo, action: :blah, subject: :sortition } - end - - it_behaves_like "permission is not set" - end -end diff --git a/decidim-sortitions/spec/presenters/decidim/sortitions/admin_log/sortition_presenter_spec.rb b/decidim-sortitions/spec/presenters/decidim/sortitions/admin_log/sortition_presenter_spec.rb deleted file mode 100644 index 0a76a638d9050..0000000000000 --- a/decidim-sortitions/spec/presenters/decidim/sortitions/admin_log/sortition_presenter_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe Decidim::Sortitions::AdminLog::SortitionPresenter, type: :helper do - include_examples "present admin log entry" do - let(:participatory_space) { create(:participatory_process, organization:) } - let(:component) { create(:sortition_component, participatory_space:) } - let(:admin_log_resource) { create(:sortition, component:) } - let(:action) { "delete" } - end -end diff --git a/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposal_components_spec.rb b/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposal_components_spec.rb deleted file mode 100644 index e92f58a9860e0..0000000000000 --- a/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposal_components_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe ParticipatorySpaceProposalComponents do - let(:organization) { create(:organization) } - let(:participatory_process) { create(:participatory_process, organization:) } - let(:proposal_components) { create_list(:proposal_component, 10, participatory_space: participatory_process) } - let(:unpublished_proposal_components) { create_list(:proposal_component, 10, participatory_space: participatory_process, published_at: nil) } - let(:sortition_components) { create_list(:sortition_component, 10, participatory_space: participatory_process) } - - it "returns proposal components in the participatory space" do - expect(described_class.for(participatory_process)).to include(*proposal_components) - end - - it "Do not include unpublished proposal components" do - expect(described_class.for(participatory_process)).not_to include(*unpublished_proposal_components) - end - - it "do not return other components in participatory space" do - expect(described_class.for(participatory_process)).not_to include(*sortition_components) - end - end - end - end -end diff --git a/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposals_spec.rb b/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposals_spec.rb deleted file mode 100644 index e6c557b22d54e..0000000000000 --- a/decidim-sortitions/spec/queries/decidim/sortitions/admin/participatory_space_proposals_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe ParticipatorySpaceProposals do - let(:organization) { create(:organization) } - let(:participatory_process) { create(:participatory_process, organization:) } - let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process) } - let(:another_proposal_component) { create(:proposal_component, participatory_space: participatory_process) } - let(:proposals) { create_list(:proposal, 10, component: proposal_component, created_at: request_timestamp - 10.days) } - let(:request_timestamp) { Time.now.utc } - let(:taxonomies) { [] } - let(:decidim_proposals_component) { proposal_component } - let(:sortition) do - double( - request_timestamp:, - taxonomies:, - decidim_proposals_component: - ) - end - - context "when filtering by component" do - let(:other_component_proposals) { create_list(:proposal, 10, component: another_proposal_component) } - - it "Includes only proposals in this component" do - expect(described_class.for(sortition)).to include(*proposals) - end - - it "Do not includes proposals in other components" do - expect(described_class.for(sortition)).not_to include(*other_component_proposals) - end - end - - context "when filtering by creation date" do - let(:recent_proposals) { create_list(:proposal, 10, component: proposal_component, created_at: Time.now.utc) } - let(:request_timestamp) { Time.now.utc - 1.day } - - it "Includes proposals created before the sortition date" do - expect(described_class.for(sortition)).to include(*proposals) - end - - it "Do not includes proposals created after the sortition date" do - expect(described_class.for(sortition)).not_to include(*recent_proposals) - end - end - - context "when filtering by taxonomy" do - let(:taxonomy) { create(:taxonomy, :with_parent, organization:) } - let(:sub_taxonomy) { create(:taxonomy, parent: taxonomy, organization:) } - let(:taxonomy_proposals) do - create_list(:proposal, 10, - component: proposal_component, - taxonomies: [taxonomy], - created_at: request_timestamp - 10.days) - end - let(:sub_taxonomy_proposals) do - create_list(:proposal, 10, - component: proposal_component, - taxonomies: [sub_taxonomy], - created_at: request_timestamp - 10.days) - end - - context "and no taxonomies" do - it "Contains all proposals" do - expect(described_class.for(sortition)).to include(*proposals) - expect(described_class.for(sortition)).to include(*taxonomy_proposals) - expect(described_class.for(sortition)).to include(*sub_taxonomy_proposals) - end - end - - context "and taxonomy is passed" do - let(:taxonomies) { [taxonomy] } - - it "Contains proposals of the taxonomy and sub_taxonomies" do - expect(described_class.for(sortition)).to include(*taxonomy_proposals) - expect(described_class.for(sortition)).to include(*sub_taxonomy_proposals) - end - - it "Do not contains proposals of the taxonomy" do - expect(described_class.for(sortition)).not_to include(*proposals) - end - end - - context "and sub_taxonomy is passed" do - let(:taxonomies) { [sub_taxonomy] } - - it "Contains proposals of the sub_taxonomy" do - expect(described_class.for(sortition)).to include(*sub_taxonomy_proposals) - end - - it "Do not contains proposals of the taxonomy" do - expect(described_class.for(sortition)).not_to include(*proposals) - expect(described_class.for(sortition)).not_to include(*taxonomy_proposals) - end - end - end - - context "when filtering withdrawn proposals" do - let(:proposals) do - create_list(:proposal, 10, :withdrawn, component: proposal_component, created_at: request_timestamp - 10.days) - end - - it "do not return withdrawn proposals" do - expect(described_class.for(sortition)).not_to include(*proposals) - end - end - - context "when filtering drafts proposals" do - let(:proposals) do - create_list(:proposal, 10, :draft, component: proposal_component, created_at: request_timestamp - 10.days) - end - - it "do not return draft proposals" do - expect(described_class.for(sortition)).not_to include(*proposals) - end - end - end - end - end -end diff --git a/decidim-sortitions/spec/queries/decidim/sortitions/filtered_sortitions_spec.rb b/decidim-sortitions/spec/queries/decidim/sortitions/filtered_sortitions_spec.rb deleted file mode 100644 index 0492069e925ae..0000000000000 --- a/decidim-sortitions/spec/queries/decidim/sortitions/filtered_sortitions_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - describe FilteredSortitions do - let(:organization) { create(:organization) } - let(:component) { create(:sortition_component, organization:) } - let(:other_component) { create(:sortition_component) } - let!(:sortitions) { create_list(:sortition, 10, component:) } - - it "Includes all sortitions for the given component" do - expect(described_class.for(component)).to include(*sortitions) - end - - it "Do not includes sortitions from other components" do - expect(described_class.for(other_component)).not_to include(*sortitions) - end - end - end -end diff --git a/decidim-sortitions/spec/requests/sortition_search_spec.rb b/decidim-sortitions/spec/requests/sortition_search_spec.rb deleted file mode 100644 index ac19427e8881e..0000000000000 --- a/decidim-sortitions/spec/requests/sortition_search_spec.rb +++ /dev/null @@ -1,114 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -RSpec.describe "Sortition search" do - include Decidim::ComponentPathHelper - - subject { response.body } - - let(:component) { create(:sortition_component) } - let(:participatory_space) { component.participatory_space } - let(:organization) { participatory_space.organization } - let(:filter_params) { {} } - - let!(:sortition1) { create(:sortition, title: { en: "A doggo" }, component:) } - let!(:sortition2) { create(:sortition, additional_info: { en: "There is a doggo in the office" }, component:) } - let!(:sortition3) { create(:sortition, witnesses: { en: "My doggo was there" }, component:) } - let!(:sortition4) { create(:sortition, component:) } - let!(:sortition5) { create(:sortition, :cancelled, component:) } - - let(:request_path) { Decidim::EngineRouter.main_proxy(component).sortitions_path } - - before do - get( - request_path, - params: { filter: filter_params }, - headers: { "HOST" => component.organization.host } - ) - end - - it_behaves_like "a resource search", :sortition - it_behaves_like "a resource search with taxonomies", :sortition - - it "displays all non-cancelled sortitions without any filters" do - expect(subject).to include(decidim_escape_translated(sortition1.title)) - expect(subject).to include(decidim_escape_translated(sortition2.title)) - expect(subject).to include(decidim_escape_translated(sortition3.title)) - expect(subject).to include(decidim_escape_translated(sortition4.title)) - expect(subject).not_to include(decidim_escape_translated(sortition5.title)) - end - - context "when searching by text" do - let(:filter_params) { { search_text_cont: "doggo" } } - - it "displays only the sortitions containing the search_text" do - expect(subject).to include(decidim_escape_translated(sortition1.title)) - expect(subject).to include(decidim_escape_translated(sortition2.title)) - expect(subject).to include(decidim_escape_translated(sortition3.title)) - expect(subject).not_to include(decidim_escape_translated(sortition4.title)) - expect(subject).not_to include(decidim_escape_translated(sortition5.title)) - end - end - - context "when searching by state" do - let(:filter_params) { { with_any_state: state } } - - context "and the state is active" do - let(:state) { "active" } - - it "displays the active sortitions" do - expect(subject).to include(decidim_escape_translated(sortition1.title)) - expect(subject).to include(decidim_escape_translated(sortition2.title)) - expect(subject).to include(decidim_escape_translated(sortition3.title)) - expect(subject).to include(decidim_escape_translated(sortition4.title)) - expect(subject).not_to include(decidim_escape_translated(sortition5.title)) - end - end - - context "and the state is cancelled" do - let(:state) { "cancelled" } - - it "displays only the cancelled sortition" do - expect(subject).not_to include(decidim_escape_translated(sortition1.title)) - expect(subject).not_to include(decidim_escape_translated(sortition2.title)) - expect(subject).not_to include(decidim_escape_translated(sortition3.title)) - expect(subject).not_to include(decidim_escape_translated(sortition4.title)) - expect(subject).to include(decidim_escape_translated(sortition5.title)) - end - end - - context "and the state is all" do - let(:state) { "all" } - - it "displays all the sortitions" do - expect(subject).to include(decidim_escape_translated(sortition1.title)) - expect(subject).to include(decidim_escape_translated(sortition2.title)) - expect(subject).to include(decidim_escape_translated(sortition3.title)) - expect(subject).to include(decidim_escape_translated(sortition4.title)) - expect(subject).to include(decidim_escape_translated(sortition5.title)) - end - end - end - - describe "#index" do - let(:url) { "http://#{component.organization.host + request_path}" } - - it "redirects to the index page" do - get( - url_to_root(request_path), - params: {}, - headers: { "HOST" => component.organization.host } - ) - expect(response["Location"]).to eq(url) - expect(response).to have_http_status(:moved_permanently) - end - end - - private - - def url_to_root(url) - parts = url.split("/") - parts[0..-2].join("/") - end -end diff --git a/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb b/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb deleted file mode 100644 index 651206d610dbc..0000000000000 --- a/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim - module Sortitions - module Admin - describe Draw do - let(:organization) { create(:organization) } - let(:participatory_process) { create(:participatory_process, organization:) } - let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process) } - let(:target_items) { ::Faker::Number.number(digits: 2).to_i } - let(:seed) { Time.now.utc.to_i * ::Faker::Number.between(from: 1, to: 6).to_i } - let!(:proposals) do - create_list(:proposal, target_items * 2, - component: proposal_component, - created_at: Time.now.utc - 1.day) - end - let(:sortition) do - double( - target_items:, - seed:, - taxonomies: [], - request_timestamp: Time.now.utc, - decidim_proposals_component: proposal_component - ) - end - let(:initial_draw) { Draw.for(sortition) } - - it "Draw can be reproduced several times" do - expect(Draw.for(sortition)).to eq(initial_draw) - end - end - end - end -end diff --git a/decidim-sortitions/spec/shared/cancel_sortitions_examples.rb b/decidim-sortitions/spec/shared/cancel_sortitions_examples.rb deleted file mode 100644 index c6e10488d9b7d..0000000000000 --- a/decidim-sortitions/spec/shared/cancel_sortitions_examples.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -shared_examples "cancel sortitions" do - describe "cancellation" do - let!(:sortition) { create(:sortition, component: current_component) } - - before do - visit_component_admin - within "tr", text: decidim_escape_translated(sortition.title) do - find("button[data-controller='dropdown']").click - click_on "Cancel the sortition" - end - end - - it "requires cancellation reason" do - within "form" do - expect(page).to have_content(/Cancel reason/i) - end - end - - it_behaves_like "having a rich text editor for field", ".tabs-content[data-tabs-content='sortition-cancel_reason-tabs']", "content" - - context "when cancels a sortition" do - it "Redirects to sortitions view" do - within ".confirm_destroy_sortition" do - fill_in_i18n_editor( - :sortition_cancel_reason, - "#sortition-cancel_reason-tabs", - en: "Cancel reason", - es: "Mótivo de cancelación", - ca: "Motiu de cancelació" - ) - - accept_confirm { find("*[type=submit]").click } - end - - expect(page).to have_admin_callout("successfully") - end - end - end -end diff --git a/decidim-sortitions/spec/shared/manage_sortitions_examples.rb b/decidim-sortitions/spec/shared/manage_sortitions_examples.rb deleted file mode 100644 index 750f9aed80246..0000000000000 --- a/decidim-sortitions/spec/shared/manage_sortitions_examples.rb +++ /dev/null @@ -1,110 +0,0 @@ -# frozen_string_literal: true - -shared_examples "manage sortitions" do - describe "creation" do - let(:taxonomy) { create(:taxonomy, :with_parent, organization: current_component.organization) } - let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy: taxonomy.parent, participatory_space_manifests: [current_component.participatory_space.manifest.name]) } - let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) } - let!(:proposal_component) do - create(:proposal_component, :published, participatory_space: current_component.participatory_space) - end - - before do - current_component.update!(settings: { taxonomy_filters: [taxonomy_filter.id] }) - click_on "New sortition" - end - - it "Requires a title" do - within "form" do - expect(page).to have_content(/Title/i) - end - end - - it "can be related to taxonomies" do - within "form" do - expect(page).to have_content(/Taxonomies of the set of proposals in which you want to apply the draw/i) - end - end - - it "Requires a random number" do - within "form" do - expect(page).to have_content(/Result of die roll/i) - end - end - - it "Requires the number of proposals to select" do - within "form" do - expect(page).to have_content(/Number of proposals to be selected/i) - end - end - - it "Requires the proposals component" do - within "form" do - expect(page).to have_content(/Proposals set/i) - end - end - - it "Requires the witnesses" do - within "form" do - expect(page).to have_content(/Witnesses/i) - end - end - - it "Requires additional information" do - within "form" do - expect(page).to have_content(/Sortition information/i) - end - end - - context "when creates a sortition" do - let(:sortition_dice) { Faker::Number.between(from: 1, to: 6) } - let(:sortition_target_items) { Faker::Number.between(from: 1, to: 10) } - let!(:proposal) { create(:proposal, component: proposal_component) } - let(:attributes) { attributes_for(:sortition, component: current_component) } - - it_behaves_like "having a rich text editor for field", ".tabs-content[data-tabs-content='sortition-additional_info-tabs']", "full" - it_behaves_like "having a rich text editor for field", ".tabs-content[data-tabs-content='sortition-witnesses-tabs']", "content" - - it "shows the sortition details", versioning: true do - within ".new_sortition" do - fill_in :sortition_dice, with: sortition_dice - fill_in :sortition_target_items, with: sortition_target_items - select translated(proposal_component.name), from: :sortition_decidim_proposals_component_id - - fill_in_i18n_editor(:sortition_witnesses, "#sortition-witnesses-tabs", **attributes[:witnesses].except("machine_translations")) - fill_in_i18n_editor(:sortition_additional_info, "#sortition-additional_info-tabs", **attributes[:additional_info].except("machine_translations")) - fill_in_i18n(:sortition_title, "#sortition-title-tabs", **attributes[:title].except("machine_translations")) - - accept_confirm { find("*[type=submit]").click } - end - - expect(page).to have_admin_callout("successfully") - expect(page).to have_content(/Title/i) - - sortition = Decidim::Sortitions::Sortition.last - within ".sortition" do - expect(page).to have_content(/Draw time/i) - expect(page).to have_content(/Dice/i) - expect(page).to have_content(/Items to select/i) - expect(page).to have_content(/Taxonomies/i) - expect(page).to have_content(/All taxonomies/i) - expect(page).to have_content(/Proposals component/i) - expect(page).to have_content(translated(proposal_component.name)) - expect(page).to have_content(/Seed/i) - expect(page).to have_content(sortition.seed) - end - - within ".proposals" do - expect(page).to have_content(/Proposals selected for draw/i) - expect(sortition.proposals).not_to be_empty - sortition.proposals.each do |p| - expect(page).to have_content(translated(p.title)) - end - end - - visit decidim_admin.root_path - expect(page).to have_content("created the #{translated(attributes[:title])} sortition") - end - end - end -end diff --git a/decidim-sortitions/spec/shared/update_sortitions_examples.rb b/decidim-sortitions/spec/shared/update_sortitions_examples.rb deleted file mode 100644 index aa5796cfc3633..0000000000000 --- a/decidim-sortitions/spec/shared/update_sortitions_examples.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true - -shared_examples "update sortitions" do - describe "update sortition data" do - let!(:sortition) { create(:sortition, component: current_component) } - let(:attributes) { attributes_for(:sortition, component: current_component) } - - before do - visit_component_admin - within "tr", text: decidim_escape_translated(sortition.title) do - find("button[data-controller='dropdown']").click - click_on "Edit" - end - end - - it_behaves_like "having a rich text editor for field", ".tabs-content[data-tabs-content='sortition-additional_info-tabs']", "full" - - it "requires title" do - within "form" do - expect(page).to have_content(/Title/i) - end - end - - it "requires additional information" do - within "form" do - expect(page).to have_content(/Sortition information/i) - end - end - - context "when updates a sortition" do - it "Redirects to sortitions view", versioning: true do - within ".edit_sortition" do - fill_in_i18n_editor(:sortition_additional_info, "#sortition-additional_info-tabs", **attributes[:additional_info].except("machine_translations")) - fill_in_i18n(:sortition_title, "#sortition-title-tabs", **attributes[:title].except("machine_translations")) - - find("*[type=submit]").click - end - - expect(page).to have_admin_callout("successfully") - - visit decidim_admin.root_path - expect(page).to have_content("updated the #{translated(attributes[:title])} sortition") - end - end - end -end diff --git a/decidim-sortitions/spec/spec_helper.rb b/decidim-sortitions/spec/spec_helper.rb deleted file mode 100644 index db3a51cf80ab9..0000000000000 --- a/decidim-sortitions/spec/spec_helper.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -require "decidim/dev" - -ENV["ENGINE_ROOT"] = File.dirname(__dir__) - -Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app")) - -require "decidim/dev/test/base_spec_helper" diff --git a/decidim-sortitions/spec/system/decidim/sortitions/admin/admin_manages_sortitions_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/admin/admin_manages_sortitions_spec.rb deleted file mode 100644 index dc8b60220c29d..0000000000000 --- a/decidim-sortitions/spec/system/decidim/sortitions/admin/admin_manages_sortitions_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe "Admin manages sortitions" do - let(:manifest_name) { "sortitions" } - - include_context "when managing a component as an admin" - - it_behaves_like "manage sortitions" - it_behaves_like "cancel sortitions" - it_behaves_like "update sortitions" - it_behaves_like "manage taxonomy filters in settings" - - context "when adding a new sortitions module" do - let(:component_name) { "My super new sortitions component" } - - it "is added" do - visit current_path - within_admin_sidebar_menu do - click_on "Components" - end - click_on "Add component" - click_on "Sortitions" - - fill_in_i18n( - :component_name, - "#component-name-tabs", - en: component_name - ) - - click_on "Add component" - - expect(page).to have_content("Component created successfully") - expect(page).to have_content(component_name) - end - end -end diff --git a/decidim-sortitions/spec/system/decidim/sortitions/admin/index_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/admin/index_spec.rb deleted file mode 100644 index b844fd352b1a7..0000000000000 --- a/decidim-sortitions/spec/system/decidim/sortitions/admin/index_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe "index" do - include_context "when managing a component as an admin" - let!(:sortition) { create(:sortition, component: current_component) } - let(:manifest_name) { "sortitions" } - - before do - visit_component_admin - end - - it_behaves_like "access component permissions form" - - it "Contains a new button" do - expect(page).to have_link("New") - end - - it "Contains a button that shows sortition details" do - within "tr", text: decidim_escape_translated(sortition.title) do - find("button[data-controller='dropdown']").click - expect(page).to have_link("Sortition details") - end - end - - it "Contains the sortitions data" do - expect(page).to have_content(sortition.title[:en]) - expect(page).to have_content(sortition.reference) - end -end diff --git a/decidim-sortitions/spec/system/decidim/sortitions/preview_sortitions_with_share_token_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/preview_sortitions_with_share_token_spec.rb deleted file mode 100644 index cdf94b1a9d781..0000000000000 --- a/decidim-sortitions/spec/system/decidim/sortitions/preview_sortitions_with_share_token_spec.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe "preview sortitions with a share token" do - let(:manifest_name) { "sortitions" } - - include_context "with a component" - it_behaves_like "preview component with a share_token" -end diff --git a/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb deleted file mode 100644 index 3065b2baca900..0000000000000 --- a/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb +++ /dev/null @@ -1,92 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -describe "show" do - include_context "with a component" - let(:manifest_name) { "sortitions" } - - context "when shows the sortition component" do - let!(:sortition) { create(:sortition, component:) } - - before do - visit_component - find("#sortitions .card__list").click - end - - it "shows the sortition additional info" do - expect(page).to have_content(sortition.additional_info[:en]) - end - - it "shows the sortition witnesses" do - expect(page).to have_content(sortition.witnesses[:en]) - end - end - - context "when sortition result" do - let(:sortition) { create(:sortition, component:) } - let!(:proposals) do - create_list(:proposal, 10, - component: sortition.decidim_proposals_component, - created_at: sortition.request_timestamp - 1.day, - skip_injection: true) - end - - before do - sortition.update(selected_proposals: Decidim::Sortitions::Admin::Draw.for(sortition)) - visit_component - find("#sortitions .card__list").click - end - - context "when votes are enabled" do - let!(:decidim_proposals_component) { create(:proposal_component, :with_votes_enabled, organization: component.organization) } - let!(:sortition) { create(:sortition, component:, decidim_proposals_component:) } - - it "shows all selected proposals" do - sortition.proposals.each do |p| - expect(page).to have_content(translated(p.title)) - end - end - end - - it "there are selected proposals" do - expect(sortition.selected_proposals).not_to be_empty - end - - it "shows all selected proposals" do - sortition.proposals.each do |p| - expect(page).to have_content(translated(p.title)) - end - end - - it "shows a banner links back to the result" do - proposal = sortition.proposals.last - - within "#proposals" do - click_on translated(proposal.title) - end - - expect(page).to have_content("Included in #{translated(sortition.title)}") - end - end - - context "when cancelled sortition" do - let(:witnesses) { Decidim::Faker::Localized.wrapped("", " ") { generate_localized_title } } - let(:additional_info) { Decidim::Faker::Localized.wrapped("", " ") { generate_localized_title } } - let(:cancel_reason) { Decidim::Faker::Localized.wrapped("", " ") { generate_localized_title } } - let!(:sortition) { create(:sortition, :cancelled, component:, witnesses:, additional_info:, cancel_reason:) } - - before do - page.visit "#{main_component_path(component)}?filter[with_any_state]=cancelled" - find("#sortitions .card__list").click - end - - context "when the field is additional_info" do - it_behaves_like "has embedded video in description", :additional_info - end - - it "shows the cancel reasons" do - expect(page).to have_content(sortition.cancel_reason[:en]) - end - end -end diff --git a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_social_share_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/sortitions_social_share_spec.rb deleted file mode 100644 index 89c3484181b06..0000000000000 --- a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_social_share_spec.rb +++ /dev/null @@ -1,49 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" -require "decidim/core/test/shared_examples/social_share_examples" - -describe "Social shares" do - let(:organization) { create(:organization) } - let(:participatory_process) { create(:participatory_process, hero_image:, organization:) } - let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } - let(:component) { create(:sortition_component, participatory_space: participatory_process) } - let(:sortition) { create(:sortition, component:, additional_info:) } - let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) } - let(:additional_info) { { en: "Description">
- <%= l template.created_at, format: :long %>
+ <%= l template.created_at, format: :decidim_short %>
|
" class="table-list__actions">
|
">
- <%= l template.created_at, format: :long %>
+ <%= l template.created_at, format: :decidim_short %>
|
" class="table-list__actions">
|
">
- <%= l template.created_at, format: :long %>
+ <%= l template.created_at, format: :decidim_short %>
|
" class="table-list__actions">
| |