decidim-proposals 0.30.0.rc2 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ef0ea1b3c03d7770041d74f7f95183817088ae774fcfe6c1b3ffdb5be89569
-  data.tar.gz: d289bc845f005d511a24cc72e7051b65a30d3756165b431c7b9bc6e140bcc702
+  metadata.gz: 81bba03dc800ce062b503bcaad10e09f1b3bc016dd02c647dc08f1e893a64f68
+  data.tar.gz: 4770709bececf57eef406cf4e879f7be42132a81782911c79c3dc8f16d690035
 SHA512:
-  metadata.gz: 9a7c6d25457ecc074a0bc261a4155c6d8040cc8ec3b39e444369ff52b48711bfb6e66a49fd970d23dfd6515556448ac7cc5b1befc8e1fef65369fd900df2cb98
-  data.tar.gz: 1defeac441eec1dae4c002710b4c51efbb70d40b1e4a4e6edba3cd4151cb05ebd81c4c4a2e5344d39159f9c763dfcddcd5df320e3ccaac4356a37103d9379fd9
+  metadata.gz: dc1bf3583428e26ca578f26d84a24cb0b5cb36da2938e143d9fbb23d009b8487a8270e1dc40ab3df9e370cd79bf636a974f22c1b238581aa6e770a995bbe6d2c
+  data.tar.gz: 551a0f369ace9f5881edb71d6fc4bc9b4c212e597e5df2cd67b01bbf0300f321db1729ac5fa132d02ebd55763fa18b7247c9522cf22ac8a7ac034738ec958cc9

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -10,22 +10,10 @@
     <% end %>
   <% end %>
 </div>
-
-<div class="flex items-center justify-between space-x-6">
-  <span class="content-block__span flex-shrink-0">
-    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-  </span>
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
-      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
-</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
     <% proposals_to_render.each do |p| %>
-      <%= card_for p, link_whole_card: true, hide_voting: true, title_tag: :h3, **options.slice(:show_space) %>
+      <%= card_for p, link_whole_card: true, title_tag: :h3, **options.slice(:show_space) %>
     <% end %>
   </div>
 </div>

data/app/cells/decidim/proposals/proposal_g_cell.rb

@@ -46,6 +46,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def cache_hash
         @cache_hash ||= begin
           hash = []
@@ -53,7 +54,7 @@ module Decidim
           hash << self.class.name.demodulize.underscore
           hash << model.cache_key_with_version
           hash << model.proposal_votes_count
-          hash << options[:hide_voting] ? 1 : 0
+          hash << options[:show_voting] ? 0 : 1
           hash << model.endorsements_count
           hash << model.comments_count
           hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
@@ -63,10 +64,11 @@ module Decidim
           hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
-
+          hash << (current_user&.id || 0)
           hash.join(Decidim.cache_key_separator)
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def classes
         super.merge(metadata: "card__list-metadata")

data/app/cells/decidim/proposals/proposal_l/show.erb

@@ -4,7 +4,7 @@
     <%= render :content %>
     <%= render :extra_data if render_extra_data? %>
   <% end %>
-    <% if has_actions? && options.fetch(:hide_voting, false) == false %>
+    <% if has_actions? && options.fetch(:show_voting, false) == true %>
       <% if current_settings.votes_hidden? %>
         <div class="card__proposals-votes-hidden">
           <%= cell proposal_vote_cell, resource, **options %>

data/app/cells/decidim/proposals/proposal_l_cell.rb

@@ -27,6 +27,8 @@ module Decidim
         "decidim/proposals/proposal_vote"
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def cache_hash
         @cache_hash ||= begin
           hash = []
@@ -34,7 +36,7 @@ module Decidim
           hash << self.class.name.demodulize.underscore
           hash << model.cache_key_with_version
           hash << model.proposal_votes_count
-          hash << options[:hide_voting] ? 1 : 0
+          hash << options[:show_voting] ? 0 : 1
           hash << model.endorsements_count
           hash << model.comments_count
           hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
@@ -44,9 +46,12 @@ module Decidim
           hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+          hash << (current_user&.id || 0)
 
           hash.join(Decidim.cache_key_separator)
         end
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

data/app/cells/decidim/proposals/proposal_vote/show.erb

@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: resource, from_proposals_list: true } %>
   <% else %>
@@ -24,7 +24,7 @@
     <div id="proposal-<%= resource.id %>-vote-button" class="card__proposals-votes-container">
       <% if !current_user %>
         <% if current_settings.votes_blocked? %>
-          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, disabled: true %>
+          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
         <% else %>
           <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(resource) } do %>
             <%= t("decidim.proposals.proposals.vote_button.vote") %>
