Several minor corrections (#89)

* change texts * fix tests * fixes * allow to republish results * add republish specs * allow dynamic censuses * fix vocdoni format * fix * upgrade vocdoni/sdk 0.9.1 * change upload-artifact version * change polyfill --------- Co-authored-by: Anna Topalidi <[email protected]>
decidim-vocdoni · Nov 14, 2024 · 9fee9f5 · 9fee9f5
1 parent 05e3254
commit 9fee9f5
Show file tree

Hide file tree

Showing 61 changed files with 10,364 additions and 632 deletions.
diff --git a/.github/workflows/test-rails.yml b/.github/workflows/test-rails.yml
@@ -85,14 +85,14 @@ jobs:
         with:
           token: ${{ env.CODECOV_TOKEN }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: screenshots
           path: ./spec/decidim_dummy_app/tmp/screenshots
           if-no-files-found: ignore
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: Test logs

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -723,7 +723,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.0)
+    stringio (3.1.1)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

diff --git a/app/cells/decidim/vocdoni/election_results/show.erb b/app/cells/decidim/vocdoni/election_results/show.erb
@@ -21,7 +21,11 @@
               <%= translated_attribute(answer.title) %>
             </p>
 
-            <%= render view: :progress_bar, locals: { id: answer.id, votes_percentage: answer.votes_percentage, votes: answer.votes } %>
+            <% if answer.votes_percentage.nil? %>
+              <p class="text-alert text-center"><%= t("decidim.vocdoni.elections.results.results_error") %></p>
+            <% else %>
+              <%= render view: :progress_bar, locals: { id: answer.id, votes_percentage: answer.votes_percentage, votes: answer.votes } %>
+            <% end %>
           </div>
         <% end %>
       </div>

diff --git a/app/commands/decidim/vocdoni/admin/update_election_calendar.rb b/app/commands/decidim/vocdoni/admin/update_election_calendar.rb
@@ -48,7 +48,6 @@ def update_election!
         def election_type_attributes
           {
             election_type: {
-              auto_start: !form.manual_start,
               secret_until_the_end: form.result_type == "after_voting",
               interruptible: Decidim::Vocdoni.interruptible_elections,
               dynamic_census: election.internal_census?,

diff --git a/app/controllers/decidim/vocdoni/admin/questions_controller.rb b/app/controllers/decidim/vocdoni/admin/questions_controller.rb
@@ -22,9 +22,9 @@ def create
           @form = form(QuestionForm).from_params(params, election:)
 
           CreateQuestion.call(@form) do
-            on(:ok) do
+            on(:ok) do |question|
               flash[:notice] = I18n.t("questions.create.success", scope: "decidim.vocdoni.admin")
-              redirect_to election_questions_path(election)
+              redirect_to election_question_answers_path(election, question)
             end
 
             on(:invalid) do

diff --git a/app/controllers/decidim/vocdoni/admin/steps_controller.rb b/app/controllers/decidim/vocdoni/admin/steps_controller.rb
@@ -92,7 +92,8 @@ def current_step_form_class
             "created" => ElectionStatusForm, # This allows for resending data to vocdoni if there's been a problem
             "paused" => ElectionStatusForm,
             "vote" => ElectionStatusForm,
-            "vote_ended" => ResultsForm
+            "vote_ended" => ResultsForm,
+            "results_published" => election.answers_have_results? ? nil : ResultsForm
           }[current_step]
         end
 
@@ -102,7 +103,8 @@ def current_step_command_class
             "created" => UpdateElectionStatus,
             "paused" => UpdateElectionStatus,
             "vote" => UpdateElectionStatus,
-            "vote_ended" => SaveResults
+            "vote_ended" => SaveResults,
+            "results_published" => SaveResults
           }[current_step]
         end
 

diff --git a/app/jobs/decidim/vocdoni/admin/create_vocdoni_election_job.rb b/app/jobs/decidim/vocdoni/admin/create_vocdoni_election_job.rb
@@ -14,6 +14,7 @@ def perform(election_id)
             election.build_answer_values!
             result = sdk.createElection(election.to_vocdoni, election.questions_to_vocdoni, election.census_status.all_wallets)
             @vocdoni_id = result["electionId"]
+            @census_id = result["censusId"]
             @census_identifier = result["censusIdentifier"]
             @census_address = result["censusAddress"]
             @census_private_key = result["censusPrivateKey"]
@@ -33,6 +34,7 @@ def perform(election_id)
         def update_election
           election.vocdoni_election_id = vocdoni_id
           election.census_attributes = {
+            id: @census_id,
             identifier: @census_identifier,
             address: @census_address,
             private_key: @census_private_key,

diff --git a/app/models/decidim/vocdoni/answer.rb b/app/models/decidim/vocdoni/answer.rb
@@ -21,6 +21,8 @@ class Answer < ApplicationRecord
       # A votes percentage relative to the question
       # Returns a Float.
       def votes_percentage
+        return unless question.total_votes.positive? && !votes.nil?
+
         @votes_percentage ||= (votes.to_f / question.total_votes * 100.0).round(2)
       end
 

diff --git a/app/models/decidim/vocdoni/election.rb b/app/models/decidim/vocdoni/election.rb
@@ -83,11 +83,11 @@ def blocked?
     end
 
     def auto_start?
-      election_type&.fetch("auto_start", true)
+      start_time.present?
     end
 
     def manual_start?
-      auto_start? == false
+      !auto_start?
     end
 
     def interruptible?
@@ -176,6 +176,11 @@ def answers_have_votes?
       questions.map(&:answers).flatten.pluck(:votes).any? Integer
     end
 
+    # Public: Checks if the election has all results correctly defined
+    def answers_have_results?
+      questions.map(&:answers).flatten.pluck(:votes).none? nil
+    end
+
     # Public: Gets the voting period status of the election
     #
     # Returns one of these symbols: upcoming, ongoing or finished
@@ -205,7 +210,7 @@ def build_answer_values!
     end
 
     # Public: the Vocdoni's format to create a new election
-    # @see https://developer.vocdoni.io/sdk#creating-a-voting-process
+    # @see https://developer.vocdoni.io/sdk/tutorial
     # The process to create an election still needs to add the keys "census" and "questions"
     # This is done using the Vocdoni SDK
     def to_vocdoni
@@ -217,12 +222,12 @@ def to_vocdoni
         "startDate" => start_time&.iso8601,
         "endDate" => end_time.iso8601,
         "electionType" => {
-          "autoStart" => auto_start?,
           # For the moment, we consider all censuses dynamic so admins can update them
           "dynamicCensus" => true,
           "interruptible" => interruptible?,
           "secretUntilTheEnd" => secret_until_the_end?,
-          "anonymous" => anonymous?
+          "anonymous" => anonymous?,
+          "metadata" => { "encrypted" => false, "password" => nil }
         },
         "voteType" => {
           # uniqueChoices: false, # if the choices are unique when voting

diff --git a/app/models/decidim/vocdoni/question.rb b/app/models/decidim/vocdoni/question.rb
@@ -18,7 +18,7 @@ class Question < ApplicationRecord
       delegate :organization, to: :election
 
       def total_votes
-        answers.sum(:votes)
+        answers.sum { |a| a.votes.to_i }
       end
 
       def slug

diff --git a/app/packs/entrypoints/decidim_vocdoni_elections.js b/app/packs/entrypoints/decidim_vocdoni_elections.js
@@ -1,2 +1,5 @@
+// JS
+import "src/decidim/vocdoni/global-polyfills";
+
 // CSS
 import "entrypoints/decidim_vocdoni_elections.scss";
diff --git a/app/packs/src/decidim/vocdoni/global-polyfills.js b/app/packs/src/decidim/vocdoni/global-polyfills.js
@@ -0,0 +1,7 @@
+// Adding this polyfill for `process` because `util.js` relies on `process.env.NODE_DEBUG`.
+// This ensures compatibility in environments where `process` is not defined (e.g., browsers).
+window.process = window.process || {
+  env: {
+    NODE_DEBUG: ""
+  }
+};
diff --git a/app/packs/src/decidim/vocdoni/voter/new-vote.js b/app/packs/src/decidim/vocdoni/voter/new-vote.js
@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import { ElectionStatus, VocdoniSDKClient } from "@vocdoni/sdk";
 
-import VoteQuestionsComponent from "./vote_questions.component";
-import VoteComponent from "./setup-vote";
-import PreviewVoteComponent from "./setup-preview";
-import { walletFromLoginForm } from "./census-utils";
+import VoteQuestionsComponent from "src/decidim/vocdoni/voter/vote_questions.component";
+import VoteComponent from "src/decidim/vocdoni/voter/setup-vote";
+import PreviewVoteComponent from "src/decidim/vocdoni/voter/setup-preview";
+import { walletFromLoginForm } from "src/decidim/vocdoni/voter/census-utils";
 
 /*
  * Mount the VoteComponent object and bind the events to the UI

diff --git a/app/packs/stylesheets/decidim/vocdoni/admin/elections_tabs.scss b/app/packs/stylesheets/decidim/vocdoni/admin/elections_tabs.scss
@@ -8,7 +8,7 @@
 }
 
 .tabs-title.is-active {
-  background: #ffffff;
+  background: #fff;
 }
 
 .progress-indicator {
@@ -44,8 +44,8 @@
   content: attr(data-step);
   display: block;
   background: #ccc;
-  width: .5em;
-  height: .5em;
+  width: 0.5em;
+  height: 0.5em;
   text-align: center;
   margin: 0 auto 0.25em;
   line-height: 1.5em;
@@ -55,11 +55,11 @@
 }
 
 .progress-indicator > li.text-warning::before {
-  background: #ffae00;;
+  background: #ffae00;
 }
 
 .progress-indicator > li::after {
-  content: '';
+  content: "";
   position: absolute;
   display: block;
   background: #ccc;
@@ -70,11 +70,11 @@
   -ms-transform: translateY(-100%);
   transform: translateY(-100%);
   left: 50%;
-  margin-left: 1.5em\9;
+  margin-left: 1.5em;
   z-index: 0;
 }
 
-.progress-indicator > li:last-child:after {
+.progress-indicator > li:last-child::after {
   display: none;
 }
 

diff --git a/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss b/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss
@@ -9,37 +9,10 @@ $white: #fff;
   }
 }
 
-.spinner-container {
-  position: relative;
-  cursor: wait;
-
-  &::before{
-    content: " ";
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    @apply bg-white bg-opacity-80;
-    z-index: 1;
-  }
-
-  &::after{
-    -webkit-animation: animation-spin 800ms infinite linear;
-    animation: animation-spin 800ms infinite linear;
-    width: 25px;
-    height: 25px;
-    box-sizing: border-box;
-    border-radius: 50%;
-    border: 3px solid #e8e8e8;
-    border-right-color: var(--primary);
-    display: inline-block;
-    position: absolute;
-    content: "";
-    vertical-align: middle;
-    z-index: 1;
-    top: 47%;
-    left: 47%;
+.evote__preview.spinner-container {
+  &::before {
+    margin-left: calc(50% - 1rem);
+    top: 10vh;
   }
 }
 
@@ -49,7 +22,8 @@ $white: #fff;
   &:hover {
     @apply text-white #{!important};
 
-    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--alert-rgb) / var(--tw-bg-opacity)) !important;
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)),
+      rgb(var(--alert-rgb) / var(--tw-bg-opacity)) !important;
   }
 }
 
@@ -59,7 +33,8 @@ $white: #fff;
   &:hover {
     @apply text-white #{!important};
 
-    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--warning-rgb) / var(--tw-bg-opacity)) !important;
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)),
+      rgb(var(--warning-rgb) / var(--tw-bg-opacity)) !important;
   }
 }
 
@@ -69,7 +44,8 @@ $white: #fff;
   &:hover {
     @apply text-white #{!important};
 
-    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--success-rgb) / var(--tw-bg-opacity)) !important;
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)),
+      rgb(var(--success-rgb) / var(--tw-bg-opacity)) !important;
   }
 }
 
@@ -95,12 +71,13 @@ a.button__alert {
 }
 
 .publish-text p {
-  @apply mb-2
+  @apply mb-2;
 }
 
 .wallet-container {
   @apply w-full mx-auto py-2;
 }
+
 .wallet-input {
   @apply rounded-none rounded-s-md block flex-1 min-w-0 w-full text-sm p-2 border-2 text-gray-2 cursor-not-allowed;
 }
@@ -110,14 +87,19 @@ button.copy-button {
 }
 
 .vocdoni__accordion-trigger {
-  @apply flex w-full items-center justify-between font-semibold text-secondary ;
+  @apply flex w-full items-center justify-between font-semibold text-secondary;
 
   &:hover {
     @apply underline;
   }
 
-    svg {
-        @apply w-8 h-8;
-        fill: currentColor;
-    }
+  svg {
+    @apply w-8 h-8;
+
+    fill: currentColor;
+  }
+}
+
+.evote__preview-question {
+  @apply border-0;
 }
diff --git a/app/packs/stylesheets/decidim/vocdoni/elections/elections.scss b/app/packs/stylesheets/decidim/vocdoni/elections/elections.scss
@@ -120,9 +120,11 @@
 
   th {
     @apply bg-gray-3 px-6 py-3 text-left text-xs font-medium uppercase tracking-wider;
+
     &.w-3\/4 {
       width: 75%;
     }
+
     &.w-1\/4 {
       width: 25%;
     }
@@ -136,6 +138,7 @@
     &:nth-child(odd) {
       @apply bg-white;
     }
+
     &:nth-child(even) {
       @apply bg-gray-5;
     }
@@ -155,7 +158,9 @@
   line-height: 18px;
   font-weight: 600;
   text-transform: uppercase;
+
   --tw-text-opacity: 1;
+
   color: rgb(62 76 92 / 1);
 }
 
@@ -164,5 +169,5 @@
   width: 1rem;
   flex: none;
   fill: currentColor;
-  color: #6B7280CC;
+  color: #6b7280cc;
 }