decidim-proposals 0.20.1 → 0.23.1

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

@@ -31,10 +31,6 @@ module Decidim
           can_edit_proposal?
         when :withdraw
           can_withdraw_proposal?
-        when :endorse
-          can_endorse_proposal?
-        when :unendorse
-          can_unendorse_proposal?
         when :amend
           can_create_amendment?
         when :vote
@@ -47,7 +43,7 @@ module Decidim
       end
 
       def proposal
-        @proposal ||= context.fetch(:proposal, nil)
+        @proposal ||= context.fetch(:proposal, nil) || context.fetch(:resource, nil)
       end
 
       def voting_enabled?
@@ -82,23 +78,6 @@ module Decidim
         toggle_allow(proposal && proposal.authored_by?(user))
       end
 
-      def can_endorse_proposal?
-        is_allowed = proposal &&
-                     authorized?(:endorse, resource: proposal) &&
-                     current_settings&.endorsements_enabled? &&
-                     !current_settings&.endorsements_blocked?
-
-        toggle_allow(is_allowed)
-      end
-
-      def can_unendorse_proposal?
-        is_allowed = proposal &&
-                     authorized?(:endorse, resource: proposal) &&
-                     current_settings&.endorsements_enabled?
-
-        toggle_allow(is_allowed)
-      end
-
       def can_create_amendment?
         is_allowed = proposal &&
                      authorized?(:amend, resource: proposal) &&

data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb

@@ -31,7 +31,7 @@ module Decidim
 
         def action_string
           case action
-          when "answer", "create", "update"
+          when "answer", "create", "update", "publish_answer"
             "decidim.proposals.admin_log.proposal.#{action}"
           else
             super