@@ -32,7 +32,7 @@
           <% end %>
         <% end %>
       <% else %>
-        <% if @voted_proposals ? @voted_proposals.include?(resource.id) : resource.voted_by?(current_user) %>
+        <% if proposal_voted_by_user?(resource) %>
           <%= action_authorized_button_to(
                 :vote,
                 proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:),
@@ -40,6 +40,7 @@
                 method: :delete,
                 remote: true,
                 data: {
+                  "proposal-vote-button": true,
                   disable: true,
                   original: t("decidim.proposals.proposals.vote_button.already_voted"),
                   replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
@@ -55,14 +56,17 @@
           <% end %>
         <% else %>
           <% if resource.maximum_votes_reached? && !resource.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
           <% else %>
-            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, disabled: true %>
+            <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, disabled: true, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
+                <%= t("decidim.proposals.proposals.vote_button.vote") %>
+                <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
+              <% end %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
             <% else %>
-              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, data: { disable: true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, data: { "proposal-vote-button": true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
                 <%= t("decidim.proposals.proposals.vote_button.vote") %>
                 <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
               <% end %>

data/app/commands/decidim/proposals/admin/import_proposals.rb

@@ -22,7 +22,8 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
-          broadcast(:ok, import_proposals)
+          import_proposals
+          broadcast(:ok)
         end
 
         private
@@ -30,65 +31,11 @@ module Decidim
         attr_reader :form
 
         def import_proposals
-          proposals.map do |original_proposal|
-            next if proposal_already_copied?(original_proposal, target_component)
-
-            Decidim::Proposals::ProposalBuilder.copy(
-              original_proposal,
-              author: proposal_author,
-              action_user: form.current_user,
-              extra_attributes: {
-                "component" => target_component
-              }.merge(proposal_answer_attributes(original_proposal))
-            )
-          end.compact
-        end
-
-        def proposals
-          @proposals = Decidim::Proposals::Proposal
-                       .where(component: origin_component)
-
-          @proposals = if @form.states.include?("not_answered")
-                         @proposals.not_answered.or(@proposals.where(id: @proposals.only_status(@form.states).pluck(:id)))
-                       else
-                         @proposals.only_status(@form.states)
-                       end
-
-          @proposals
-        end
-
-        def origin_component
-          @form.origin_component
-        end
-
-        def target_component
-          @form.current_component
-        end
-
-        def proposal_already_copied?(original_proposal, target_component)
-          # Note: we are including also proposals from unpublished components
-          # because otherwise duplicates could be created until the component is
-          # published.
-          original_proposal.linked_resources(:proposals, "copied_from_component", component_published: false).any? do |proposal|
-            proposal.component == target_component
-          end
-        end
-
-        def proposal_author
-          form.keep_authors ? nil : @form.current_organization
-        end
-
-        def proposal_answer_attributes(original_proposal)
-          return {} unless form.keep_answers
-
-          state = Decidim::Proposals::ProposalState.where(component: target_component, token: original_proposal.state).first
-
-          {
-            answer: original_proposal.answer,
-            answered_at: original_proposal.answered_at,
-            proposal_state: state,
-            state_published_at: original_proposal.state_published_at
-          }
+          ImportProposalsJob.perform_later(form.as_json.merge({
+                                                                "current_user_id" => form.current_user.id,
+                                                                "current_organization_id" => form.current_organization.id,
+                                                                "current_component_id" => form.current_component.id
+                                                              }))
         end
       end
     end

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

@@ -16,8 +16,8 @@ module Decidim
           @form = form(Admin::ProposalsImportForm).from_params(params)
 
           Admin::ImportProposals.call(@form) do
-            on(:ok) do |proposals|
-              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin", number: proposals.length)
+            on(:ok) do
+              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin")
               redirect_to EngineRouter.admin_proxy(current_component).root_path
             end
 

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -48,15 +48,6 @@ module Decidim
           @proposals = reorder(@proposals)
           @proposals = paginate(@proposals)
           @proposals = @proposals.includes(:component, :coauthorships, :attachments)
-
-          @voted_proposals = if current_user
-                               ProposalVote.where(
-                                 author: current_user,
-                                 proposal: @proposals.pluck(:id)
-                               ).pluck(:decidim_proposal_id)
-                             else
-                               []
-                             end
         end
       end
 

data/app/controllers/decidim/proposals/versions_controller.rb

@@ -11,7 +11,7 @@ module Decidim
       def versioned_resource
         @versioned_resource ||=
           if params[:proposal_id]
-            present(Proposal.where(component: current_component).find(params[:proposal_id]))
+            present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
           else
             CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
           end

data/app/forms/decidim/proposals/admin/proposal_answer_form.rb

@@ -16,20 +16,9 @@ module Decidim
         attribute :internal_state, String
 
         validates :internal_state, presence: true, inclusion: { in: :proposal_states }
-        validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
-
-        with_options if: :costs_required? do
-          validates :cost, numericality: true, presence: true
-          validates :cost_report, translatable_presence: true
-          validates :execution_period, translatable_presence: true
-        end
 
         alias state internal_state
 
-        def costs_required?
-          costs_enabled? && state == "accepted"
-        end
-
         def publish_answer?
           current_component.current_settings.publish_answers_immediately?
         end
@@ -39,10 +28,6 @@ module Decidim
         def proposal_states
           Decidim::Proposals::ProposalState.where(component: current_component).pluck(:token).map(&:to_s) + ["not_answered"]
         end
-
-        def costs_enabled?
-          current_component.current_settings.answers_with_costs?
-        end
       end
     end
   end

data/app/helpers/decidim/proposals/application_helper.rb

@@ -17,8 +17,6 @@ module Decidim
       include Decidim::RichTextEditorHelper
       include Decidim::CheckBoxesTreeHelper
 
-      delegate :minimum_votes_per_user, to: :component_settings
-
       # Public: The state of a proposal in a way a human can understand.
       #
       # state - The String state of the proposal.
@@ -85,10 +83,6 @@ module Decidim
         proposal_limit.present?
       end
 
-      def minimum_votes_per_user_enabled?
-        minimum_votes_per_user.positive?
-      end
-
       def not_from_collaborative_draft(proposal)
         proposal.linked_resources(:proposals, "created_from_collaborative_draft").empty?
       end
@@ -138,13 +132,6 @@ module Decidim
         component_settings.proposal_limit
       end
 
-      def votes_given
-        @votes_given ||= ProposalVote.where(
-          proposal: Proposal.where(component: current_component),
-          author: current_user
-        ).count
-      end
-
       def layout_item_classes
         if show_voting_rules?
           "layout-item lg:pt-4"

data/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -4,14 +4,7 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal votes partials
     module ProposalVotesHelper
-      # Public: Gets the vote limit for each user, if set.
-      #
-      # Returns an Integer if set, nil otherwise.
-      def vote_limit
-        return nil if component_settings.vote_limit&.zero?
-
-        component_settings.vote_limit
-      end
+      delegate :minimum_votes_per_user, to: :component_settings
 
       # Check if the vote limit is enabled for the current component
       #
@@ -20,6 +13,10 @@ module Decidim
         vote_limit.present?
       end
 
+      def minimum_votes_per_user_enabled?
+        minimum_votes_per_user.positive?
+      end
+
       # Public: Checks if threshold per proposal are set.
       #
       # Returns true if set, false otherwise.
@@ -64,17 +61,21 @@ module Decidim
         current_user && votes_enabled? && vote_limit_enabled? && !votes_blocked?
       end
 
+      def proposal_voted_by_user?(proposal)
+        return false if current_user.blank? || proposal.blank?
+
+        all_voted_proposals_by_user.include?(proposal.id)
+      end
+
       # Return the remaining votes for a user if the current component has a vote limit
       #
       # user - A User object
       #
       # Returns a number with the remaining votes for that user
-      def remaining_votes_count_for(user)
+      def remaining_votes_count_for_user
         return 0 unless vote_limit_enabled?
 
-        proposals = Proposal.where(component: current_component)
-        votes_count = ProposalVote.where(author: user, proposal: proposals).size
-        component_settings.vote_limit - votes_count
+        component_settings.vote_limit - votes_given
       end
 
       # Return the remaining minimum votes for a user if the current component has a vote limit
@@ -82,12 +83,34 @@ module Decidim
       # user - A User object
       #
       # Returns a number with the remaining minimum votes for that user
-      def remaining_minimum_votes_count_for(user)
-        return 0 unless vote_limit_enabled?
+      def remaining_minimum_votes_count_for_user
+        return 0 unless minimum_votes_per_user_enabled?
+
+        component_settings.minimum_votes_per_user - votes_given
+      end
+
+      private
+
+      def votes_given
+        @votes_given ||= all_voted_proposals_by_user.length
+      end
+
+      # Gets the vote limit for each user, if set.
+      #
+      # Returns an Integer if set, nil otherwise.
+      def vote_limit
+        return nil if component_settings.vote_limit&.zero?
+
+        component_settings.vote_limit
+      end
 
-        votes_count = Decidim::Proposals::ProposalVote.joins(:proposal).where(decidim_proposals_proposals: { decidim_component_id: current_component.id }).where(author: user).count
+      def all_voted_proposals_by_user
+        return [] if current_user.blank?
 
-        component_settings.minimum_votes_per_user - votes_count
+        @all_voted_proposals ||= ProposalVote.where(
+          proposal: Proposal.where(component: current_component),
+          author: current_user
+        ).pluck(:decidim_proposal_id)
       end
     end
   end

data/app/helpers/decidim/proposals/proposals_helper.rb

@@ -12,9 +12,7 @@ module Decidim
       end
 
       def proposal_has_costs?
-        @proposal.cost.present? &&
-          translated_attribute(@proposal.cost_report).present? &&
-          translated_attribute(@proposal.execution_period).present?
+        @proposal.cost.present?
       end
 
       def toggle_view_mode_link(current_mode, target_mode, title, params)

data/app/jobs/decidim/proposals/admin/import_proposals_job.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ImportProposalsJob < ApplicationJob
+        queue_as :default
+
+        def perform(form)
+          @form = form
+          ActiveRecord::Base.transaction do
+            proposals.map do |original_proposal|
+              next if proposal_already_copied?(original_proposal, target_component)
+
+              Decidim::Proposals::ProposalBuilder.copy(
+                original_proposal,
+                author: proposal_author,
+                action_user: current_user,
+                extra_attributes: {
+                  "component" => target_component
+                }.merge(proposal_answer_attributes(original_proposal))
+              )
+            end
+          end
+          ImportProposalsMailer.notify_success(current_user, origin_component, target_component, proposals.count).deliver_later
+        rescue ActiveRecord::RecordNotFound, NoMethodError
+          ImportProposalsMailer.notify_failure(current_user, origin_component, target_component).deliver_later
+        end
+
+        private
+
+        def proposals
+          proposals = Decidim::Proposals::Proposal.where(component: origin_component)
+
+          if @form["states"].include?("not_answered")
+            proposals.not_answered.or(proposals.where(id: proposals.only_status(@form["states"]).pluck(:id)))
+          else
+            proposals.only_status(@form["states"])
+          end
+        end
+
+        def origin_component
+          @origin_component ||= Decidim::Component.find(@form["origin_component_id"])
+        end
+
+        def target_component
+          @target_component ||= Decidim::Component.find(@form["current_component_id"])
+        end
+
+        def current_user
+          @current_user ||= Decidim::User.find(@form["current_user_id"])
+        end
+
+        def current_organization
+          @current_organization ||= Decidim::Organization.find(@form["current_organization_id"])
+        end
+
+        def proposal_already_copied?(original_proposal, target_component)
+          # Note: we are including also proposals from unpublished components
+          # because otherwise duplicates could be created until the component is
+          # published.
+          original_proposal.linked_resources(:proposals, "copied_from_component", component_published: false).any? do |proposal|
+            proposal.component == target_component
+          end
+        end
+
+        def proposal_author
+          @form["keep_authors"] ? nil : current_organization
+        end
+
+        def proposal_answer_attributes(original_proposal)
+          return {} unless @form["keep_answers"]
+
+          state = Decidim::Proposals::ProposalState.where(component: target_component, token: original_proposal.proposal_state&.token).first
+
+          {
+            answer: original_proposal.answer,
+            answered_at: original_proposal.answered_at,
+            proposal_state: state,
+            state_published_at: original_proposal.state_published_at
+          }
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/proposals/admin/import_proposals_mailer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ImportProposalsMailer < Decidim::ApplicationMailer
+        def notify_success(user, origin_component, target_component, count)
+          @organization = user.organization
+          @origin_component = origin_component
+          @target_component = target_component
+          @count = count
+
+          with_user(user) do
+            mail(to: user.email, subject: t(".subject"))
+          end
+        end
+
+        def notify_failure(user, origin_component, target_component)
+          @organization = user.organization
+          @origin_component = origin_component
+          @target_component = target_component
+
+          with_user(user) do
+            mail(to: user.email, subject: t(".subject"))
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/proposals/collaborative_draft.rb

@@ -46,9 +46,8 @@ module Decidim
         authored_by?(user)
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
+      def presenter
+        Decidim::Proposals::CollaborativeDraftPresenter.new(self)
       end
 
       # Public: Overrides the `reported_attributes` Reportable concern method.

data/app/models/decidim/proposals/proposal.rb

@@ -303,11 +303,6 @@ module Decidim
         state == "evaluating"
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
       # Returns the presenter for this author, to be used in the views.
       # Required by ResourceRenderer.
       def presenter

data/app/models/decidim/proposals/proposal_vote.rb

@@ -31,6 +31,7 @@ module Decidim
 
       def update_proposal_votes_count
         proposal.update_votes_count
+        proposal.touch # rubocop:disable Rails/SkipsModelValidations
       end
 
       # Private: check if the proposal and the author have the same organization