decidim-proposals 0.23.0 → 0.24.0.rc1

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

@@ -5,6 +5,7 @@ module Decidim
     # A form object to be used when public users want to create a proposal.
     class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
       include Decidim::TranslatableAttributes
+      include Decidim::AttachmentAttributes
 
       mimic :proposal
 
@@ -16,10 +17,9 @@ 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
+
+      attachments_attribute :photos
+      attachments_attribute :documents
 
       validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
       validates :address, presence: true, if: ->(form) { form.has_address? }
@@ -39,6 +39,8 @@ module Decidim
         # The scope attribute is with different key (decidim_scope_id), so it
         # has to be manually mapped.
         self.scope_id = model.scope.id if model.scope
+
+        self.has_address = true if model.address.present?
       end
 
       # Finds the Category from the category_id.
@@ -66,8 +68,16 @@ module Decidim
         Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
       end
 
+      def address
+        return unless has_address
+
+        super
+      end
+
       def has_address?
-        geocoding_enabled? && has_address
+        return unless has_address
+
+        geocoding_enabled? && address.present?
       end
 
       def geocoded?

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

@@ -7,7 +7,7 @@ module Decidim
       mimic :proposal
 
       attribute :title, String
-      attribute :body, String
+      attribute :body, Decidim::Attributes::CleanString
       attribute :body_template, String
       attribute :user_group_id, Integer
 
@@ -18,7 +18,6 @@ module Decidim
         maximum: ->(record) { record.component.settings.proposal_length }
       }
 
-      validate :proposal_length
       validate :body_is_not_bare_template
 
       alias component current_component
@@ -32,13 +31,6 @@ module Decidim
 
       private
 
-      def proposal_length
-        return unless body.presence
-
-        length = current_component.settings.proposal_length
-        errors.add(:body, :too_long, count: length) if body.length > length
-      end
-
       def body_is_not_bare_template
         return if body_template.blank?
 

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

@@ -7,7 +7,7 @@ module Decidim
         def extra_dropdown_submenu_options_items(filter, i18n_scope)
           options = case filter
                     when :state_eq
-                      content_tag(:li, filter_link_value(:state_null, true, i18n_scope))
+                      tag.li(filter_link_value(:state_null, true, i18n_scope))
                     end
           [options].compact
         end

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

@@ -20,7 +20,7 @@ module Decidim
         #   ranking_for(proposal, endorsements_count: :desc)
         def ranking_for(proposal, order = {})
           siblings = Decidim::Proposals::Proposal.where(component: proposal.component)
-          ranked = siblings.order([order, id: :asc])
+          ranked = siblings.order([order, { id: :asc }])
           ranked_ids = ranked.pluck(:id)
 
           { ranking: ranked_ids.index(proposal.id) + 1, total: ranked_ids.count }

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

@@ -32,9 +32,9 @@ module Decidim
         end
 
         def proposal_complete_state(proposal)
-          state = humanize_proposal_state(proposal.state)
-          state += " (#{humanize_proposal_state(proposal.internal_state)})" if proposal.answered? && !proposal.published_state?
-          state.html_safe
+          return humanize_proposal_state(proposal.internal_state).html_safe if proposal.answered? && !proposal.published_state?
+
+          humanize_proposal_state(proposal.state).html_safe
         end
 
         def proposals_admin_filter_tree
@@ -73,7 +73,7 @@ module Decidim
         def proposals_admin_filter_applied_filters
           html = []
           if params[:q][:is_emendation_true].present?
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("filters.type", scope: "decidim.proposals.proposals")}: "
               tag += if params[:q][:is_emendation_true].to_s == "1"
                        t("amendments", scope: "decidim.proposals.application_helper.filter_type_values")
