decidim-proposals 0.26.0 → 0.27.0.rc1

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

@@ -25,7 +25,7 @@ module Decidim
 
       def index
         @collaborative_drafts = search
-                                .results
+                                .result
                                 .not_hidden
                                 .includes(:category)
                                 .includes(:scope)
@@ -134,19 +134,19 @@ module Decidim
       end
 
       def geocoded_collaborative_draft
-        @geocoded_collaborative_draft ||= search.results.not_hidden.select(&:geocoded_and_valid?)
+        @geocoded_collaborative_draft ||= search.result.not_hidden.select(&:geocoded_and_valid?)
       end
 
-      def search_klass
-        CollaborativeDraftSearch
+      def search_collection
+        CollaborativeDraft.where(component: current_component).not_hidden
       end
 
       def default_filter_params
         {
-          search_text: "",
-          category_id: default_filter_category_params,
-          state: %w(open),
-          scope_id: default_filter_scope_params,
+          search_text_cont: "",
+          with_any_category: default_filter_category_params,
+          with_any_state: %w(open),
+          with_any_scope: default_filter_scope_params,
           related_to: ""
         }
       end

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

@@ -5,7 +5,7 @@ module Decidim
     # Exposes the proposal vote resource so users can vote proposals.
     class ProposalVotesController < Decidim::Proposals::ApplicationController
       include ProposalVotesHelper
-      include Rectify::ControllerHelpers
+      include Decidim::ControllerHelpers
 
       helper_method :proposal
 

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

@@ -25,6 +25,13 @@ module Decidim
 
       before_action :set_participatory_text
 
+      # rubocop:disable Naming/VariableNumber
+      STEP1 = :step_1
+      STEP2 = :step_2
+      STEP3 = :step_3
+      STEP4 = :step_4
+      # rubocop:enable Naming/VariableNumber
+
       def index
         if component_settings.participatory_texts_enabled?
           @proposals = Decidim::Proposals::Proposal
@@ -37,7 +44,7 @@ module Decidim
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
           @base_query = search
-                        .results
+                        .result
                         .published
                         .not_hidden
 
@@ -63,7 +70,7 @@ module Decidim
 
       def new
         enforce_permission_to :create, :proposal
-        @step = :step_1
+        @step = STEP1
         if proposal_draft.present?
           redirect_to edit_draft_proposal_path(proposal_draft, component_id: proposal_draft.component.id, question_slug: proposal_draft.component.participatory_space.slug)
         else
@@ -73,7 +80,7 @@ module Decidim
 
       def create
         enforce_permission_to :create, :proposal
-        @step = :step_1
+        @step = STEP1
         @form = form(ProposalWizardCreateStepForm).from_params(proposal_creation_params)
 
         CreateProposal.call(@form, current_user) do
@@ -92,7 +99,7 @@ module Decidim
 
       def compare
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_2
+        @step = STEP2
         @similar_proposals ||= Decidim::Proposals::SimilarProposals
                                .for(current_component, @proposal)
                                .all
@@ -105,7 +112,7 @@ module Decidim
 
       def complete
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_3
+        @step = STEP3
 
         @form = form_proposal_model
 
@@ -114,13 +121,13 @@ module Decidim
 
       def preview
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_4
+        @step = STEP4
         @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_4
