decidim-proposals 0.29.1 → 0.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2109029e1165afe1fe039f4f5e1d2f0b8af26d8e80bb2e0db0c11053da033e61
-  data.tar.gz: 9e72ff8d19ba6f4442eed68fa4c5625e2d22367b3c00a8faf2b36fa58c888dbe
+  metadata.gz: f68f4460c5148fc90b2ff8d92c25b7c1c5afae4347c4ce8bdcdfe2eec7e533cb
+  data.tar.gz: 06c7f3d44d8534c22b816d9ba8e216d1fa854337ada6158056a06bcb70a46598
 SHA512:
-  metadata.gz: 3d2b4e79ae0fb506248ca119acca6ce128649457f53b6047a9def36168110a63a36bccb6abde7fd8300194cd8bf785546d9d21d066e4f628da6742c2601fb8d6
-  data.tar.gz: 3ad98b72afdc5b9b2601cffa7f5c872b5bf5202ed35f9bff830014af78d7b1de2c5aaae4b5ffc4e721f2d21594a8229bb96ef549f653a0caf36ae8f2a36b0cf9
+  metadata.gz: e10e7ef879ce34a18a5b9e101ca6fef2cc8d4c7434b6f0599fa1d5cf830e34e00fbd8fd9cb571b280e2c2113fc375f8233d6bfa4b32fea9c864958c0ab62c342
+  data.tar.gz: 5363d5e2789296bb4f969919776c406a2ede64f6e1651a27c56c9fab3b55c82e35f00b60c4a8c564f5192ce7b4d03a581f557b217c2185810c37f237e961d740

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

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

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

@@ -34,6 +34,27 @@ module Decidim
 
       private
 
+      def cache_hash
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << 0 # render space
+          hash << model.follows_count
+          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.join(Decidim.cache_key_separator)
+        end
+      end
+
       def classes
         super.merge(metadata: "card__list-metadata")
       end

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

@@ -20,25 +20,24 @@ module Decidim
       end
 
       def cache_hash
-        hash = []
-        hash << I18n.locale.to_s
-        hash << model.cache_key_with_version
-        hash << model.proposal_votes_count
-        hash << model.endorsements_count
-        hash << model.comments_count
-        hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-        hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
-        hash << render_space? ? 1 : 0
-        if current_user
-          hash << current_user.cache_key_with_version
-          hash << current_user.follows?(model) ? 1 : 0
-        end
-        hash << model.follows_count
-        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)
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << render_space? ? 1 : 0
+          hash << model.follows_count
+          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.join(Decidim.cache_key_separator)
+          hash.join(Decidim.cache_key_separator)
+        end
       end
     end
   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,70 +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 = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
-
-          @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 proposal_scopes
-          @form.scopes
-        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/concerns/decidim/proposals/admin/filterable.rb

@@ -47,7 +47,7 @@ module Decidim
           end
 
           def valuator_role_ids
-            current_participatory_space.user_roles(:valuator).pluck(:id)
+            current_participatory_space.user_roles(:valuator).order_by_name.pluck(:id)
           end
 
           def translated_valuator_role_ids_has(valuator_role_id)

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

@@ -5,6 +5,9 @@ module Decidim
     module Admin
       # This controller allows admins to answer proposals in a participatory process.
       class ProposalAnswersController < Admin::ApplicationController
+        include ActionView::Helpers::SanitizeHelper
+        include Decidim::Proposals::Admin::Filterable
+
         helper_method :proposal
 
         helper Proposals::ApplicationHelper
@@ -44,6 +47,10 @@ module Decidim
         def proposal
           @proposal ||= Proposal.where(component: current_component).find(params[:id])
         end
+
+        def collection
+          @collection ||= Proposal.where(component: current_component).not_hidden.published
+        end
       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

@@ -43,13 +43,11 @@ module Decidim
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
-          @base_query = search
-                        .result
-                        .published
-                        .not_hidden
+          @proposals = search.result
 
-          @proposals = @base_query.includes(:component, :coauthorships, :attachments)
-          @all_geocoded_proposals = @base_query.geocoded
+          @proposals = reorder(@proposals)
+          @proposals = paginate(@proposals)
+          @proposals = @proposals.includes(:component, :coauthorships, :attachments)
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -59,8 +57,6 @@ module Decidim
                              else
                                []
                              end
-          @proposals = reorder(@proposals)
-          @proposals = paginate(@proposals)
         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

@@ -8,27 +8,16 @@ module Decidim
         include TranslatableAttributes
         mimic :proposal_answer
 
-        translatable_attribute :answer, String
-        translatable_attribute :cost_report, String
-        translatable_attribute :execution_period, String
+        translatable_attribute :answer, Decidim::Attributes::RichText
+        translatable_attribute :cost_report, Decidim::Attributes::RichText
+        translatable_attribute :execution_period, Decidim::Attributes::RichText
         attribute :cost, Float
         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
@@ -38,10 +27,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/forms/decidim/proposals/admin/proposal_form.rb