data/app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Proposals::ValuationAssignment`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    ValuationAssignmentPresenter.new(action_log, view_helpers).present
+      class ValuationAssignmentPresenter < Decidim::Log::BasePresenter
+        private
+
+        def resource_presenter
+          @resource_presenter ||= Decidim::Proposals::Log::ValuationAssignmentPresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
+        def diff_fields_mapping
+          {
+            valuator_role_id: "Decidim::Proposals::AdminLog::ValueTypes::ValuatorRoleUserPresenter"
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "delete"
+            "decidim.proposals.admin_log.valuation_assignment.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.valuation_assignment.admin_log"
+        end
+
+        def has_diff?
+          %w(create delete).include?(action) || super
+        end
+
+        def i18n_params
+          super.merge(proposal_title: h.translated_attribute(action_log.extra["proposal_title"]))
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb

@@ -5,10 +5,15 @@ module Decidim
     module AdminLog
       module ValueTypes
         class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          include Decidim::TranslatableAttributes
+
           def present
             return unless value
 
-            renderer = Decidim::ContentRenderers::HashtagRenderer.new(value)
+            translated_value = translated_attribute(value)
+            return if translated_value.blank?
+
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_value)
             renderer.render(links: false).html_safe
           end
         end

data/app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module AdminLog
+      module ValueTypes
+        class ValuatorRoleUserPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          def present
+            return unless value
+
+            role = Decidim::Proposals::ValuationAssignment.find_by(valuator_role_id: value).valuator_role
+            user = role.user
+            user.try(:name)
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/collaborative_draft_presenter.rb

@@ -5,12 +5,7 @@ module Decidim
     #
     # Decorator for collaborative drafts
     #
-    class CollaborativeDraftPresenter < SimpleDelegator
-      include Rails.application.routes.mounted_helpers
-      include ActionView::Helpers::UrlHelper
-      include ActionView::Helpers::SanitizeHelper
-      include Decidim::SanitizeHelper
-
+    class CollaborativeDraftPresenter < ProposalPresenter
       def author
         coauthorship = __getobj__.coauthorships.first
         @author ||= if coauthorship.user_group
@@ -20,32 +15,11 @@ module Decidim
                     end
       end
 
-      def collaborative_draft
-        __getobj__
-      end
+      alias collaborative_draft proposal
 
       def collaborative_draft_path
         Decidim::ResourceLocatorPresenter.new(collaborative_draft).path
       end
-
-      def title(links: false, extras: true, html_escape: false)
-        text = collaborative_draft.title
-        text = decidim_html_escape(text) if html_escape
-
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        renderer.render(links: links, extras: extras).html_safe
-      end
-
-      def body(links: false, extras: true, strip_tags: false)
-        text = collaborative_draft.body
-        text = strip_tags(text) if strip_tags
-
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        text = renderer.render(links: links, extras: extras).html_safe
-
-        text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
-        text
-      end
     end
   end
 end

data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Log
+      class ValuationAssignmentPresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          if resource.present?
+            Decidim::Proposals::ProposalPresenter.new(resource.proposal).title
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/official_author_presenter.rb

@@ -5,38 +5,10 @@ module Decidim
     #
     # A dummy presenter to abstract out the author of an official proposal.
     #
-    class OfficialAuthorPresenter
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
       def name
         I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
       end
-
-      def nickname
-        ""
-      end
-
-      def badge
-        ""
-      end
-
-      def profile_path
-        ""
-      end
-
-      def avatar_url
-        ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
-      end
-
-      def deleted?
-        false
-      end
-
-      def can_be_contacted?
-        false
-      end
-
-      def has_tooltip?
-        false
-      end
     end
   end
 end

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -8,14 +8,14 @@ module Decidim
     class ProposalPresenter < SimpleDelegator
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
-      include ActionView::Helpers::SanitizeHelper
       include Decidim::SanitizeHelper
+      include Decidim::TranslatableAttributes
 
       def author
         @author ||= if official?
                       Decidim::Proposals::OfficialAuthorPresenter.new
                     else
-                      coauthorship = coauthorships.first
+                      coauthorship = coauthorships.includes(:author, :user_group).first
                       coauthorship.user_group&.presenter || coauthorship.author.presenter
                     end
       end
@@ -39,16 +39,21 @@ module Decidim
       #
       # Returns a String.
       def title(links: false, extras: true, html_escape: false)
-        text = proposal.title
+        text = translated_attribute(proposal.title)
         text = decidim_html_escape(text) if html_escape
 
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         renderer.render(links: links, extras: extras).html_safe
       end
 
+      def id_and_title(links: false, extras: true, html_escape: false)
+        "##{proposal.id} - #{title(links: links, extras: extras, html_escape: html_escape)}"
+      end
+
       def body(links: false, extras: true, strip_tags: false)
-        text = proposal.body
-        text = strip_tags(text) if strip_tags
+        text = translated_attribute(proposal.body)
+
+        text = strip_tags(sanitize_text(text)) if strip_tags
 
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         text = renderer.render(links: links, extras: extras).html_safe
@@ -56,6 +61,75 @@ module Decidim
         text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
         text
       end
+
+      # Returns the proposal versions, hiding not published answers
+      #
+      # Returns an Array.
+      def versions
+        version_state_published = false
+        pending_state_change = nil
+
+        proposal.versions.map do |version|
+          state_published_change = version.changeset["state_published_at"]
+          version_state_published = state_published_change.last.present? if state_published_change
+
+          if version_state_published
+            version.changeset["state"] = pending_state_change if pending_state_change
+            pending_state_change = nil
+          elsif version.changeset["state"]
+            pending_state_change = version.changeset.delete("state")
+          end
+
+          next if version.event == "update" && Decidim::Proposals::DiffRenderer.new(version).diff.empty?
+
+          version
+        end.compact
+      end
+
+      delegate :count, to: :versions, prefix: true
+
+      def resource_manifest
+        proposal.class.resource_manifest
+      end
+
+      private
+
+      def sanitize_unordered_lists(text)
+        text.gsub(%r{(?=.*<\/ul>)(?!.*?<li>.*?<\/ol>.*?<\/ul>)<li>}) { |li| li + "• " }
+      end
+
+      def sanitize_ordered_lists(text)
+        i = 0
+
+        text.gsub(%r{(?=.*<\/ol>)(?!.*?<li>.*?<\/ul>.*?<\/ol>)<li>}) do |li|
+          i += 1
+
+          li + "#{i}. "
+        end
+      end
+
+      def add_line_feeds_to_paragraphs(text)
+        text.gsub("</p>") { |p| p + "\n\n" }
+      end
+
+      def add_line_feeds_to_list_items(text)
+        text.gsub("</li>") { |li| li + "\n" }
+      end
+
+      # Adds line feeds after the paragraph and list item closing tags.
+      #
+      # Returns a String.
+      def add_line_feeds(text)
+        add_line_feeds_to_paragraphs(add_line_feeds_to_list_items(text))
+      end
+
+      # Maintains the paragraphs and lists separations with their bullet points and
+      # list numberings where appropriate.
+      #
+      # Returns a String.
+      def sanitize_text(text)
+        add_line_feeds(sanitize_ordered_lists(sanitize_unordered_lists(text)))
+      end
     end
   end
 end

data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb

@@ -16,8 +16,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.created_at <= ?", end_time).accepted
           @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)

data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -22,10 +19,8 @@ module Decidim
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,19 +30,27 @@ module Decidim
 
           components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
           proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn
-          @query = Decidim::Proposals::ProposalEndorsement.joins(proposal: :component)
-                                                          .left_outer_joins(proposal: :category)
-                                                          .where(proposal: proposals)
-          @query = @query.where("decidim_proposals_proposal_endorsements.created_at <= ?", end_time)
+          join_components = "INNER JOIN decidim_components ON decidim_components.manifest_name = 'proposals' AND proposals.decidim_component_id = decidim_components.id"
+          join_categories = <<~EOJOINCATS
+            LEFT OUTER JOIN decidim_categorizations
+            ON (proposals.id = decidim_categorizations.categorizable_id
+            AND decidim_categorizations.categorizable_type = 'Decidim::Proposals::Proposal')
+          EOJOINCATS
+          @query = Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
+                                       .joins(join_components)
+                                       .joins(join_categories)
+                                       .where(resource_id: proposals.pluck(:id))
+                                       .where(resource_type: Decidim::Proposals::Proposal.name)
+          @query = @query.where("decidim_endorsements.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.id",
                                 :participatory_space_type,
                                 :participatory_space_id,
-                                :decidim_proposal_id)
+                                :resource_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time).count
+          @quantity ||= query.where("decidim_endorsements.created_at >= ?", start_time).count
         end
       end
     end

data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb

@@ -59,11 +59,12 @@ module Decidim
         end
 
         def retrieve_endorsements(from_start = false)
-          @endorsements ||= Decidim::Proposals::ProposalEndorsement.joins(:proposal).where(proposal: retrieve_proposals)
-                                                                   .where("decidim_proposals_proposal_endorsements.created_at <= ?", end_time)
-                                                                   .where(decidim_author_type: "Decidim::UserBaseEntity")
+          @endorsements ||= Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
+                                                .where(resource: retrieve_proposals)
+                                                .where("decidim_endorsements.created_at <= ?", end_time)
+                                                .where(decidim_author_type: "Decidim::UserBaseEntity")
 
-          return @endorsements.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time) if from_start
+          return @endorsements.where("decidim_endorsements.created_at >= ?", start_time) if from_start
 
           @endorsements
         end