decidim-elections 0.27.7 → 0.28.0.rc4

data/app/controllers/concerns/decidim/elections/has_vote_flow.rb

@@ -19,7 +19,7 @@ module Decidim
 
       def default_vote_flow
         Decidim::Elections::CurrentUserVoteFlow.new(election, current_user) do
-          allowed_to?(:user_vote, :election, election: election)
+          allowed_to?(:user_vote, :election, election:)
         end
       end
 
@@ -32,7 +32,7 @@ module Decidim
       def can_preview?
         return @can_preview if defined?(@can_preview)
 
-        @preview_mode = allowed_to?(:preview, :election, election: election)
+        @preview_mode = allowed_to?(:preview, :election, election:)
       end
 
       def ballot_questions

data/app/controllers/concerns/decidim/votings/admin/voting_admin.rb

@@ -35,7 +35,7 @@ module Decidim
           end
 
           def permissions_context
-            super.merge(current_participatory_space: current_participatory_space)
+            super.merge(current_participatory_space:)
           end
 
           def permission_class_chain

data/app/controllers/concerns/decidim/votings/needs_voting.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Votings
-    # This module, when injected into a controller, ensures there's a
+    # This module, when injected into a controller, ensures there is a
     # voting available and deducts it from the context.
     module NeedsVoting
       def self.enhance_controller(instance_or_module)

data/app/controllers/decidim/elections/admin/answers_controller.rb

@@ -5,22 +5,21 @@ module Decidim
     module Admin
       # This controller allows the create or update answers for a question.
       class AnswersController < Admin::ApplicationController
-        include Decidim::Proposals::Admin::Picker
         helper Decidim::ApplicationHelper
         helper_method :election, :question, :answers, :answers, :missing_answers
 
         def index
-          flash.now[:alert] = I18n.t("answers.index.invalid_max_selections", scope: "decidim.elections.admin", missing_answers: missing_answers) if missing_answers.positive?
+          flash.now[:alert] = I18n.t("answers.index.invalid_max_selections", scope: "decidim.elections.admin", missing_answers:) if missing_answers.positive?
         end
 
         def new
-          enforce_permission_to :update, :answer, election: election, question: question
+          enforce_permission_to(:update, :answer, election:, question:)
           @form = form(AnswerForm).instance
         end
 
         def create
-          enforce_permission_to :update, :answer, election: election, question: question
-          @form = form(AnswerForm).from_params(params, election: election, question: question)
+          enforce_permission_to(:update, :answer, election:, question:)
+          @form = form(AnswerForm).from_params(params, election:, question:)
 
           CreateAnswer.call(@form) do
             on(:ok) do
@@ -36,13 +35,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :answer, election: election, question: question
+          enforce_permission_to(:update, :answer, election:, question:)
           @form = form(AnswerForm).from_model(answer)
         end
 
         def update
-          enforce_permission_to :update, :answer, election: election, question: question
-          @form = form(AnswerForm).from_params(params, election: election, question: question)
+          enforce_permission_to(:update, :answer, election:, question:)
+          @form = form(AnswerForm).from_params(params, election:, question:)
 
           UpdateAnswer.call(@form, answer) do
             on(:ok) do
@@ -66,7 +65,7 @@ module Decidim
         end
 
         def change_selected(selected)
-          enforce_permission_to :select, :answer, election: election, question: question
+          enforce_permission_to(:select, :answer, election:, question:)
 
           UpdateAnswerSelection.call(answer, selected) do
             on(:ok) do
@@ -90,7 +89,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :update, :answer, election: election, question: question
+          enforce_permission_to(:update, :answer, election:, question:)
 
           DestroyAnswer.call(answer, current_user) do
             on(:ok) do

data/app/controllers/decidim/elections/admin/application_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       # Note that it inherits from `Decidim::Admin::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Components::BaseController
+        include Decidim::Elections::ContentSecurityPolicy
       end
     end
   end

data/app/controllers/decidim/elections/admin/elections_controller.rb

