decidim-proposals 0.22.0 → 0.23.0

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

@@ -4,8 +4,15 @@ module Decidim
   module Proposals
     module Admin
       # A form object to be used when admin users want to create a proposal.
-      class ProposalForm < Admin::ProposalBaseForm
-        validates :title, length: { in: 15..150 }
+      class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
+        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
+
+        validates :title, :body, translatable_presence: true
+
+        validate :notify_missing_attachment_if_errored
       end
     end
   end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -4,6 +4,8 @@ module Decidim
   module Proposals
     # A form object to be used when public users want to create a proposal.
     class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
+      include Decidim::TranslatableAttributes
+
       mimic :proposal
 
       attribute :address, String
@@ -14,14 +16,16 @@ module Decidim
       attribute :has_address, Boolean
       attribute :attachment, AttachmentForm
       attribute :suggested_hashtags, Array[String]
+      attribute :photos, Array[String]
+      attribute :add_photos, Array
+      attribute :documents, Array[String]
+      attribute :add_documents, Array
 
-      validates :address, geocoding: true, if: ->(form) { Decidim.geocoder.present? && form.has_address? }
+      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
       validates :address, presence: true, if: ->(form) { form.has_address? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
-
-      validate :scope_belongs_to_participatory_space_scope
-
+      validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
       validate :notify_missing_attachment_if_errored
 
       delegate :categories, to: :current_component
@@ -29,7 +33,8 @@ module Decidim
       def map_model(model)
         super
 
-        @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+        body = translated_attribute(model.body)
+        @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
 
         # The scope attribute is with different key (decidim_scope_id), so it
         # has to be manually mapped.
@@ -43,11 +48,11 @@ module Decidim
         @category ||= categories.find_by(id: category_id)
       end
 
-      # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+      # Finds the Scope from the given scope_id, uses participatory space scope if missing.
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @scope_id ? current_participatory_space.scopes.find_by(id: @scope_id) : current_participatory_space.scope
+        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
       end
 
       # Scope identifier
@@ -57,8 +62,16 @@ module Decidim
         @scope_id || scope&.id
       end
 
+      def geocoding_enabled?
+        Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
+      end
+
       def has_address?
-        current_component.settings.geocoding_enabled? && has_address
+        geocoding_enabled? && has_address
+      end
+
+      def geocoded?
+        latitude.present? && longitude.present?
       end
 
       def extra_hashtags
@@ -84,10 +97,6 @@ module Decidim
 
       private
 
-      def scope_belongs_to_participatory_space_scope
-        errors.add(:scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
-      end
-
       # This method will add an error to the `attachment` field only if there's
       # any error in any other field. This is needed because when the form has
       # an error, the attachment is lost, so we need a way to inform the user of

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

@@ -7,6 +7,8 @@ module Decidim
       # in order to use them in select forms for Proposals.
       #
       module ProposalsHelper
+        include Decidim::Admin::ResourceScopeHelper
+
         # Public: A formatted collection of Meetings to be used
         # in forms.
         def meetings_as_authors_selected

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

@@ -139,18 +139,10 @@ module Decidim
         render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button.html", locals: { proposal: model, from_proposals_list: from_proposals_list }
       end
 
-      def endorsers_for(proposal)
-        proposal.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
-      end
-
       def form_has_address?
         @form.address.present? || @form.has_address
       end
 
-      def authors_for(collaborative_draft)
-        collaborative_draft.identities.map { |identity| present(identity) }
-      end
-
       def show_voting_rules?
         return false unless votes_enabled?
 
@@ -178,6 +170,19 @@ module Decidim
         base += [["voted", t(".voted")]] if current_settings.votes_enabled?
         base
       end
+
+      def filter_origin_values
+        origin_values = []
+        origin_values << TreePoint.new("official", t("decidim.proposals.application_helper.filter_origin_values.official")) if component_settings.official_proposals_enabled
+        origin_values << TreePoint.new("citizens", t("decidim.proposals.application_helper.filter_origin_values.citizens"))
+        origin_values << TreePoint.new("user_group", t("decidim.proposals.application_helper.filter_origin_values.user_groups")) if current_organization.user_groups_enabled?
+        origin_values << TreePoint.new("meeting", t("decidim.proposals.application_helper.filter_origin_values.meetings"))
+
+        TreeNode.new(
+          TreePoint.new("", t("decidim.proposals.application_helper.filter_origin_values.all")),
+          origin_values
+        )
+      end
     end
   end
 end

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

@@ -44,7 +44,7 @@ module Decidim
           [
             Decidim::CheckBoxesTreeHelper::TreePoint.new("accepted", t("decidim.proposals.application_helper.filter_state_values.accepted")),
             Decidim::CheckBoxesTreeHelper::TreePoint.new("evaluating", t("decidim.proposals.application_helper.filter_state_values.evaluating")),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("not_answered", t("decidim.proposals.application_helper.filter_state_values.not_answered")),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("state_not_published", t("decidim.proposals.application_helper.filter_state_values.not_answered")),
             Decidim::CheckBoxesTreeHelper::TreePoint.new("rejected", t("decidim.proposals.application_helper.filter_state_values.rejected"))
           ]
         )

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

@@ -6,7 +6,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::Coauthorable
       include Decidim::HasComponent
-      include Decidim::ScopableComponent
+      include Decidim::ScopableResource
       include Decidim::HasReference
       include Decidim::HasCategory
       include Decidim::Reportable
@@ -28,7 +28,7 @@ module Decidim
                class_name: "Decidim::User",
                foreign_key: :decidim_user_id
 
-      geocoded_by :address, http_headers: ->(collaborative_draft) { { "Referer" => collaborative_draft.component.organization.host } }
+      geocoded_by :address
 
       scope :open, -> { where(state: "open") }
       scope :withdrawn, -> { where(state: "withdrawn") }

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

@@ -8,6 +8,9 @@ module Decidim
       include Decidim::HasComponent
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::Coauthorable
       include Decidim::HasComponent
-      include Decidim::ScopableComponent
+      include Decidim::ScopableResource
       include Decidim::HasReference
       include Decidim::HasCategory
       include Decidim::Reportable
@@ -19,13 +19,16 @@ module Decidim
       include Decidim::Loggable
       include Decidim::Fingerprintable
       include Decidim::DataPortability
-      include Decidim::Hashtaggable
       include Decidim::Proposals::ParticipatoryTextSection
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
       include Decidim::Randomable
       include Decidim::Endorsable
       include Decidim::Proposals::Valuatable
+      include Decidim::TranslatableResource
+      include Decidim::TranslatableAttributes
+
+      translatable_fields :title, :body
 
       POSSIBLE_STATES = %w(not_answered evaluating accepted rejected withdrawn).freeze
 
@@ -49,7 +52,7 @@ module Decidim
 
       validates :title, :body, presence: true
 
-      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.component.organization.host } }
+      geocoded_by :address
 
       scope :answered, -> { where.not(answered_at: nil) }
       scope :not_answered, -> { where(answered_at: nil) }