@@ -10,7 +10,7 @@ module Decidim
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
-        translatable_attribute :body, String
+        translatable_attribute :body, Decidim::Attributes::RichText
 
         validates :title, :body, translatable_presence: true
 

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

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to import a collection of proposals
       # from another component.
       class ProposalsImportForm < Decidim::Form
+        include TranslatableAttributes
         mimic :proposals_import
 
         attribute :origin_component_id, Integer
@@ -19,15 +20,11 @@ module Decidim
         validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
-        VALID_STATES = %w(accepted not_answered evaluating rejected).freeze
-
         def states_collection
-          VALID_STATES.map do |state|
-            OpenStruct.new(
-              name: I18n.t(state, scope: "decidim.proposals.answers"),
-              value: state
-            )
-          end
+          @states_collection ||= ProposalState.where(component: current_component) + [ProposalState.new(token: "not_answered",
+                                                                                                        title: I18n.t(
+                                                                                                          :not_answered, scope: "decidim.proposals.answers"
+                                                                                                        ))]
         end
 
         def states
@@ -56,7 +53,7 @@ module Decidim
 
         def valid_states
           return if states.all? do |state|
-            VALID_STATES.include?(state)
+            states_collection.pluck(:token).include?(state)
           end
 
           errors.add(:states, :invalid)

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

@@ -16,7 +16,10 @@ module Decidim
         end
 
         def valuator_roles
-          @valuator_roles ||= current_component.participatory_space.user_roles(:valuator).where(id: valuator_role_ids)
+          @valuator_roles ||= current_component.participatory_space
+                                               .user_roles(:valuator)
+                                               .order_by_name
+                                               .where(id: valuator_role_ids)
         end
 
         def same_participatory_space

data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb

@@ -10,7 +10,7 @@ module Decidim
 
         # find the valuators for the current space.
         def find_valuators_for_select(participatory_space, current_user)
-          valuator_roles = participatory_space.user_roles(:valuator)
+          valuator_roles = participatory_space.user_roles(:valuator).order_by_name
           valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
 
           filtered_valuator_roles = valuator_roles.filter do |role|

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

@@ -30,6 +30,7 @@ module Decidim
 
       def proposal_state_css_style(proposal)
         return "" if proposal.emendation?
+        return "" if proposal.withdrawn?
 
         proposal.proposal_state&.css_style
       end

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

@@ -9,7 +9,7 @@ module Decidim
       #
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
-        geocoded_proposals.map do |proposal|
+        geocoded_proposals.select(&:geocoded_and_valid?).map do |proposal|
           proposal_data_for_map(proposal)
         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,91 @@
+# 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)
+          proposals = proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
+
+          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_scopes
+          @form["scopes"] || []
+        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

@@ -45,9 +45,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

@@ -301,11 +301,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
@@ -402,12 +397,8 @@ module Decidim
         where(query, value:)
       end
 
-      def self.ransackable_scopes(auth_object = nil)
-        base = [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_scope, :with_any_category]
-        return base unless auth_object&.admin?
-
-        # Add extra scopes for admins for the admin panel searches
-        base + [:valuator_role_ids_has]
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_scope, :with_any_category, :valuator_role_ids_has]
       end
 
       # Create i18n ransackers for :title and :body.

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -103,11 +103,7 @@
   }
 
   &__grid-text-title {
-    @apply flex justify-between flex-row md:flex-col md:items-start lg:flex-row lg:items-center;
-
-    .label {
-      @apply md:mt-2;
-    }
+    @apply flex justify-between flex-row md:flex-col items-start lg:flex-row;
   }
 
   &__list-metadata {

data/app/permissions/decidim/proposals/permissions.rb

@@ -4,15 +4,16 @@ module Decidim
   module Proposals
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless user
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
+        toggle_allow(!proposal.hidden?) if permission_action.subject == :proposal && permission_action.action == :read
+        return permission_action unless user
+
         case permission_action.subject
         when :proposal
-          apply_proposal_permissions(permission_action)
+          apply_proposal_permissions(permission_action) unless permission_action.action == :read
         when :collaborative_draft
           apply_collaborative_draft_permissions(permission_action)
         else

data/app/services/decidim/proposals/collaborative_draft_diff_renderer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CollaborativeDraftDiffRenderer < DiffRenderer
+      private
+
+      def attribute_types
+        {
+          title: :string,
+          body: :string,
+          decidim_category_id: :category,
+          decidim_scope_id: :scope,
+          address: :string,
+          latitude: :string,
+          longitude: :string,
+          decidim_proposals_proposal_state_id: :string
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/diff_renderer.rb

@@ -21,8 +21,10 @@ module Decidim
 
       # Parses the values before parsing the changeset.
       def parse_changeset(attribute, values, type, diff)
+        return parse_i18n_changeset(attribute, values, type, diff) if [:i18n, :i18n_html].include?(type)
         return parse_scope_changeset(attribute, values, type, diff) if type == :scope
         return parse_state_changeset(attribute, values, type, diff) if type == :state
+        return parse_user_group_changeset(attribute, values, type, diff) if type == :user_group
 
         values = parse_values(attribute, values)
         old_value = values[0]