@@ -18,7 +18,7 @@ module Decidim
 
         def create
           enforce_permission_to :create, :election
-          @form = form(ElectionForm).from_params(params, current_component: current_component)
+          @form = form(ElectionForm).from_params(params, current_component:)
 
           CreateElection.call(@form) do
             on(:ok) do
@@ -34,13 +34,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :election, election: election
+          enforce_permission_to(:update, :election, election:)
           @form = form(ElectionForm).from_model(election)
         end
 
         def update
-          enforce_permission_to :update, :election, election: election
-          @form = form(ElectionForm).from_params(params, current_component: current_component)
+          enforce_permission_to(:update, :election, election:)
+          @form = form(ElectionForm).from_params(params, current_component:)
 
           UpdateElection.call(@form, election) do
             on(:ok) do
@@ -56,7 +56,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :election, election: election
+          enforce_permission_to(:delete, :election, election:)
 
           DestroyElection.call(election, current_user) do
             on(:ok) do
@@ -72,7 +72,7 @@ module Decidim
         end
 
         def publish
-          enforce_permission_to :publish, :election, election: election
+          enforce_permission_to(:publish, :election, election:)
 
           PublishElection.call(election, current_user) do
             on(:ok) do
@@ -83,7 +83,7 @@ module Decidim
         end
 
         def unpublish
-          enforce_permission_to :unpublish, :election, election: election
+          enforce_permission_to(:unpublish, :election, election:)
 
           UnpublishElection.call(election, current_user) do
             on(:ok) do

data/app/controllers/decidim/elections/admin/feedback_forms_controller.rb

@@ -33,11 +33,11 @@ module Decidim
         end
 
         def questionnaire_participant_answers_url(session_token)
-          answer_feedback_form_path(id: election.id, session_token: session_token)
+          answer_feedback_form_path(id: election.id, session_token:)
         end
 
         def questionnaire_export_response_url(session_token)
-          answer_export_feedback_form_path(id: election.id, session_token: session_token, format: "pdf")
+          answer_export_feedback_form_path(id: election.id, session_token:, format: "pdf")
         end
 
         def questionnaire_url

data/app/controllers/decidim/elections/admin/proposals_imports_controller.rb

@@ -8,14 +8,14 @@ module Decidim
         helper_method :election, :question, :answers, :answers
 
         def new
-          enforce_permission_to :import_proposals, :answer, election: election, question: question
+          enforce_permission_to(:import_proposals, :answer, election:, question:)
           @form = form(Admin::AnswerImportProposalsForm).instance
         end
 
         def create
-          enforce_permission_to :import_proposals, :answer, election: election, question: question
+          enforce_permission_to(:import_proposals, :answer, election:, question:)
 
-          @form = form(Admin::AnswerImportProposalsForm).from_params(params, election: election, question: question)
+          @form = form(Admin::AnswerImportProposalsForm).from_params(params, election:, question:)
 
           Admin::ImportProposalsToElections.call(@form) do
             on(:ok) do |answers|

data/app/controllers/decidim/elections/admin/questions_controller.rb

@@ -8,13 +8,13 @@ module Decidim
         helper_method :election, :questions, :question
 
         def new
-          enforce_permission_to :create, :question, election: election
+          enforce_permission_to(:create, :question, election:)
           @form = form(QuestionForm).instance
         end
 
         def create
-          enforce_permission_to :create, :question, election: election
-          @form = form(QuestionForm).from_params(params, election: election)
+          enforce_permission_to(:create, :question, election:)
+          @form = form(QuestionForm).from_params(params, election:)
 
           CreateQuestion.call(@form) do
             on(:ok) do
@@ -35,13 +35,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :question, election: election, question: question
+          enforce_permission_to(:update, :question, election:, question:)
           @form = form(QuestionForm).from_model(question)
         end
 
         def update
-          enforce_permission_to :update, :question, election: election, question: question
-          @form = form(QuestionForm).from_params(params, election: election)
+          enforce_permission_to(:update, :question, election:, question:)
+          @form = form(QuestionForm).from_params(params, election:)
 
           UpdateQuestion.call(@form, question) do
             on(:ok) do
