decidim-action_delegator 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4612ec0f7ff48ca4db9c6ce96adf9563afd16c898b45333fc3e63177c70454
-  data.tar.gz: f503d3d4b9d4ab544e60909c1907aff6b405cbe54dce8eab3330c7e718ea6b50
+  metadata.gz: 3c9cb4e269f3433a220d34955258ee7e663add3d465833a068ff9506eef4156d
+  data.tar.gz: bfcff5e832367d10ec48825d509f7cbdc75616cb5d34700ef596b5df7eabc39e
 SHA512:
-  metadata.gz: 8a32dd04273f2f27ee30969e638ec3341365214fdaa22ec37cdbe0a6d2a2cb4c98c1bd78b680eb2cc162a48fd2b7277993f6b85180ab1e51357bdf53d6c791aa
-  data.tar.gz: e4629f6b1eb8d5debdb3bafabce31563f5d63ffbf498909068e317dfb2a13311f1753035d7def22c3c4dc16b0760a626627079a08942372d1671592d3964ac19
+  metadata.gz: d62135dd241c7b135a80baa89d682c1fa9118a9fd6ae83ddcbf1d45c70c9cbc7e18a0e131f60a99bce588b5cb903244f596822992da81c3424acdd365799f4c9
+  data.tar.gz: 4a13be55a171cc0dd6d524f00c3e84e6e9d8e46bef3a20145c8fedb2da89f8490fd81210c3b9719dbf043de40458d865ea86a3d639ed1c42738ec13387648f09

data/README.md

@@ -16,9 +16,9 @@ Initially, only votes on consultations can be delegated.
 
 ## Dependencies
 