@@ -66,27 +69,6 @@ module Decidim
       scope :drafts, -> { where(published_at: nil) }
       scope :except_drafts, -> { where.not(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
-      scope :official_origin, lambda {
-        where.not(coauthorships_count: 0)
-             .joins(:coauthorships)
-             .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-      }
-      scope :citizens_origin, lambda {
-        where.not(coauthorships_count: 0)
-             .joins(:coauthorships)
-             .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-      }
-      scope :user_group_origin, lambda {
-        where.not(coauthorships_count: 0)
-             .joins(:coauthorships)
-             .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-             .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
-      }
-      scope :meeting_origin, lambda {
-        where.not(coauthorships_count: 0)
-             .joins(:coauthorships)
-             .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
-      }
       scope :sort_by_valuation_assignments_count_asc, lambda {
         order(sort_by_valuation_assignments_count_nulls_last_query + "ASC NULLS FIRST")
       }
@@ -107,8 +89,8 @@ module Decidim
       searchable_fields({
                           scope_id: :decidim_scope_id,
                           participatory_space: { component: :participatory_space },
-                          D: :search_body,
-                          A: :search_title,
+                          D: :body,
+                          A: :title,
                           datetime: :published_at
                         },
                         index_on_create: ->(proposal) { proposal.official? },
@@ -146,7 +128,7 @@ module Decidim
 
         endorsements_participants_ids = Decidim::Endorsement.where(resource: proposals)
                                                             .where(decidim_author_type: "Decidim::UserBaseEntity")
-                                                            .map(&:decidim_author_id).flatten.compact.uniq
+                                                            .pluck(:decidim_author_id).to_a.compact.uniq
 
         (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids).flatten.compact.uniq
       end
@@ -300,19 +282,6 @@ module Decidim
         published_at.nil?
       end
 
-      # method for sort_link by number of comments
-      ransacker :commentable_comments_count do
-        query = <<-SQL
-        (SELECT COUNT(decidim_comments_comments.id)
-         FROM decidim_comments_comments
-         WHERE decidim_comments_comments.decidim_commentable_id = decidim_proposals_proposals.id
-         AND decidim_comments_comments.decidim_commentable_type = 'Decidim::Proposals::Proposal'
-         GROUP BY decidim_comments_comments.decidim_commentable_id
-         )
-        SQL
-        Arel.sql(query)
-      end
-
       # Defines the base query so that ransack can actually sort by this value
       def self.sort_by_valuation_assignments_count_nulls_last_query
         <<-SQL
@@ -359,6 +328,10 @@ module Decidim
         Arel.sql("CASE WHEN state = 'withdrawn' THEN 'withdrawn' WHEN state_published_at IS NULL THEN NULL ELSE state END")
       end
 
+      ransacker :title do
+        Arel.sql(%{("decidim_proposals_proposals"."title")::text})
+      end
+
       ransacker :id_string do
         Arel.sql(%{cast("decidim_proposals_proposals"."id" as text)})
       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/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

@@ -9,6 +9,7 @@ module Decidim
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
       include Decidim::SanitizeHelper
+      include Decidim::TranslatableAttributes
 
       def author
         @author ||= if official?
@@ -38,7 +39,7 @@ 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)
@@ -50,12 +51,9 @@ module Decidim
       end
 
       def body(links: false, extras: true, strip_tags: false)
-        text = proposal.body
+        text = translated_attribute(proposal.body)
 
-        if strip_tags
-          text = text.gsub(%r{<\/p>}, "\n\n")
-          text = strip_tags(text)
-        end
+        text = strip_tags(sanitize_text(text)) if strip_tags
 
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         text = renderer.render(links: links, extras: extras).html_safe
@@ -93,6 +91,45 @@ module Decidim
       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/similar_proposals.rb

@@ -30,8 +30,8 @@ module Decidim
           .published
           .where(
             "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
-            @proposal.title,
-            @proposal.body,
+            translated_attribute(@proposal.title),
+            translated_attribute(@proposal.body),
             Decidim::Proposals.similarity_threshold
           )
           .limit(Decidim::Proposals.similarity_limit)
@@ -40,11 +40,11 @@ module Decidim
       private
 
       def title_similarity
-        "similarity(title, ?)"
+        "similarity(title::text, ?)"
       end
 
       def body_similarity
-        "similarity(body, ?)"
+        "similarity(body::text, ?)"
       end
     end
   end