@@ -57,7 +57,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :update, :question, election: election, question: question
+          enforce_permission_to(:update, :question, election:, question:)
 
           DestroyQuestion.call(question, current_user) do
             on(:ok) do

data/app/controllers/decidim/elections/admin/steps_controller.rb

@@ -10,19 +10,19 @@ module Decidim
         helper_method :elections, :election, :current_step, :vote_stats, :bulletin_board_server, :authority_public_key, :election_unique_id, :quorum, :missing_trustees_allowed
 
         def index
-          enforce_permission_to :read, :steps, election: election
+          enforce_permission_to(:read, :steps, election:)
 
           if current_step_form_class
-            @form = form(current_step_form_class).instance(election: election)
+            @form = form(current_step_form_class).instance(election:)
             @form.valid?
           end
         end
 
         def update
-          enforce_permission_to :update, :steps, election: election
+          enforce_permission_to(:update, :steps, election:)
           redirect_to election_steps_path(election) && return unless params[:id] == current_step
 
-          @form = form(current_step_form_class).from_params(params, election: election)
+          @form = form(current_step_form_class).from_params(params, election:)
           Decidim::Elections::Admin::UpdateActionStatus.call(@form.pending_action) if @form.pending_action
 
           # check pending action status mode

data/app/controllers/decidim/elections/admin/trustees_participatory_spaces_controller.rb

@@ -38,7 +38,7 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :trustee_participatory_space, trustee_participatory_space: trustee_participatory_space
+          enforce_permission_to(:update, :trustee_participatory_space, trustee_participatory_space:)
 
           UpdateTrusteeParticipatorySpace.call(trustee_participatory_space) do
             on(:ok) do |trustee|
@@ -54,7 +54,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :trustee_participatory_space, trustee_participatory_space: trustee_participatory_space
+          enforce_permission_to(:delete, :trustee_participatory_space, trustee_participatory_space:)
 
           RemoveTrusteeFromParticipatorySpace.call(trustee_participatory_space) do
             on(:ok) do

data/app/controllers/decidim/elections/application_controller.rb

@@ -8,6 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
+      include Decidim::Elections::ContentSecurityPolicy
     end
   end
 end

data/app/controllers/decidim/elections/elections_controller.rb

@@ -8,15 +8,18 @@ module Decidim
       include Paginable
       include Decidim::Elections::Orderable
       include HasVoteFlow
+      include Decidim::IconHelper
 
-      helper_method :elections, :election, :paginated_elections, :scheduled_elections, :single?, :onboarding, :authority_public_key, :bulletin_board_server, :authority_slug
+      helper_method :elections, :election, :paginated_elections, :scheduled_elections,
+                    :single?, :onboarding, :authority_public_key, :bulletin_board_server,
+                    :authority_slug, :tabs, :panels
 
       def index
         redirect_to election_path(single, single: true) if single?
       end
 
       def show
-        enforce_permission_to :view, :election, election: election
+        enforce_permission_to :view, :election, election:
       end
 
       def election_log; end

data/app/controllers/decidim/elections/trustee_zone/application_controller.rb

@@ -8,6 +8,7 @@ module Decidim
 
       class ApplicationController < ::Decidim::ApplicationController
         include Decidim::UserProfile
+        include Decidim::Elections::ContentSecurityPolicy
 
         helper_method :trustee
 

data/app/controllers/decidim/elections/trustee_zone/elections_controller.rb

@@ -8,11 +8,11 @@ module Decidim
         helper_method :election, :bulletin_board_server, :authority_slug, :authority_public_key, :current_step, :scheme_name
 
         def show
-          enforce_permission_to :view, :election, trustee: trustee
+          enforce_permission_to :view, :election, trustee:
         end
 
         def update
-          enforce_permission_to :update, :election, trustee: trustee
+          enforce_permission_to(:update, :election, trustee:)
 
           UpdateElectionBulletinBoardStatus.call(election, params[:status]) do
             on(:ok) do