+        @step = STEP4
         PublishProposal.call(@proposal, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("proposals.publish.success", scope: "decidim")
@@ -135,12 +142,12 @@ module Decidim
       end
 
       def edit_draft
-        @step = :step_3
+        @step = STEP3
         enforce_permission_to :edit, :proposal, proposal: @proposal
       end
 
       def update_draft
-        @step = :step_1
+        @step = STEP1
         enforce_permission_to :edit, :proposal, proposal: @proposal
 
         @form = form_proposal_params
@@ -211,25 +218,25 @@ module Decidim
 
       private
 
-      def search_klass
-        ProposalSearch
+      def search_collection
+        Proposal.where(component: current_component).published.not_hidden.with_availability(params[:filter].try(:[], :with_availability))
       end
 
       def default_filter_params
         {
-          search_text: "",
-          origin: default_filter_origin_params,
+          search_text_cont: "",
+          with_any_origin: default_filter_origin_params,
           activity: "all",
-          category_id: default_filter_category_params,
-          state: %w(accepted evaluating state_not_published),
-          scope_id: default_filter_scope_params,
+          with_any_category: default_filter_category_params,
+          with_any_state: %w(accepted evaluating state_not_published),
+          with_any_scope: default_filter_scope_params,
           related_to: "",
           type: "all"
         }
       end
 
       def default_filter_origin_params
-        filter_origin_params = %w(citizens meeting)
+        filter_origin_params = %w(participants meeting)
         filter_origin_params << "official" if component_settings.official_proposals_enabled
         filter_origin_params << "user_group" if current_organization.user_groups_enabled?
         filter_origin_params

data/app/events/decidim/proposals/collaborative_draft_withdrawn_event.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     class CollaborativeDraftWithdrawnEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :author_nickname, :author_name, :author_path
+      i18n_attributes :author_nickname, :author_name, :author_path, :author_url
 
       delegate :nickname, :name, to: :author, prefix: true
 
@@ -15,6 +15,10 @@ module Decidim
         author.profile_path
       end
 
+      def author_url
+        author.profile_url
+      end
+
       private
 
       def author

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

@@ -15,7 +15,7 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :description, String
-        attribute :document
+        attribute :document, Decidim::Attributes::Blob
 
         validates :title, translatable_presence: true
         validates :document, presence: true, if: :new_participatory_text?
@@ -44,9 +44,9 @@ module Decidim
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.participatory_text.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text
@@ -60,7 +60,7 @@ module Decidim
         end
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Decidim
         attribute :cost, Float
         attribute :internal_state, String
 
-        validates :internal_state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
+        validates :internal_state, presence: true, inclusion: { in: %w(not_answered accepted rejected evaluating) }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
 
         with_options if: :costs_required? do

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

@@ -57,14 +57,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the proposal
         def scope_id
-          @scope_id || scope&.id
+          super || scope&.id
         end
 
         def geocoding_enabled?
@@ -82,7 +82,7 @@ module Decidim
         # Finds the Meetings of the current participatory space
         def meetings
           @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
-                               &.order(title: :asc)
+                          &.published&.order(title: :asc)
         end
 
         # Return the meeting as author
@@ -101,7 +101,7 @@ module Decidim
         end
 
         def suggested_hashtags
-          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+          downcased_suggested_hashtags = super.map(&:downcase).to_set
           component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
         end
 
@@ -129,7 +129,7 @@ module Decidim
         end
 
         def ordered_hashtag_list(string)
-          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+          string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
         end
       end
     end

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A form object to be used when admin users want to create a proposal.
       class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
+        include Decidim::HasUploadValidations
+
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end

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

@@ -7,7 +7,7 @@ module Decidim
       class ProposalsForkForm < Decidim::Form
         mimic :proposals_import
 
-        attribute :target_component_id, Integer
+        attribute :target_component_id, Array[Integer]
         attribute :proposal_ids, Array
 
         validates :target_component, :proposals, :current_component, presence: true
@@ -55,7 +55,7 @@ module Decidim
         #
         # We receive this as ["id"] since it's from a select in a form.
         def clean_target_component_id
-          target_component_id.first.to_i
+          target_component_id.first
         end
       end
     end

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

@@ -31,7 +31,7 @@ module Decidim
         end
 
         def states
-          super.reject(&:blank?)
+          super.compact_blank
         end
 
         def scopes

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

@@ -6,6 +6,7 @@ module Decidim
     class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
       include Decidim::TranslatableAttributes
       include Decidim::AttachmentAttributes
+      include Decidim::HasUploadValidations
 
       mimic :proposal
 
@@ -41,6 +42,12 @@ module Decidim
         self.scope_id = model.scope.id if model.scope
 
         self.has_address = true if model.address.present?
+
+        # Proposals have the "photos" field reserved for the proposal card image
+        # so we don't want to show all photos there. Instead, only show the
+        # first photo.
+        self.photos = [model.photo].compact.select { |p| p.weight.zero? }
+        self.documents = model.attachments - photos
       end
 
       # Finds the Category from the category_id.
@@ -54,14 +61,14 @@ module Decidim
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+        @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the proposal
       def scope_id
-        @scope_id || scope&.id
+        super || scope&.id
       end
 
       def geocoding_enabled?
@@ -89,7 +96,7 @@ module Decidim
       end
 
       def suggested_hashtags
-        downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+        downcased_suggested_hashtags = super.map(&:downcase).to_set
         component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
       end
 
@@ -119,7 +126,7 @@ module Decidim
       end
 
       def ordered_hashtag_list(string)
-        string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+        string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
       end
     end
   end

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

@@ -23,6 +23,9 @@ module Decidim
       alias component current_component
 
       def map_model(model)
+        self.title = translated_attribute(model.title)
+        self.body = translated_attribute(model.body)
+
         self.user_group_id = model.user_groups.first&.id
         return unless model.categorization
 

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

@@ -4,6 +4,10 @@ module Decidim
   module Proposals
     module Admin
       module ProposalBulkActionsHelper
+        def proposal_find(id)
+          Decidim::Proposals::Proposal.find(id)
+        end
+
         # Public: Generates a select field with the valuators of the given participatory space.
         #
         # participatory_space - A participatory space instance.

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

@@ -40,12 +40,10 @@ module Decidim
         case state
         when "accepted"
           "text-success"
-        when "rejected"
+        when "rejected", "withdrawn"
           "text-alert"
         when "evaluating"
           "text-warning"
-        when "withdrawn"
-          "text-alert"
         else
           "text-info"
         end
@@ -96,13 +94,13 @@ module Decidim
       # frontend, the proposal body is considered as safe content; that's unless
       # the proposal comes from a collaborative_draft or a participatory_text.
       def safe_content?
-        rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal) ||
-          (@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal)
+        (rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal)) ||
+          ((@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal))
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_proposal_body(proposal)
-        render_sanitized_content(proposal, :body)
+        Decidim::ContentProcessor.render(render_sanitized_content(proposal, :body), "div")
       end
 
       # Returns :text_area or :editor based on the organization' settings.
