decidim-elections 0.27.8 → 0.28.0.rc4

data/app/jobs/decidim/votings/census/admin/create_datum_job.rb

@@ -25,7 +25,7 @@ module Decidim
             datum_form = DatumForm.from_params(params)
                                   .with_context(
                                     current_user: user,
-                                    dataset: dataset
+                                    dataset:
                                   )
 
             CreateDatum.call(datum_form, dataset)

data/app/jobs/decidim/votings/census/admin/generate_access_codes_job.rb

@@ -30,12 +30,12 @@ module Decidim
               access_code = SecureRandom.alphanumeric(8)
               hashed_online_data = Digest::SHA256.hexdigest([datum.hashed_check_data, access_code].join("."))
 
-              datum.update!(access_code: access_code, hashed_online_data: hashed_online_data)
+              datum.update!(access_code:, hashed_online_data:)
             end
           end
 
           def update_dataset_status(dataset, status, user)
-            UpdateDataset.call(dataset, { status: status }, user)
+            UpdateDataset.call(dataset, { status: }, user)
           end
         end
       end

data/app/mailers/decidim/votings/access_code_mailer.rb

@@ -26,7 +26,7 @@ module Decidim
             voting: @voting
           )
 
-          mail(to: datum.email, subject: subject)
+          mail(to: datum.email, subject:)
         end
       end
     end

data/app/mailers/decidim/votings/census/export_mailer.rb

@@ -35,7 +35,7 @@ module Decidim
             .url_helpers.download_access_codes_file_voting_census_url(
               host: user.organization.host,
               voting_slug: voting.slug,
-              filename: filename
+              filename:
             )
         end
       end

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

@@ -12,7 +12,7 @@ module Decidim
       has_many :trustees_participatory_spaces, inverse_of: :trustee, foreign_key: "decidim_elections_trustee_id", dependent: :destroy
 
       def self.trustee?(user)
-        exists?(user: user)
+        exists?(user:)
       end
 
       def self.log_presenter_class_for(_log)
@@ -20,7 +20,7 @@ module Decidim
       end
 
       def self.for(user)
-        find_by(user: user)
+        find_by(user:)
       end
 
       def slug

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

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def questions_for(election)
-        questions.where(election: election)
+        questions.where(election:)
       end
 
       def self.log_presenter_class_for(_log)

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

@@ -39,11 +39,11 @@ module Decidim
       end
 
       def self.polling_officer?(user)
-        exists?(user: user)
+        exists?(user:)
       end
 
       def self.for(user)
-        where(user: user)
+        where(user:)
       end
 
       def role

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

@@ -59,7 +59,7 @@ module Decidim
       end
 
       def closure_for(election)
-        closures.find_by(election: election)
+        closures.find_by(election:)
       end
 
       def self.log_presenter_class_for(_log)

data/app/packs/entrypoints/decidim_elections.js

@@ -1,2 +1,14 @@
+import "src/decidim/elections/election_log";
+import "src/decidim/elections/trustee/key_ceremony";
+import "src/decidim/elections/trustee/tally";
+import "src/decidim/elections/trustee/trustee_zone";
+
+import "src/decidim/elections/voter/casting-vote";
+import "src/decidim/elections/voter/new-vote";
+import "src/decidim/elections/voter/verify-vote";
+
 // Images
 require.context("../images", true)
+
+// CSS
+import "stylesheets/decidim/elections/elections.scss"

data/app/packs/entrypoints/decidim_elections_admin.js

@@ -0,0 +1,6 @@
+import "src/decidim/elections/admin/vote_statistics";
+import "src/decidim/elections/admin/trustees_process";
+import "src/decidim/elections/admin/pending_action";
+
+// Images
+require.context("../images", true)

data/app/packs/entrypoints/decidim_votings.js