data/app/controllers/decidim/elections/trustee_zone/trustees_controller.rb

@@ -8,15 +8,15 @@ module Decidim
         include Decidim::FormFactory
 
         def show
-          enforce_permission_to :view, :trustee, trustee: trustee
+          enforce_permission_to(:view, :trustee, trustee:)
 
           trustee.name ||= current_user.name
         end
 
         def update
-          enforce_permission_to :update, :trustee, trustee: trustee
+          enforce_permission_to(:update, :trustee, trustee:)
 
-          form = form(TrusteeForm).from_params(params, trustee: trustee)
+          form = form(TrusteeForm).from_params(params, trustee:)
 
           UpdateTrustee.call(form) do
             on(:ok) do

data/app/controllers/decidim/elections/votes_controller.rb

@@ -4,13 +4,15 @@ module Decidim
   module Elections
     # Exposes the elections resources so users can participate on them
     class VotesController < Decidim::Elections::ApplicationController
-      layout "decidim/election_votes"
+      WIZARD_STEPS = %w(register election confirm ballot_decision).freeze
+
       include FormFactory
       include HasVoteFlow
 
       helper VotesHelper
       helper_method :bulletin_board_server, :authority_public_key, :scheme_name, :election_unique_id,
-                    :exit_path, :elections, :election, :questions, :questions_count, :vote, :valid_questionnaire?
+                    :exit_path, :elections, :election, :questions, :questions_count, :vote, :valid_questionnaire?,
+                    :wizard_steps
 
       delegate :count, to: :questions, prefix: true
 
@@ -18,8 +20,8 @@ module Decidim
         vote_flow.voter_login(params)
         return unless vote_allowed?
 
-        @form = form(Voter::VoteForm).from_params({ voter_token: voter_token, voter_id: voter_id },
-                                                  election: election, user: vote_flow.user)
+        @form = form(Voter::VoteForm).from_params({ voter_token:, voter_id: },
+                                                  election:, user: vote_flow.user)
       end
 
       def create
@@ -29,7 +31,7 @@ module Decidim
 
         return redirect_to election_vote_path(election, id: params[:vote][:encrypted_data_hash], token: vote_flow.voter_id_token) if preview_mode?
 
-        @form = form(Voter::VoteForm).from_params(params, election: election, user: vote_flow.user, email: vote_flow.email)
+        @form = form(Voter::VoteForm).from_params(params, election:, user: vote_flow.user, email: vote_flow.email)
         Voter::CastVote.call(@form) do
           on(:ok) do |vote|
             redirect_to election_vote_path(election, id: vote.encrypted_vote_hash, token: vote_flow.voter_id_token)
@@ -42,11 +44,11 @@ module Decidim
       end
 
       def show
-        enforce_permission_to :view, :election, election: election
+        enforce_permission_to :view, :election, election:
       end
 
       def update
-        enforce_permission_to :view, :election, election: election
+        enforce_permission_to(:view, :election, election:)
 
         Voter::UpdateVoteStatus.call(vote) do
           on(:ok) do
@@ -60,9 +62,9 @@ module Decidim
       end
 
       def verify
-        enforce_permission_to :view, :election, election: election
+        enforce_permission_to(:view, :election, election:)
 
-        @form = form(Voter::VerifyVoteForm).instance(election: election)
+        @form = form(Voter::VerifyVoteForm).instance(election:)
       end
 
       private
@@ -74,11 +76,11 @@ module Decidim
       end
 
       def vote
-        @vote ||= Decidim::Elections::Vote.find_by(election: election, encrypted_vote_hash: params[:id]) if params[:id]
+        @vote ||= Decidim::Elections::Vote.find_by(election:, encrypted_vote_hash: params[:id]) if params[:id]
       end
 
       def exit_path
-        @exit_path ||= if allowed_to? :view, :election, election: election
+        @exit_path ||= if allowed_to?(:view, :election, election:)
                          election_path(election)
                        else
                          elections_path