@@ -172,7 +170,7 @@ module Decidim
       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("participants", t("decidim.proposals.application_helper.filter_origin_values.participants"))
         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"))
 

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

@@ -60,12 +60,10 @@ module Decidim
         case state
         when "accepted"
           ["success"]
-        when "rejected"
+        when "rejected", "withdrawn"
           ["alert"]
         when "evaluating"
           ["warning"]
-        when "withdrawn"
-          ["alert"]
         else
           ["muted"]
         end

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

@@ -73,10 +73,10 @@ module Decidim
       def proposal_wizard_stepper(current_step)
         content_tag :ol, class: "wizard__steps" do
           %(
-            #{proposal_wizard_stepper_step(:step_1, current_step)}
-            #{proposal_wizard_stepper_step(:step_2, current_step)}
-            #{proposal_wizard_stepper_step(:step_3, current_step)}
-            #{proposal_wizard_stepper_step(:step_4, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP1, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP2, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP3, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP4, current_step)}
           ).html_safe
         end
       end
@@ -120,11 +120,11 @@ module Decidim
       # Renders the back link except for step_2: compare
       def proposal_wizard_aside_link_to_back(step)
         case step
-        when :step_1
+        when ProposalsController::STEP1
           proposals_path
-        when :step_3
+        when ProposalsController::STEP3
           compare_proposal_path
-        when :step_4
+        when ProposalsController::STEP4
           edit_draft_proposal_path
         end
       end

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

@@ -16,6 +16,7 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Randomable
+      include Decidim::FilterableResource
 
       has_many :collaborator_requests,
                class_name: "Decidim::Proposals::CollaborativeDraftCollaboratorRequest",
@@ -35,6 +36,8 @@ module Decidim
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :published, -> { where(state: "published") }
 
+      scope_search_multi :with_any_state, [:open, :published, :withdrawn]
+
       # Checks whether the user can edit the given proposal.
       #
       # user - the user to check for authorship
@@ -68,6 +71,13 @@ module Decidim
       def reported_searchable_content_extras
         [authors.map(&:name).join("\n")]
       end
+
+      # Create the :search_text ransacker alias for searching from both :title or :body.
+      ransacker_text_multi :search_text, [:title, :body]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_state, :related_to, :with_any_scope, :with_any_category]
+      end
     end
   end
 end

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

@@ -4,8 +4,6 @@ module Decidim
   module Proposals
     # A collaborative_draft can accept requests to coauthor and contribute
     class CollaborativeDraftCollaboratorRequest < Proposals::ApplicationRecord