-* [decidim-consultations](https://github.com/decidim/decidim/tree/master/decidim-consultations) >= v0.26.0
-* [decidim-admin](https://github.com/decidim/decidim/tree/master/decidim-admin) >= v0.26.0
-* [decidim-core](https://github.com/decidim/decidim/tree/master/decidim-core) >= v0.26.0
+* [decidim-consultations](https://github.com/decidim/decidim/tree/master/decidim-consultations) >= v0.27.0
+* [decidim-admin](https://github.com/decidim/decidim/tree/master/decidim-admin) >= v0.27.0
+* [decidim-core](https://github.com/decidim/decidim/tree/master/decidim-core) >= v0.27.0
 
 ## Installation
 
@@ -42,7 +42,37 @@ bundle exec rails decidim_action_delegator:install:migrations
 bundle exec rails db:migrate
 ```
 
-> **IMPORTANT:** 
+**ActiveJob Configuration**
+
+This module can send invitations to users in order to register into the platform.
+If you are using Sidekiq (or another queue processor), you need to make sure that the `invite_participants` queue is processed by Sidekiq.
+
+For instance, this file should work for Sidekiq:
+
+`config/sidekiq.yml`
+
+```yaml
+:concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", "5").to_i %>
+:queues:
+  - [mailers, 4]
+  - [invite_participants, 4]
+  - [vote_reminder, 2]
+  - [reminders, 2]
+  - [default, 2]
+  - [newsletter, 2]
+  - [newsletters_opt_in, 2]
+  - [conference_diplomas, 2]
+  - [events, 2]
+  - [translations, 2]
+  - [user_report, 2]
+  - [block_user, 2]
+  - [metrics, 1]
+  - [exports, 1]
+  - [close_meeting_reminder, 1]
+```
+
+
+> **UPGRADE NOTES:** 
 >
 > If you are upgrading from a previous version, you need to run the migrations again and import all membership types/weights into the built-in census by executing in your production server:
 >
@@ -56,14 +86,15 @@ bundle exec rails db:migrate
 Depending on your Decidim version, you can choose the corresponding version to ensure compatibility:
 
 | Version | Compatible Decidim versions |
-|---|---|
-| 0.7.x | 0.26.x |
-| 0.6.x | 0.26.x |
-| 0.5 | 0.25.x |
-| 0.4 | 0.24.x |
-| 0.3 | 0.24.x |
-| 0.2 | 0.23.x |
-| 0.1 | 0.22.0 |
+|---------|-----------------------------|
+| 0.8.x   | 0.27.x                      |
+| 0.7.x   | 0.26.x                      |
+| 0.6.x   | 0.26.x                      |
+| 0.5     | 0.25.x                      |
+| 0.4     | 0.24.x                      |
+| 0.3     | 0.24.x                      |
+| 0.2     | 0.23.x                      |
+| 0.1     | 0.22.0                      |
 
 *Heads up!*  [Consultations module will be deprecated in the near future.](https://github.com/decidim/decidim/issues/7097)
 
@@ -328,4 +359,3 @@ This engine is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 ## About
 
 This plugin is currently maintained by [![Pokecode](app/packs/images/logo-pokecode.png)](https://pokecode.net)with much appreciated contributions from other companies.
-

data/app/commands/decidim/action_delegator/admin/create_delegation.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class CreateDelegation < Rectify::Command
+      class CreateDelegation < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/create_participant.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class CreateParticipant < Rectify::Command
+      class CreateParticipant < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/create_ponderation.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class CreatePonderation < Rectify::Command
+      class CreatePonderation < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/create_setting.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class CreateSetting < Rectify::Command
+      class CreateSetting < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/fix_resource_permissions.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class FixResourcePermissions < Rectify::Command
+      class FixResourcePermissions < Decidim::Command
         def initialize(resources)
           @resources = resources
           @errors = []

data/app/commands/decidim/action_delegator/admin/update_participant.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class UpdateParticipant < Rectify::Command
+      class UpdateParticipant < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/update_ponderation.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class UpdatePonderation < Rectify::Command
+      class UpdatePonderation < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/commands/decidim/action_delegator/admin/update_setting.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class UpdateSetting < Rectify::Command
+      class UpdateSetting < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

data/app/controllers/concerns/decidim/action_delegator/devise/sessions_controller_override.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Devise
+      module SessionsControllerOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :after_sign_in_path_for_original, :after_sign_in_path_for
+
+          # automatically authorize the user if theres a setting for it
+          def after_sign_in_path_for(user)
+            after_sign_in_path_for_original(user) unless authorize_user_with_delegations_verifier(user)
+            super
+          end
+
+          private
+
+          def authorize_user_with_delegations_verifier(user)
+            setting = Decidim::ActionDelegator::OrganizationSettings.new(current_user.organization).active.first
+            delegations_verifier_authorization = Decidim::Authorization.find_or_initialize_by(
+              user: user,
+              name: "delegations_verifier"
+            )
+
+            return unless ActionDelegator.authorize_on_login
+            return unless user.present? && !user.blocked?
+            return unless setting&.verify_with_email? && !delegations_verifier_authorization.granted?
+
+            form = Decidim::ActionDelegator::Verifications::DelegationsVerifierForm.new.with_context(
+              current_user: user,
+              setting: setting
+            )
+            Decidim::Verifications::PerformAuthorizationStep.call(delegations_verifier_authorization, form) do
+              on(:ok) do
+                delegations_verifier_authorization.grant!
+                form.participant.update!(decidim_user: user)
+                flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
+                return true
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/action_delegator/admin/consultations_controller.rb

@@ -39,7 +39,7 @@ module Decidim
         end
 
         def published_questions_responses
-          VotedWithPonderations.new(PublishedResponses.new(current_consultation).query).query
+          VotedWithPonderations.new(Responses.new(current_consultation).query).query
         end
       end
     end

data/app/controllers/decidim/action_delegator/admin/manage_participants_controller.rb

@@ -34,7 +34,7 @@ module Decidim
         end
 
         def destroy_all
-          enforce_permission_to :destroy, :participant, resource: current_setting
+          enforce_permission_to :destroy, :participant, { resource: current_setting }
 
           participants_to_remove = current_setting.participants.reject(&:voted?)
 

data/app/controllers/decidim/action_delegator/admin/settings_controller.rb

@@ -98,7 +98,7 @@ module Decidim
         end
 
         def settings_select_options
-          collection.map { |setting| [setting.consultation.id, translated_attribute(setting.title)] }.to_h
+          collection.to_h { |setting| [setting.consultation.id, translated_attribute(setting.title)] }
         end
 
         def copy_from_setting

data/app/controllers/decidim/action_delegator/verifications/delegations_verifier/authorizations_controller.rb

@@ -10,10 +10,30 @@ module Decidim
 
           helper_method :authorization, :setting
 
+          before_action do
+            unless setting
+              flash[:alert] = t("verifications.delegations_verifier.not_active", scope: "decidim.action_delegator")
+              redirect
+            end
+          end
+
           def new
-            enforce_permission_to :create, :authorization, authorization: authorization
+            @authorization.destroy! if authorization&.persisted? && !authorization&.granted?
 
+            enforce_permission_to :create, :authorization, authorization: authorization
             @form = form(DelegationsVerifierForm).instance(setting: setting)
+            participant = @form&.participant
+
+            return unless ActionDelegator.authorize_on_login && setting&.verify_with_email?
+
+            Decidim::Verifications::PerformAuthorizationStep.call(authorization, @form) do
+              on(:ok) do
+                grant_and_redirect(participant)
+              end
+              on(:invalid) do
+                render :new
+              end
+            end
           end
 
           def create
@@ -29,15 +49,7 @@ module Decidim
                   authorization_method = Decidim::Verifications::Adapter.from_element(authorization.name)
                   redirect_to authorization_method.resume_authorization_path(redirect_url: redirect_url)
                 else
-                  authorization.grant!
-                  participant.update!(decidim_user: authorization.user)
-                  flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
-
-                  if redirect_url
-                    redirect_to redirect_url
-                  else
-                    redirect_to decidim_verifications.authorizations_path
-                  end
+                  grant_and_redirect(participant)
                 end
               end
               on(:invalid) do
@@ -62,11 +74,7 @@ module Decidim
               on(:ok) do
                 flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
 
-                if redirect_url
-                  redirect_to redirect_url
-                else
-                  redirect_to decidim_verifications.authorizations_path
-                end
+                redirect
               end
 
               on(:invalid) do
@@ -87,6 +95,21 @@ module Decidim
 
           private
 
+          def grant_and_redirect(participant)
+            authorization.grant!
+            participant.update!(decidim_user: authorization.user)
+            flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
+            redirect
+          end
+
+          def redirect
+            if redirect_url
+              redirect_to redirect_url
+            else
+              redirect_to decidim_verifications.authorizations_path
+            end
+          end
+
           def authorization
             @authorization ||= Decidim::Authorization.find_or_initialize_by(
               user: current_user,

data/app/forms/decidim/action_delegator/verifications/delegations_verifier_form.rb

@@ -70,11 +70,13 @@ module Decidim
             params = {}
             params[:email] = email if setting.email_required?
             if setting.phone_required?
-              return setting.participants.none if phone.blank?
-
-              params[:phone] = phone
-              params[:phone] = phone_prefixes.map { |prefix| "#{prefix}#{phone}" }
-              params[:phone] += phone_prefixes.map { |prefix| phone.delete_prefix(prefix).to_s }
+              if phone.blank?
+                @participant = setting.participants.none
+              else
+                params[:phone] = phone
+                params[:phone] = phone_prefixes.map { |prefix| "#{prefix}#{phone}" }
+                params[:phone] += phone_prefixes.map { |prefix| phone.delete_prefix(prefix).to_s }
+              end
             end
 
             setting.participants.find_by(params)

data/app/helpers/decidim/action_delegator/admin/delegation_helper.rb

@@ -31,7 +31,7 @@ module Decidim
         end
 
         def missing_decidim_users(participants)
-          participants.where(decidim_user: nil).or(Participant.where.not(decidim_user: current_organization.users)).where.not(id: missing_registered_users(participants))
+          participants.where(decidim_user: nil).or(participants.where.not(decidim_user: current_organization.users)).where.not(id: missing_registered_users(participants))
         end
 
         def missing_registered_users(participants)

data/app/jobs/decidim/action_delegator/send_sms_job.rb

@@ -5,6 +5,7 @@ require "savon"
 module Decidim
   module ActionDelegator
     class SendSmsJobException < StandardError; end
+
     class SendSmsJob < ApplicationJob
       queue_as :default
 

data/app/models/concerns/decidim/action_delegator/consultations/question_override.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Consultations
+      module QuestionOverride
+        extend ActiveSupport::Concern
+
+        included do
+          # if results can be shown to admins
+          def publishable_results?
+            (ActionDelegator.admin_preview_results || consultation.finished?) && sorted_results.any?
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/action_delegator/participant.rb

@@ -21,7 +21,6 @@ module Decidim
       delegate :consultation, to: :setting
       delegate :organization, to: :setting
 
-      validates :setting, presence: true
       validates :decidim_user, uniqueness: { scope: :setting }, if: -> { decidim_user.present? }
       validates :email, uniqueness: { scope: :setting }, if: -> { email.present? }
       validates :phone, uniqueness: { scope: :setting }, if: -> { phone.present? }
@@ -85,15 +84,11 @@ module Decidim
       def voted?
         return false if user.blank?
 
-        @voted ||= if Decidim::Consultations::Vote
-                      .joins(question: :consultation)
-                      .where(decidim_consultations_questions: {
-                               decidim_consultation_id: setting.consultation.id
-                             }, author: user).any?
-                     true
-                   else
-                     false
-                   end
+        @voted ||= Decidim::Consultations::Vote
+                   .joins(question: :consultation)
+                   .where(decidim_consultations_questions: {
+                            decidim_consultation_id: setting.consultation.id
+                          }, author: user).any?
       end
 
       private

data/app/overrides/decidim/consultations/admin/consultations/results/add_ongoing_warning.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before '.table-list' -->
+
+<%= render "decidim/action_delegator/admin/consultations/ongoing_consultation_warning", consultation: current_consultation %>

data/app/overrides/decidim/consultations/questions/_vote_button/add_modal.html.erb.deface

@@ -1,3 +1,3 @@
-<!-- insert_before "erb[loud]:contains('javascript_pack_tag')" -->
+<!-- insert_before "erb[silent]:contains('content_for :js_content')" -->
 
 <%= render partial: "decidim/action_delegator/consultations/questions/delegations_modal", locals: { question: question } %>

data/app/overrides/decidim/consultations/questions/_vote_button/add_modal_javascript.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_before "erb[loud]:contains('javascript_pack_tag')" -->
+
+<%= javascript_pack_tag "decidim_action_delegator_questions" %>
+

data/app/packs/src/decidim/action_delegator/questions.js

@@ -4,6 +4,7 @@ $(() => {
       delegationCalloutsMessage = $(".delegation-callout-message"),
       delegationDialog = $("#delegations-modal"),
       delegationField = $("#decidim_consultations_delegation_id"),
+      delegationUnVoteButtons = $(".delegation_unvote_button"),
       delegationVoteButtons = $(".delegation-vote-button"),
       delegationsButton = $("#delegations-button"),
       voteButton = $("#vote_button"),
@@ -21,6 +22,11 @@ $(() => {
     delegationCallouts.removeClass("is-hidden");
   });
 
+  delegationUnVoteButtons.click(() => {
+    delegationDialog.foundation("close");
+    delegationCallouts.addClass("is-hidden");
+  });
+
   voteButton.click(() => {
     delegationCallouts.addClass("is-hidden");
   });

data/app/queries/decidim/action_delegator/consultation_delegations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class ConsultationDelegations < Rectify::Query
+    class ConsultationDelegations < Decidim::Query
       def self.for(consultation)
         new(consultation).query
       end

data/app/queries/decidim/action_delegator/delegates_votes_by_consultation.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class DelegatesVotesByConsultation < Rectify::Query
+    class DelegatesVotesByConsultation < Decidim::Query
       def initialize(consultation, relation = DelegationVotes)
         @consultation = consultation
         @relation = relation

data/app/queries/decidim/action_delegator/delegates_votes_by_question.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class DelegatesVotesByQuestion < Rectify::Query
+    class DelegatesVotesByQuestion < Decidim::Query
       def initialize(question)
         @question = question
       end

data/app/queries/decidim/action_delegator/delegation_votes.rb

@@ -5,7 +5,7 @@ module Decidim
     # This query object replaces the ActiveRecord association we would have between the Vote and
     # Delegation models. Unfortunately we can't use custom foreign keys on both ends of the
     # association so this aims to replace `delegation.votes`.
-    class DelegationVotes < Rectify::Query
+    class DelegationVotes < Decidim::Query
       def query
         Delegation.joins(
           delegations.join(votes).on(vote_author_eq_granter).join_sources

data/app/queries/decidim/action_delegator/organization_delegations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class OrganizationDelegations < Rectify::Query
+    class OrganizationDelegations < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

data/app/queries/decidim/action_delegator/organization_settings.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class OrganizationSettings < Rectify::Query
+    class OrganizationSettings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

data/app/queries/decidim/action_delegator/{published_responses.rb → responses.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class PublishedResponses < Rectify::Query
+    class Responses < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -12,7 +12,6 @@ module Decidim
       def query
         Decidim::Consultations::Response
           .joins(question: :consultation)
-          .merge(Consultation.finished)
           .where(decidim_consultations_questions: { decidim_consultation_id: consultation.id })
           .where.not(decidim_consultations_questions: { published_at: nil })
       end

data/app/queries/decidim/action_delegator/responses_by_membership.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ActionDelegator
     # Returns total votes of each response by memberships' type and weight.
-    class ResponsesByMembership < Rectify::Query
+    class ResponsesByMembership < Decidim::Query
       DEFAULT_METADATA = I18n.t("decidim.admin.consultations.results.default_metadata")
 
       def initialize(relation)

data/app/queries/decidim/action_delegator/setting_delegations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class SettingDelegations < Rectify::Query
+    class SettingDelegations < Decidim::Query
       def initialize(setting)
         @setting = setting
       end

data/app/queries/decidim/action_delegator/sum_of_membership_weight.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class SumOfMembershipWeight < Rectify::Query
+    class SumOfMembershipWeight < Decidim::Query
       def initialize(relation)
         @relation = relation
       end

data/app/queries/decidim/action_delegator/sum_of_weights.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class SumOfWeights < Rectify::Query
+    class SumOfWeights < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -17,7 +17,7 @@ module Decidim
 
       def published_questions_responses
         VotedWithPonderations.new(
-          PublishedResponses.new(consultation).query
+          Responses.new(consultation).query
         ).query
       end
     end

data/app/queries/decidim/action_delegator/type_and_weight.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class TypeAndWeight < Rectify::Query
+    class TypeAndWeight < Decidim::Query
       def initialize(consultation)
         @consultation = consultation
       end
@@ -19,7 +19,7 @@ module Decidim
       # Returns the published questions' responses of the given consultation as an ActiveRecord
       # Relation. Note this enables us to the chain it with other AR Relation objects.
       def published_questions_responses
-        PublishedResponses.new(consultation).query
+        Responses.new(consultation).query
       end
     end
   end

data/app/queries/decidim/action_delegator/voted_with_ponderations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module ActionDelegator
-    class VotedWithPonderations < Rectify::Query
+    class VotedWithPonderations < Decidim::Query
       def initialize(relation)
         @relation = relation
       end

data/app/views/decidim/action_delegator/admin/consultations/_ongoing_consultation_warning.html.erb

@@ -0,0 +1,3 @@
+<% if Decidim::ActionDelegator.admin_preview_results && !consultation.finished? %>
+  <div class="callout warning"><%= t "ongoing_consultation", scope: "decidim.action_delegator.admin.consultations.results" %></div>
+<% end %>

data/app/views/decidim/action_delegator/admin/consultations/results.html.erb

@@ -19,6 +19,9 @@
     </h2>
   </div>
   <div class="card-section">
+
+    <%= render "ongoing_consultation_warning", consultation: current_consultation %>
+
     <table class="table-list">
       <% questions.each do |question| %>
         <% unless question.external_voting %>

data/app/views/decidim/action_delegator/admin/consultations/weighted_results.html.erb

@@ -24,6 +24,9 @@
     </h2>
   </div>
   <div class="card-section">
+
+    <%= render "ongoing_consultation_warning", consultation: current_consultation %>
+
     <table id="results" class="table-list">
       <% questions.each do |question| %>
         <% unless question.external_voting %>