@@ -86,7 +88,7 @@ module Decidim
       end
 
       def pending_vote
-        @pending_vote ||= Decidim::Elections::Votes::PendingVotes.for.find_by(voter_id: voter_id, election: election)
+        @pending_vote ||= Decidim::Elections::Votes::PendingVotes.for.find_by(voter_id:, election:)
       end
 
       def bulletin_board_client
@@ -141,7 +143,7 @@ module Decidim
           return false
         end
 
-        enforce_permission_to :vote, :election, election: election
+        enforce_permission_to(:vote, :election, election:)
 
         true
       end
@@ -157,6 +159,10 @@ module Decidim
 
         @valid_questionnaire = election.questionnaire.questions.any?
       end
+
+      def wizard_steps
+        WIZARD_STEPS
+      end
     end
   end
 end

data/app/controllers/decidim/votings/admin/monitoring_committee_election_results_controller.rb

@@ -9,6 +9,8 @@ module Decidim
 
         helper_method :current_voting, :elections, :election, :publish_results_form, :bulletin_board_server
 
+        before_action :append_csp_directives
+
         def index
           enforce_permission_to :read, :monitoring_committee_election_results, voting: current_voting
 
@@ -16,11 +18,11 @@ module Decidim
         end
 
         def show
-          enforce_permission_to :read, :monitoring_committee_election_result, voting: current_voting, election: election
+          enforce_permission_to :read, :monitoring_committee_election_result, voting: current_voting, election:
         end
 
         def update
-          enforce_permission_to :validate, :monitoring_committee_election_result, voting: current_voting, election: election
+          enforce_permission_to(:validate, :monitoring_committee_election_result, voting: current_voting, election:)
 
           if publish_results_form.pending_action
             Decidim::Elections::Admin::UpdateActionStatus.call(publish_results_form.pending_action)
@@ -48,6 +50,12 @@ module Decidim
 
         private
 
+        def append_csp_directives
+          return if bulletin_board_server.blank?
+
+          content_security_policy.append_csp_directive("connect-src", bulletin_board_server)
+        end
+
         def bulletin_board_server
           Decidim::Elections.bulletin_board.bulletin_board_server
         end
@@ -61,7 +69,7 @@ module Decidim
         end
 
         def publish_results_form
-          @publish_results_form ||= form(Decidim::Votings::Admin::PublishResultsForm).from_params(params, election: election)
+          @publish_results_form ||= form(Decidim::Votings::Admin::PublishResultsForm).from_params(params, election:)
         end
       end
     end

data/app/controllers/decidim/votings/admin/monitoring_committee_members_controller.rb

@@ -15,12 +15,12 @@ module Decidim
 
         def new
           enforce_permission_to :create, :monitoring_committee_member, voting: current_voting
-          @form = form(MonitoringCommitteeMemberForm).instance
+          @form = form(VotingUserRoleForm).instance
         end
 
         def create
           enforce_permission_to :create, :monitoring_committee_member, voting: current_voting
-          @form = form(MonitoringCommitteeMemberForm).from_params(params, voting: current_voting)
+          @form = form(VotingUserRoleForm).from_params(params, voting: current_voting)
 
           CreateMonitoringCommitteeMember.call(@form, current_user, current_voting) do
             on(:ok) do
@@ -36,7 +36,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :monitoring_committee_member, voting: current_voting, monitoring_committee_member: monitoring_committee_member
+          enforce_permission_to(:delete, :monitoring_committee_member, voting: current_voting, monitoring_committee_member:)
 
           DestroyMonitoringCommitteeMember.call(monitoring_committee_member, current_user) do
             on(:ok) do

data/app/controllers/decidim/votings/admin/monitoring_committee_polling_station_closures_controller.rb

@@ -17,17 +17,17 @@ module Decidim
         end
 
         def show
-          enforce_permission_to :read, :monitoring_committee_polling_station_closure, voting: current_voting, closure: closure
+          enforce_permission_to :read, :monitoring_committee_polling_station_closure, voting: current_voting, closure:
         end
 
         def edit