-      validates :collaborative_draft, :user, presence: true
-
       belongs_to :collaborative_draft, class_name: "Decidim::Proposals::CollaborativeDraft", foreign_key: :decidim_proposals_collaborative_draft_id
       belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
     end

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

@@ -18,7 +18,7 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Fingerprintable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Proposals::ParticipatoryTextSection
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
@@ -27,6 +27,7 @@ module Decidim
       include Decidim::Proposals::Valuatable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
+      include Decidim::FilterableResource
 
       translatable_fields :title, :body
 
@@ -67,10 +68,33 @@ module Decidim
       scope :except_rejected, -> { where.not(state: "rejected").or(state_not_published) }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       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 :with_availability, lambda { |state_key|
+        case state_key
+        when "withdrawn"
+          withdrawn
+        else
+          except_withdrawn
+        end
+      }
+
+      scope :with_type, lambda { |type_key, user, component|
+        case type_key
+        when "proposals"
+          only_amendables
+        when "amendments"
+          only_visible_emendations_for(user, component)
+        else # Assume 'all'
+          amendables_and_visible_emendations_for(user, component)
+        end
+      }
+
+      scope :voted_by, lambda { |user|
+        includes(:votes).where(decidim_proposals_proposal_votes: { decidim_author_id: user })
+      }
+
       scope :sort_by_valuation_assignments_count_asc, lambda {
         order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} ASC NULLS FIRST").to_s)
       }
@@ -79,6 +103,8 @@ module Decidim
         order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} DESC NULLS LAST").to_s)
       }
 
+      scope_search_multi :with_any_state, [:accepted, :rejected, :evaluating, :state_not_published]
+
       def self.with_valuation_assigned_to(user, space)
         valuator_roles = space.user_roles(:valuator).where(user: user)
 
@@ -103,7 +129,7 @@ module Decidim
       end
 
       # Returns a collection scoped by an author.
-      # Overrides this method in DataPortability to support Coauthorable.
+      # Overrides this method in DownloadYourData to support Coauthorable.
       def self.user_collection(author)
         return unless author.is_a?(Decidim::User)
 
@@ -229,14 +255,21 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Returns the presenter for this author, to be used in the views.
+      # Required by ResourceRenderer.
+      def presenter
+        Decidim::Proposals::ProposalPresenter.new(self)
+      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.
+      # Returns authors name or title in case it's a meeting
       def reported_searchable_content_extras
-        [authors.map(&:name).join("\n")]
+        [authors.map { |p| p.respond_to?(:name) ? p.name : p.title }.join("\n")]
       end
 
       # Public: Whether the proposal is official or not.
@@ -246,7 +279,7 @@ module Decidim
 
       # Public: Whether the proposal is created in a meeting or not.
       def official_meeting?
-        authors.first.class.name == "Decidim::Meetings::Meeting"
+        authors.first.instance_of?(Decidim::Meetings::Meeting)
       end
 
       # Public: The maximum amount of votes allowed for this proposal.
@@ -296,6 +329,10 @@ module Decidim
         published_at.nil?
       end
 
+      def self.ransack(params = {}, options = {})
+        ProposalSearch.new(self, params, options)
+      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.squish
@@ -321,10 +358,18 @@ module Decidim
         where(query, value: value)
       end
 
-      def self.ransackable_scopes(_auth = nil)
-        [:valuator_role_ids_has]
+      def self.ransackable_scopes(auth_object = nil)
+        base = [:with_any_origin, :with_any_state, :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]
       end
 
+      # Create i18n ransackers for :title and :body.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :body]
+
       ransacker :state_published do
         Arel.sql("CASE
           WHEN EXISTS (
@@ -373,7 +418,7 @@ module Decidim
         Decidim::Proposals::ProposalSerializer
       end
 
-      def self.data_portability_images(user)
+      def self.download_your_data_images(user)
         user_collection(user).map { |p| p.attachments.collect(&:file) }
       end
 

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

@@ -120,7 +120,10 @@ module Decidim
 
         # Proposals can only be created from the admin when the
         # corresponding setting is enabled.
+        # This setting is incompatible with participatory texts.
         def can_create_proposal_from_admin?
+          return disallow! if participatory_texts_are_enabled? && permission_action.subject == :proposal
+
           toggle_allow(admin_creation_is_enabled?) if permission_action.subject == :proposal
         end