decidim-elections 0.25.2 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f09833ea70c1970efdc0d52cf8014a4bc8cbb2a09d4ca15d49e315d7b02d88f
-  data.tar.gz: e000962fcfe04a7d1acee472798e65208c7fa9a22dba090a5da6119aaf7013ce
+  metadata.gz: bc8a779cca40d6e069fdbdff54905690f2f58dbd33cdcca28c81e8b0c63a2a81
+  data.tar.gz: c8453d445d3d6406ef3dc6f27aed2b1ecbeaa8f69e9e8f221d3a0dae8e61c3c7
 SHA512:
-  metadata.gz: 95f86d7f46367adeb8f5acbfa57b7cb0a78a0ca1aa4657b5d1e3d77f54bab4fabb20e143559c7e4ce071dbdbb4797dd00ec0d5cd270699461ee7be40a531db79
-  data.tar.gz: d6048e8719815cb218327d71c12f9a6c81a2a5a6093ea05c9b0ba77585885b76ee62e8069b8510594d32da8340d7667c92688aba9a8dfb499920f20a896784f8
+  metadata.gz: 89e34b56ab3fe554dd329b790d60fe79e8d5a53ddfd8829b8aaf29c624ee6e860f4d80d7d4dd6d96fa7daa6bb6bbc4d5dd5eb307df187efdc08d6b579f1ebae5
+  data.tar.gz: f0c23adcd2198063a4ce7e9e27a3100c57fe881123d94e1922a891cab82fa1d1fbc8b26c00a10291eb3cc52f8cc26572870489794cad903e3f8483f9c7fae088

data/app/cells/decidim/elections/election_m_cell.rb

@@ -53,7 +53,7 @@ module Decidim
 
       def description
         text = super
-        text.gsub!(/^<p>/, "<p>#{render :badge}")
+        text.sub!(/<p>/, "<p>#{render :badge}")
         html_truncate(text, length: 100)
       end
 

data/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb

@@ -6,6 +6,10 @@ module Decidim
       class HighlightedVotingsCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
+        cache :show, expires_in: 10.minutes, if: :perform_caching? do
+          cache_hash
+        end
+
         def show
           render if highlighted_votings.any?
         end
@@ -27,6 +31,14 @@ module Decidim
         def decidim_votings
           Decidim::Votings::Engine.routes.url_helpers
         end
+
+        private
+
+        def cache_hash
+          hash = []
+          hash.push(I18n.locale)
+          hash.join(Decidim.cache_key_separator)
+        end
       end
     end
   end

data/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb

@@ -16,7 +16,7 @@ module Decidim
           end
 
           def description_text
-            decidim_sanitize(translated_attribute(current_participatory_space.description))
+            decidim_sanitize_editor(translated_attribute(current_participatory_space.description))
           end
 
           def button_show_more_text

data/app/cells/decidim/votings/voting_m_cell.rb

@@ -41,7 +41,7 @@ module Decidim
       # makes the layout look good.
       def description
         text = super
-        text.gsub!(/^<p>/, "<p>#{render :badge}")
+        text.sub!(/<p>/, "<p>#{render :badge}")
         html_truncate(text, length: 100)
       end
 

data/app/commands/decidim/elections/admin/add_user_as_trustee.rb

@@ -74,7 +74,7 @@ module Decidim
             resource: form.current_participatory_space,
             affected_users: [form.user]
           }
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end