@@ -0,0 +1,11 @@
+import "src/decidim/votings/in-person-vote";
+import "src/decidim/votings/polling_officer_zone/edit-closure";
+import "src/decidim/votings/polling_officer_zone/sign-closure";
+import "src/decidim/votings/polling_officer_zone/in-person-vote";
+import "src/decidim/votings/polling_officer_zone/new-closure";
+
+// Images
+require.context("../images", true)
+
+// CSS
+import "stylesheets/decidim/votings/votings.scss"

data/app/packs/entrypoints/decidim_votings_admin.js

@@ -0,0 +1,10 @@
+import "src/decidim/votings/admin/update_census_dataset_status";
+import "src/decidim/votings/admin/polling_stations_form";
+import "src/decidim/votings/admin/polling_officers_picker";
+import "src/decidim/votings/admin/voting_user_role_form";
+
+// Images
+require.context("../images", true)
+
+// CSS
+import "stylesheets/decidim/votings/admin/votings.scss"

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

@@ -5,12 +5,15 @@ import { Client } from "@decidim/decidim-bulletin_board";
 $(() => {
   const $form = $("form.step");
   const $pendingAction = $form.find("#pending_action");
-  const bulletinBoardClient = new Client({
-    apiEndpointUrl: $pendingAction.data("apiEndpointUrl")
-  });
-  const messageId = $pendingAction.data("messageId");
 
-  bulletinBoardClient.waitForPendingMessageToBeProcessed(messageId).then(() => {
-    $form.trigger("submit");
-  });
+  if ($pendingAction.length) {
+    const bulletinBoardClient = new Client({
+      apiEndpointUrl: $pendingAction.data("apiEndpointUrl")
+    });
+    const messageId = $pendingAction.data("messageId");
+
+    bulletinBoardClient.waitForPendingMessageToBeProcessed(messageId).then(() => {
+      $form.trigger("submit");
+    });
+  }
 });

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

@@ -10,118 +10,121 @@ 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)
+
+  if ($trusteesProcess.length) {
+    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
       ) {
-        trusteesStatuses[decodedData.trustee_id] = false;
+        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")
-        }
-      })
+    const checkPendingAction = async () => {
+      if (!checkPendingActionPath) {
+        return false
+      }
 
-      return response && response.status === "pending";
-    } catch (err) {
-      return true;
+      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");
+    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");
         }
-      } 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);
-    }
-  };
+      if (
+        Object.keys(trusteesStatuses).length === $checkingTrustees.length &&
+        missingTrustees <= missingTrusteesAllowed && !pendingAction
+      ) {
+        $(".js-continue-link").removeClass("disabled");
+      } else {
+        setTimeout(checkTrusteesActivity, WAIT_TIME_MS);
+      }
+    };
 
-  await checkTrusteesActivity();
+    await checkTrusteesActivity();
+  }
 });

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

@@ -4,8 +4,11 @@
 
 $(() => {
   const WAIT_TIME_MS = 3000; // 3s
+  const url = $("#vote-stats").data("refreshUrl");
 
-  setInterval(function() {
-    $("#vote-stats").load($("#vote-stats").data("refreshUrl"));
-  }, WAIT_TIME_MS);
+  if (url) {
+    setInterval(function() {
+      $("#vote-stats").load(url);
+    }, WAIT_TIME_MS);
+  }
 })

data/app/packs/src/decidim/elections/broken_promises_handler.js

@@ -1,11 +1,13 @@
 /* Fallback for non-handled failed promises */
 window.addEventListener("unhandledrejection", (event) => {
-  console.log("broken", event)
-  $("#server-failure .tech-info").html(event.reason);
-  if (event.reason.toString().indexOf("fetch") === -1) {
-    $("#server-failure .communication_error").addClass("hide");
-    $("#server-failure .generic_error").removeClass("hide");
+  if (window.Decidim.currentDialogs["server-failure"]) {
+    document.getElementById("tech-info").innerHTML = event.reason
+
+    if (event.reason.toString().indexOf("fetch") === -1) {
+      document.getElementById("communication_error").hidden = true
+      document.getElementById("generic_error").hidden = false
+    }
+
+    window.Decidim.currentDialogs["server-failure"].open()
   }
-  $("#server-failure").foundation("open");
 });
-