-          enforce_permission_to :validate, :monitoring_committee_polling_station_closure, voting: current_voting, closure: closure
+          enforce_permission_to(:validate, :monitoring_committee_polling_station_closure, voting: current_voting, closure:)
 
           @form = form(MonitoringCommitteePollingStationClosureForm).from_model(closure)
         end
 
         def validate
-          enforce_permission_to :validate, :monitoring_committee_polling_station_closure, voting: current_voting, closure: closure
+          enforce_permission_to(:validate, :monitoring_committee_polling_station_closure, voting: current_voting, closure:)
 
           @form = form(MonitoringCommitteePollingStationClosureForm).from_params(params)
 

data/app/controllers/decidim/votings/admin/polling_officers_controller.rb

@@ -12,12 +12,12 @@ module Decidim
 
         def new
           enforce_permission_to :create, :polling_officer, voting: current_voting
-          @form = form(PollingOfficerForm).instance
+          @form = form(VotingUserRoleForm).instance
         end
 
         def create
           enforce_permission_to :create, :polling_officer, voting: current_voting
-          @form = form(PollingOfficerForm).from_params(params, voting: current_voting)
+          @form = form(VotingUserRoleForm).from_params(params, voting: current_voting)
 
           CreatePollingOfficer.call(@form, current_user, current_voting) do
             on(:ok) do
@@ -33,7 +33,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :polling_officer, voting: current_voting, polling_officer: polling_officer
+          enforce_permission_to(:delete, :polling_officer, voting: current_voting, polling_officer:)
 
           DestroyPollingOfficer.call(polling_officer, current_user) do
             on(:ok) do

data/app/controllers/decidim/votings/admin/polling_stations_controller.rb

@@ -6,7 +6,6 @@ module Decidim
       # This controller allows to create or update a polling station.
       class PollingStationsController < Admin::ApplicationController
         include Decidim::PollingStations::Admin::Filterable
-        helper Decidim::Votings::Admin::PollingOfficersPickerHelper
         include VotingAdmin
 
         helper_method :current_voting, :polling_station, :filtered_polling_stations
@@ -38,12 +37,12 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :polling_station, voting: current_voting, polling_station: polling_station
+          enforce_permission_to(:update, :polling_station, voting: current_voting, polling_station:)
           @form = form(PollingStationForm).from_model(polling_station, voting: current_voting)
         end
 
         def update
-          enforce_permission_to :update, :polling_station, voting: current_voting, polling_station: polling_station
+          enforce_permission_to(:update, :polling_station, voting: current_voting, polling_station:)
           @form = form(PollingStationForm).from_params(params, voting: current_voting)
 
           UpdatePollingStation.call(@form, polling_station) do
@@ -60,7 +59,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :polling_station, voting: current_voting, polling_station: polling_station
+          enforce_permission_to(:delete, :polling_station, voting: current_voting, polling_station:)
 
           DestroyPollingStation.call(polling_station, current_user) do
             on(:ok) do

data/app/controllers/decidim/votings/admin/voting_attachment_collections_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       # a voting.
       class VotingAttachmentCollectionsController < Decidim::Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachmentCollections
+        include Decidim::Admin::Concerns::HasTabbedMenu
         include VotingAdmin
 
         def after_destroy_path
@@ -16,6 +17,10 @@ module Decidim
         def collection_for
           current_voting
         end
+
+        private
+
+        def tab_menu_name = :votings_admin_attachments_menu
       end
     end
   end

data/app/controllers/decidim/votings/admin/voting_attachments_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       class VotingAttachmentsController < Decidim::Admin::ApplicationController
         include VotingAdmin
         include Decidim::Admin::Concerns::HasAttachments
+        include Decidim::Admin::Concerns::HasTabbedMenu
 
         def after_destroy_path
           voting_attachments_path(current_voting)
@@ -15,6 +16,10 @@ module Decidim
         def attached_to
           current_voting
         end
+
+        private
+
+        def tab_menu_name = :votings_admin_attachments_menu
       end
     end
   end