data/app/commands/decidim/elections/admin/report_missing_trustee.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    module Admin
+      # This command gets called to report a missing trustee during the tally process.
+      class ReportMissingTrustee < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A ReportMissingTrusteeForm object with the information needed to report the missing trustee.
+        def initialize(form)
+          @form = form
+        end
+
+        # Public: Reports the missing trustee for the Election tally process.
+        #
+        # Broadcasts :ok if it worked, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            log_action
+            report_missing_trustee
+          end
+
+          broadcast(:ok)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_accessor :form
+
+        delegate :election, :bulletin_board, :trustee, to: :form
+
+        def log_action
+          Decidim.traceability.perform_action!(
+            :report_missing_trustee,
+            election,
+            form.current_user,
+            extra: {
+              trustee_id: form.trustee_id,
+              name: trustee.name,
+              nickname: trustee.user.nickname
+            },
+            visibility: "all"
+          )
+        end
+
+        def report_missing_trustee
+          bulletin_board.report_missing_trustee(election.id, form.trustee.slug) do |message_id|
+            create_election_action(message_id)
+          end
+        end
+
+        def create_election_action(message_id)
+          Decidim::Elections::Action.create!(
+            election: election,
+            action: :report_missing_trustee,
+            message_id: message_id,
+            status: :pending
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/elections/admin/setup_election.rb

@@ -142,7 +142,7 @@ module Decidim
             affected_users: trustee
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
 
         # Since machine_translations return a nested hash but Electionguard and other

data/app/commands/decidim/elections/admin/start_tally.rb

@@ -7,7 +7,7 @@ module Decidim
       class StartTally < Rectify::Command
         # Public: Initializes the command.
         #
-        # form - A VotePeriodForm object with the information needed to start or end the vote period
+        # form - An ActionForm object with the information needed to perform an action
         def initialize(form)
           @form = form
         end

data/app/commands/decidim/votings/admin/create_ballot_style.rb

@@ -34,13 +34,16 @@ module Decidim
         attr_reader :form, :ballot_style
 
         def create_ballot_style!
-          attributes = {
-            code: form.code
+          params = {
+            code: form.code,
+            voting: form.current_participatory_space
           }
 
-          @ballot_style = Decidim::Votings::BallotStyle.create!(
-            voting: form.current_participatory_space,
-            attributes: attributes
+          @ballot_style = Decidim.traceability.create!(
+            Decidim::Votings::BallotStyle,
+            form.current_user,
+            params,
+            visibility: "all"
           )
         end
 

data/app/commands/decidim/votings/admin/destroy_ballot_style.rb

@@ -5,8 +5,9 @@ module Decidim
     module Admin
       # A command with the business logic to delete the ballot style
       class DestroyBallotStyle < Rectify::Command
-        def initialize(ballot_style)
+        def initialize(ballot_style, current_user)
           @ballot_style = ballot_style
+          @current_user = current_user
         end
 
         # Executes the command. Broadcast this events:
@@ -22,10 +23,17 @@ module Decidim
 
         private
 
-        attr_reader :ballot_style
+        attr_reader :ballot_style, :current_user
 
         def destroy_ballot_style!
-          ballot_style.destroy!
+          Decidim.traceability.perform_action!(
+            :delete,
+            ballot_style,
+            current_user,
+            visibility: "all"
+          ) do
+            ballot_style.destroy!
+          end
         end
       end
     end

data/app/commands/decidim/votings/admin/update_ballot_style.rb

@@ -42,7 +42,12 @@ module Decidim
             code: form.code
           }
 
-          ballot_style.update!(attributes)
+          Decidim.traceability.update!(
+            ballot_style,
+            form.current_user,
+            attributes,
+            visibility: "all"
+          )
         end
 
         def destroy_removed_ballot_style_questions!

data/app/commands/decidim/votings/census/admin/create_dataset.rb

@@ -31,7 +31,7 @@ module Decidim
             end
 
             if dataset
-              CSV.foreach(form.file.tempfile.path, col_sep: ";", headers: true) do |row|
+              CSV.foreach(form.file.tempfile.path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
                 CreateDatumJob.perform_later(current_user, dataset, row.fields)
               end
             end
@@ -57,11 +57,19 @@ module Decidim
           end
 
           def csv_header_invalid?
-            CSV.parse_line(File.open(form.file.tempfile.path, &:readline), col_sep: ";").size != expected_header_size
+            CSV.parse_line(File.open(form.file.tempfile.path), col_sep: ";", headers: true, header_converters: :symbol).headers != expected_headers
           end
 
-          def expected_header_size
-            @expected_header_size ||= form.current_participatory_space.has_ballot_styles? ? 9 : 8
+          def headers
+            [:document_id, :document_type, :date_of_birth, :full_name, :full_address, :postal_code, :mobile_phone_number, :email_address]
+          end
+
+          def ballot_style_headers
+            headers.push(:ballot_style_code)
+          end
+
+          def expected_headers
+            @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : headers
           end
 
           def csv_rows
@@ -73,7 +81,7 @@ module Decidim
           end
 
           def file_lines_count(file_path)
-            `wc -l "#{file_path}"`.strip.split(" ")[0].to_i
+            `wc -l "#{file_path.shellescape}"`.strip.split(" ")[0].to_i
           end
         end
       end

data/app/controllers/concerns/decidim/monitoring_committee_polling_station_closures/admin/filterable.rb

@@ -14,9 +14,9 @@ module Decidim
           private
 
           def base_query
+            # Includes the officers (president and managers) and their correspective decidim users when they(=officers) are present
             query =
               collection
-              # Includes the officers (president and managers) and their correspective decidim users when they(=officers) are present
               .joins("LEFT JOIN decidim_votings_polling_officers president ON president.presided_polling_station_id = decidim_votings_polling_stations.id
                       LEFT JOIN decidim_users president_user ON president_user.id = president.decidim_user_id
                       LEFT JOIN decidim_votings_polling_officers managers ON managers.managed_polling_station_id = decidim_votings_polling_stations.id

data/app/controllers/concerns/decidim/polling_stations/admin/filterable.rb

@@ -14,8 +14,8 @@ module Decidim
           private
 
           def base_query
+            # Includes the officers (president and managers) and their correspective decidim users when they(=officers) are present
             query = collection
-                    # Includes the officers (president and managers) and their correspective decidim users when they(=officers) are present
                     .joins("LEFT JOIN decidim_votings_polling_officers president ON president.presided_polling_station_id = decidim_votings_polling_stations.id
                             LEFT JOIN decidim_users president_user ON president_user.id = president.decidim_user_id
                             LEFT JOIN decidim_votings_polling_officers managers ON managers.managed_polling_station_id = decidim_votings_polling_stations.id

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

@@ -5,8 +5,9 @@ module Decidim
     module Admin
       # This controller allows to manage the steps of an election.
       class StepsController < Admin::ApplicationController
+        helper Decidim::ApplicationHelper
         helper StepsHelper
-        helper_method :elections, :election, :current_step, :vote_stats, :bulletin_board_server
+        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
@@ -22,10 +23,12 @@ module Decidim
           redirect_to election_steps_path(election) && return unless params[:id] == current_step
 
           @form = form(current_step_form_class).from_params(params, election: election)
-          if @form.pending_action
-            Decidim::Elections::Admin::UpdateActionStatus.call(@form.pending_action)
-            return redirect_to election_steps_path(election)
-          end
+          Decidim::Elections::Admin::UpdateActionStatus.call(@form.pending_action) if @form.pending_action
+
+          # check pending action status mode
+          return render json: { status: @form.pending_action&.status } if params[:check_pending_action]
+
+          return redirect_to election_steps_path(election) if @form.pending_action
 
           current_step_command_class.call(@form) do
             on(:ok) do
@@ -45,8 +48,22 @@ module Decidim
 
         private
 
-        def bulletin_board_server
-          Decidim::Elections.bulletin_board.bulletin_board_server
+        delegate :bulletin_board_server, :authority_slug, :quorum, to: :bulletin_board_client
+
+        def bulletin_board_client
+          Decidim::Elections.bulletin_board
+        end
+
+        def missing_trustees_allowed
+          @missing_trustees_allowed ||= Decidim::Elections.bulletin_board.number_of_trustees - Decidim::Elections.bulletin_board.quorum
+        end
+
+        def election_unique_id
+          @election_unique_id ||= Decidim::BulletinBoard::MessageIdentifier.unique_election_id(authority_slug, election.id)
+        end
+
+        def authority_public_key
+          @authority_public_key ||= bulletin_board_client.authority_public_key.to_json
         end
 
         def current_step_form_class
@@ -56,6 +73,7 @@ module Decidim
             "key_ceremony_ended" => VotePeriodForm,
             "vote" => VotePeriodForm,
             "vote_ended" => ActionForm,
+            "tally" => ReportMissingTrusteeForm,
             "tally_ended" => ActionForm
           }[current_step]
         end
@@ -67,6 +85,7 @@ module Decidim
             "key_ceremony_ended" => StartVote,
             "vote" => EndVote,
             "vote_ended" => StartTally,
+            "tally" => ReportMissingTrustee,
             "tally_ended" => PublishResults
           }[current_step]
         end

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

@@ -60,7 +60,7 @@ module Decidim
         def destroy
           enforce_permission_to :delete, :ballot_style, ballot_style: current_ballot_style, voting: current_voting
 
-          DestroyBallotStyle.call(current_ballot_style) do
+          DestroyBallotStyle.call(current_ballot_style, current_user) do
             on(:ok) do
               flash[:notice] = t("destroy.success", scope: "decidim.votings.admin.ballot_styles")
             end

data/app/forms/decidim/elections/admin/action_form.rb

@@ -7,6 +7,10 @@ module Decidim
       class ActionForm < Decidim::Form
         validates :pending_action, absence: true
 
+        def main_button?
+          true
+        end
+
         def messages
           @messages ||= {}
         end

data/app/forms/decidim/elections/admin/report_missing_trustee_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    module Admin
+      # This class holds a form to report a missing trustee during the tally process.
+      class ReportMissingTrusteeForm < ActionForm
+        attribute :trustee_id, Integer
+
+        validates :trustee_id, presence: true
+
+        def trustee
+          @trustee ||= Decidim::Elections::Trustee.find(trustee_id)
+        end
+
+        def main_button?
+          false
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/elections/admin/setup_form.rb

@@ -57,6 +57,10 @@ module Decidim
           @bulletin_board ||= context[:bulletin_board] || Decidim::Elections.bulletin_board
         end
 
+        def main_button?
+          true
+        end
+
         private
 
         def choose_random_trustees

data/app/models/decidim/elections/action.rb

@@ -7,7 +7,7 @@ module Decidim
       belongs_to :election, foreign_key: "decidim_elections_election_id", class_name: "Decidim::Elections::Election"
 
       enum status: [:pending, :accepted, :rejected]
-      enum action: [:start_key_ceremony, :start_vote, :end_vote, :start_tally, :publish_results]
+      enum action: [:start_key_ceremony, :start_vote, :end_vote, :start_tally, :report_missing_trustee, :publish_results]
     end
   end
 end

data/app/models/decidim/elections/trustee.rb

@@ -15,6 +15,10 @@ module Decidim
         exists?(user: user)
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Elections::AdminLog::TrusteePresenter
+      end
+
       def self.for(user)
         find_by(user: user)
       end

data/app/models/decidim/votings/ballot_style.rb

@@ -17,6 +17,8 @@ module Decidim
                inverse_of: :ballot_style,
                dependent: :nullify
 
+      alias participatory_space voting
+
       def slug
         "#{voting.slug}_#{code.parameterize}-#{id}"
       end
@@ -24,6 +26,10 @@ module Decidim
       def questions_for(election)
         questions.where(election: election)
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Votings::AdminLog::BallotStylePresenter
+      end
     end
   end
 end

data/app/models/decidim/votings/census/dataset.rb

@@ -23,6 +23,8 @@ module Decidim
 
         validates :file, presence: true
 
+        alias participatory_space voting
+
         def self.log_presenter_class_for(_log)
           Decidim::Votings::Census::AdminLog::DatasetPresenter
         end

data/app/models/decidim/votings/monitoring_committee_member.rb

@@ -11,6 +11,12 @@ module Decidim
 
       validate :user_and_voting_same_organization
 
+      alias participatory_space voting
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Votings::AdminLog::MonitoringCommitteeMemberPresenter
+      end
+
       private
 
       # Private: check if the voting and the user have the same organization

data/app/models/decidim/votings/polling_officer.rb

@@ -22,6 +22,7 @@ module Decidim
       validate :either_president_or_manager
 
       delegate :name, :nickname, :email, to: :user
+      alias participatory_space voting
 
       # Allow ransacker to search by presided/managed polling station title
       %w(managed_station presided_station).each do |table|
@@ -56,6 +57,10 @@ module Decidim
         presided_polling_station || managed_polling_station
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Votings::AdminLog::PollingOfficerPresenter
+      end
+
       private
 
       # Private: check if the voting and the user have the same organization

data/app/models/decidim/votings/polling_station.rb

@@ -34,6 +34,8 @@ module Decidim
       validate :polling_station_managers_same_voting
       validate :polling_station_president_same_voting
 
+      alias participatory_space voting
+
       # Allow ransacker to search for a key in a hstore column (`title`.`en`)
       ransacker :title do |parent|
         Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
@@ -61,6 +63,10 @@ module Decidim
         closures.find_by(election: election)
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Votings::AdminLog::PollingStationPresenter
+      end
+
       private
 
       # Private: check if the president is in the same voting

data/app/packs/entrypoints/decidim_elections_admin_trustees_process.js

@@ -0,0 +1 @@
+import "src/decidim/elections/admin/trustees_process";

data/app/packs/src/decidim/elections/admin/pending_action.js

@@ -1,4 +1,4 @@
-import { Client } from "@codegram/decidim-bulletin_board";
+import { Client } from "@decidim/decidim-bulletin_board";
 
 $(() => {
   const $form = $("form.step");

data/app/packs/src/decidim/elections/admin/trustees_process.js

@@ -0,0 +1,125 @@
+import {
+  Client,
+  Election,
+  MessageParser
+} from "@decidim/decidim-bulletin_board";
+
+const WAIT_TIME_MS = 10 * 1_000;
+
+$(async () => {
+  const $trusteesProcess = $("#trustees_process");
+  const $checkingTrustees = $trusteesProcess.find(".trustee");
+  const electionUniqueId = $trusteesProcess.data("electionUniqueId");
+  const processType = $trusteesProcess.data("processType");
+  const bulletinBoardClient = new Client({
+    apiEndpointUrl: $trusteesProcess.data("apiEndpointUrl")
+  });
+  const election = new Election({
+    uniqueId: electionUniqueId,
+    bulletinBoardClient,
+    typesFilter: ["create_election", processType]
+  });
+
+  const authorityPublicKeyJSON = JSON.stringify(
+    $trusteesProcess.data("authorityPublicKey")
+  );
+  const parser = new MessageParser({ authorityPublicKeyJSON });
+  const trusteesStatuses = {};
+  let lastMessageIndex = 0;
+
+  const missingTrusteesAllowed = $trusteesProcess.data("missingTrusteesAllowed") || 0;
+  const checkPendingActionPath = $trusteesProcess.data("checkPendingActionPath");
+
+  // Fix buttons formaction, that is not working properly
+  const $form = $("form.step");
+  $form.find("button").on("click", (event) => {
+    $form.attr("action", $(event.currentTarget).attr("formaction"));
+    $form.trigger("submit");
+  });
+
+  const updateTrusteesStatuses = async () => {
+    await election.getLogEntries();
+
+    for (
+      ;
+      lastMessageIndex < election.logEntries.length;
+      lastMessageIndex += 1
+    ) {
+      const { messageIdentifier, decodedData } = await parser.parse(
+        election.logEntries[lastMessageIndex]
+      );
+
+      if (messageIdentifier.author.type === "t") {
+        trusteesStatuses[messageIdentifier.author.id] = true;
+      } else if (
+        messageIdentifier.type === "tally" &&
+        messageIdentifier.subtype === "missing_trustee" &&
+        !(decodedData.trustee_id in trusteesStatuses)
+      ) {
+        trusteesStatuses[decodedData.trustee_id] = false;
+      }
+    }
+  }
+
+  const checkPendingAction = async () => {
+    if (!checkPendingActionPath) {
+      return false
+    }
+
+    try {
+      const response = await $.ajax({
+        url: checkPendingActionPath,
+        method: "PATCH",
+        contentType: "application/json",
+        headers: {
+          "X-CSRF-Token": $("meta[name=csrf-token]").attr("content")
+        }
+      })
+
+      return response && response.status === "pending";
+    } catch (err) {
+      return true;
+    }
+  }
+
+  const checkTrusteesActivity = async () => {
+    await updateTrusteesStatuses();
+    const pendingAction = await checkPendingAction();
+    const missingTrustees = Object.values(trusteesStatuses).filter(
+      (present) => !present
+    ).length;
+    const allowReportMissing = missingTrustees < missingTrusteesAllowed;
+
+    $checkingTrustees.each((_index, trustee) => {
+      const $trustee = $(trustee);
+      const trusteeSlug = $trustee.data("trusteeSlug");
+
+      if (trusteeSlug in trusteesStatuses) {
+        if (missingTrusteesAllowed > 0) {
+          $trustee.find(".js-report-missing-trustee").addClass("hide");
+        }
+        $trustee.removeClass("loading");
+        $trustee.find(".loading").hide();
+        if (trusteesStatuses[trusteeSlug]) {
+          $trustee.find(".active").removeClass("hide");
+          $trustee.find(".missing").addClass("hide");
+        } else {
+          $trustee.find(".missing").removeClass("hide");
+        }
+      } else if (allowReportMissing && !pendingAction) {
+        $trustee.find(".js-report-missing-trustee").removeClass("hide");
+      }
+    });
+
+    if (
+      Object.keys(trusteesStatuses).length === $checkingTrustees.length &&
+      missingTrustees <= missingTrusteesAllowed && !pendingAction
+    ) {
+      $(".js-continue-link").removeClass("disabled");
+    } else {
+      setTimeout(checkTrusteesActivity, WAIT_TIME_MS);
+    }
+  };
+
+  await checkTrusteesActivity();
+});