@@ -86,7 +86,7 @@ module Decidim
             end
           end
           if params[:q][:state_null]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state "not_answered"
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_null), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -95,7 +95,7 @@ module Decidim
             end
           end
           if params[:q][:state_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state params[:q][:state_eq]
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -104,7 +104,7 @@ module Decidim
             end
           end
           if params[:q][:category_id_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.category", scope: "decidim.proposals")}: "
               tag += translated_attribute categories.find(params[:q][:category_id_eq]).name
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:category_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -113,7 +113,7 @@ module Decidim
             end
           end
           if params[:q][:scope_id_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.scope", scope: "decidim.proposals")}: "
               tag += translated_attribute Decidim::Scope.where(decidim_organization_id: current_component.organization.id).find(params[:q][:scope_id_eq]).name
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:scope_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),

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

@@ -30,10 +30,13 @@ module Decidim
 
       # Public: The css class applied based on the proposal state.
       #
-      # state - The String state of the proposal.
+      # proposal - The proposal to evaluate.
       #
       # Returns a String.
-      def proposal_state_css_class(state)
+      def proposal_state_css_class(proposal)
+        state = proposal.state
+        state = proposal.internal_state if proposal.answered? && !proposal.published_state?
+
         case state
         when "accepted"
           "text-success"

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

@@ -10,12 +10,33 @@ module Decidim
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
         geocoded_proposals.map do |proposal|
-          proposal.slice(:latitude, :longitude, :address).merge(title: present(proposal).title,
-                                                                body: truncate(present(proposal).body, length: 100),
-                                                                icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
-                                                                link: proposal_path(proposal))
+          proposal_data_for_map(proposal)
         end
       end
+
+      def proposal_data_for_map(proposal)
+        proposal.slice(:latitude, :longitude, :address).merge(title: proposal.title,
+                                                              body: truncate(translated_attribute(proposal.body), length: 100),
+                                                              icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+                                                              link: proposal_path(proposal))
+      end
+
+      def proposal_preview_data_for_map(proposal)
+        [
+          proposal.slice(
+            :latitude,
+            :longitude,
+            :address
+          ).merge(
+            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+            draggable: true
+          )
+        ]
+      end
+
+      def has_position?(proposal)
+        proposal.latitude.present? && proposal.longitude.present?
+      end
     end
   end
 end

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

@@ -32,7 +32,7 @@ module Decidim
       #
       # step - A symbol of the target step
       def proposal_wizard_step_name(step)
-        t("decidim.proposals.#{type_of}.wizard_steps.#{step}")
+        t("decidim.proposals.proposals.wizard_steps.#{step}")
       end
 
       # Returns the page title of the given step, translated
@@ -48,7 +48,7 @@ module Decidim
                        action_name
                      end
 
-        t("decidim.proposals.#{type_of}.#{step_title}.title")
+        t("decidim.proposals.proposals.#{step_title}.title")
       end
 
       # Returns the list item of the given step, in html
@@ -56,8 +56,6 @@ module Decidim
       # step - A symbol of the target step
       # current_step - A symbol of the current step
       def proposal_wizard_stepper_step(step, current_step)
-        return if step == :step_4 && type_of == :collaborative_drafts
-
         attributes = { class: proposal_wizard_step_classes(step, current_step).to_s }
         step_title = proposal_wizard_step_name(step)
         if step.to_s.split("_").last.to_i == proposal_wizard_step_number(current_step)
@@ -99,7 +97,7 @@ module Decidim
       end
 
       def proposal_wizard_steps_title
-        t("title", scope: "decidim.proposals.#{type_of}.wizard_steps")
+        t("title", scope: "decidim.proposals.proposals.wizard_steps")
       end
 
       # Returns a boolean if the step has a help text defined
@@ -128,58 +126,30 @@ module Decidim
       private
 
       def total_steps
-        case type_of
-        when :collaborative_drafts
-          3
-        when :proposals
-          4
-        else
-          4
-        end
+        4
       end
 
       def wizard_aside_info_text
-        case type_of
-        when :collaborative_drafts
-          t("info", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
-        else
-          t("info", scope: "decidim.proposals.proposals.wizard_aside").html_safe
-        end
+        t("info", scope: "decidim.proposals.proposals.wizard_aside").html_safe
       end
 
       # Renders the back link except for step_2: compare
       def proposal_wizard_aside_link_to_back(step)
-        url = case step
-              when :step_1
-                proposals_path
-              when :step_3
-                compare_proposal_path
-              when :step_4
-                edit_draft_proposal_path
-              end
-        url
+        case step
+        when :step_1
+          proposals_path
+        when :step_3
+          compare_proposal_path
+        when :step_4
+          edit_draft_proposal_path
+        end
       end
 
       def wizard_aside_back_text(from = nil)
         key = "back"
         key = "back_from_#{from}" if from
 
-        case type_of
-        when :collaborative_drafts
-          t(key, scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
-        else
-          t(key, scope: "decidim.proposals.proposals.wizard_aside").html_safe
-        end
-      end
-
-      def type_of
-        if ["Decidim::Proposals::CollaborativeDraftForm"].include? @form.class.name
-          :collaborative_drafts
-        elsif @collaborative_draft.present?
-          :collaborative_drafts
-        else
-          :proposals
-        end
+        t(key, scope: "decidim.proposals.proposals.wizard_aside").html_safe
       end
     end
   end

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

@@ -4,13 +4,10 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposals
     module ProposalsHelper
-      def proposal_reason_callout_args
+      def proposal_reason_callout_announcement
         {
-          announcement: {
-            title: proposal_reason_callout_title,
-            body: decidim_sanitize(translated_attribute(@proposal.answer))
-          },
-          callout_class: proposal_reason_callout_class
+          title: proposal_reason_callout_title,
+          body: decidim_sanitize(translated_attribute(@proposal.answer))
         }
       end
 

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

@@ -58,6 +58,16 @@ module Decidim
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
       end
+
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:body]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [authors.map(&:name).join("\n")]
+      end
     end
   end
 end

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

@@ -69,12 +69,13 @@ module Decidim
       scope :drafts, -> { where(published_at: nil) }
       scope :except_drafts, -> { where.not(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
+      scope :order_by_most_recent, -> { order(created_at: :desc) }
       scope :sort_by_valuation_assignments_count_asc, lambda {
-        order(sort_by_valuation_assignments_count_nulls_last_query + "ASC NULLS FIRST")
+        order("#{sort_by_valuation_assignments_count_nulls_last_query}ASC NULLS FIRST")
       }
 
       scope :sort_by_valuation_assignments_count_desc, lambda {
-        order(sort_by_valuation_assignments_count_nulls_last_query + "DESC NULLS LAST")
+        order("#{sort_by_valuation_assignments_count_nulls_last_query}DESC NULLS LAST")
       }
 
       def self.with_valuation_assigned_to(user, space)
@@ -106,7 +107,7 @@ module Decidim
         return unless author.is_a?(Decidim::User)
 
         joins(:coauthorships)
-          .where("decidim_coauthorships.coauthorable_type = ?", name)
+          .where(decidim_coauthorships: { coauthorable_type: name })
           .where("decidim_coauthorships.decidim_author_id = ? AND decidim_coauthorships.decidim_author_type = ? ", author.id, author.class.base_class.name)
       end
 
@@ -130,7 +131,9 @@ module Decidim
                                                             .where(decidim_author_type: "Decidim::UserBaseEntity")
                                                             .pluck(:decidim_author_id).to_a.compact.uniq
 
-        (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids).flatten.compact.uniq
+        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(proposals)
+
+        (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids + commentators_ids).flatten.compact.uniq
       end
 
       # Public: Updates the vote count of this proposal.
@@ -225,6 +228,16 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:title, :body]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [authors.map(&:name).join("\n")]
+      end
+
       # Public: Whether the proposal is official or not.
       def official?
         authors.first.is_a?(Decidim::Organization)
@@ -284,7 +297,7 @@ module Decidim
 
       # Defines the base query so that ransack can actually sort by this value
       def self.sort_by_valuation_assignments_count_nulls_last_query
-        <<-SQL
+        <<-SQL.squish
         (
           SELECT COUNT(decidim_proposals_valuation_assignments.id)
           FROM decidim_proposals_valuation_assignments
@@ -296,7 +309,7 @@ module Decidim
 
       # method to filter by assigned valuator role ID
       def self.valuator_role_ids_has(value)
-        query = <<-SQL
+        query = <<-SQL.squish
         :value = any(
           (SELECT decidim_proposals_valuation_assignments.valuator_role_id
           FROM decidim_proposals_valuation_assignments
@@ -324,10 +337,6 @@ module Decidim
         ")
       end
 
-      ransacker :state do
-        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
@@ -337,7 +346,7 @@ module Decidim
       end
 
       ransacker :is_emendation do |_parent|
-        query = <<-SQL
+        query = <<-SQL.squish
         (
           SELECT EXISTS (
             SELECT 1 FROM decidim_amendments
@@ -365,6 +374,7 @@ module Decidim
       # Checks whether the proposal is inside the time window to be editable or not once published.
       def within_edit_time_limit?
         return true if draft?
+        return true if component.settings.proposal_edit_time == "infinite"
 
         limit = updated_at + component.settings.proposal_edit_before_minutes.minutes
         Time.current < limit