decidim-proposals 0.21.0 → 0.22.0

data/app/commands/decidim/proposals/update_proposal.rb

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user updates a proposal.
     class UpdateProposal < Rectify::Command
-      include AttachmentMethods
+      include ::Decidim::AttachmentMethods
       include HashtagsMethods
 
       # Public: Initializes the command.

data/app/controllers/concerns/decidim/proposals/admin/picker.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Proposals
+    module Admin
+      module Picker
+        extend ActiveSupport::Concern
+
+        included do
+          helper Decidim::Proposals::Admin::ProposalsPickerHelper
+        end
+
+        def proposals_picker
+          render :proposals_picker, layout: false
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -46,7 +46,7 @@ module Decidim
           when "most_commented"
             proposals.left_joins(:comments).group(:id).order(Arel.sql("COUNT(decidim_comments_comments.id) DESC"))
           when "most_endorsed"
-            proposals.order(proposal_endorsements_count: :desc)
+            proposals.order(endorsements_count: :desc)
           when "most_followed"
             proposals.left_joins(:follows).group(:id).order(Arel.sql("COUNT(decidim_follows.id) DESC"))
           when "most_voted"

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

@@ -37,8 +37,7 @@ module Decidim
                        .results
                        .published
                        .not_hidden
-                       .includes(:category)
-                       .includes(:scope)
+                       .includes(:amendable, :category, :component, :resource_permission, :scope)
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -232,7 +231,7 @@ module Decidim
       def default_filter_category_params
         return "all" unless current_component.participatory_space.categories.any?
 
-        ["all"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
+        ["all"] + current_component.participatory_space.categories.pluck(:id).map(&:to_s)
       end
 
       def default_filter_scope_params
@@ -241,7 +240,7 @@ module Decidim
         if current_component.participatory_space.scope
           ["all", current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
         else
-          %w(all global) + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
+          %w(all global) + current_component.participatory_space.scopes.pluck(:id).map(&:to_s)
         end
       end
 
@@ -285,7 +284,7 @@ module Decidim
       end
 
       def form_attachment_new
-        form(AttachmentForm).from_params({})
+        form(AttachmentForm).from_model(Attachment.new)
       end
 
       def edit_form

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

@@ -5,26 +5,16 @@ module Decidim
     # Exposes Proposals versions so users can see how a Proposal/CollaborativeDraft
     # has been updated through time.
     class VersionsController < Decidim::Proposals::ApplicationController
-      helper Decidim::TraceabilityHelper
-
       include Decidim::ApplicationHelper
+      include Decidim::ResourceVersionsConcern
 
-      helper_method :current_version, :item
-
-      private
-
-      def item
-        @item ||= if params[:proposal_id]
-                    present(Proposal.where(component: current_component).find(params[:proposal_id]))
-                  else
-                    CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
-                  end
-      end
-
-      def current_version
-        return nil unless params[:id].to_i.positive?
-
-        @current_version ||= item.versions[params[:id].to_i - 1]
+      def versioned_resource
+        @versioned_resource ||=
+          if params[:proposal_id]
+            present(Proposal.where(component: current_component).find(params[:proposal_id]))
+          else
+            CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
+          end
       end
     end
   end

data/app/events/decidim/proposals/admin/proposal_note_created_event.rb

@@ -0,0 +1,27 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalNoteCreatedEvent < Decidim::Events::SimpleEvent
+        include Rails.application.routes.mounted_helpers
+
+        i18n_attributes :admin_proposal_info_url, :admin_proposal_info_path
+
+        def admin_proposal_info_path
+          ResourceLocatorPresenter.new(resource).show
+        end
+
+        def admin_proposal_info_url
+          decidim_admin_participatory_process_proposals.proposal_url(resource, resource.component.mounted_params)
+        end
+
+        private
+
+        def organization
+          @organization ||= component.participatory_space.organization
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to create a proposal
+      # through the participatory texts.
+      class ParticipatoryTextProposalForm < Admin::ProposalBaseForm
+        validates :title, length: { maximum: 150 }
+      end
+    end
+  end
+end

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

@@ -6,11 +6,11 @@ module Decidim
       # A form object to be used when admin users want to review a collection of proposals
       # from a participatory text.
       class PreviewParticipatoryTextForm < Decidim::Form
-        attribute :proposals, Array[Decidim::Proposals::Admin::ProposalForm]
+        attribute :proposals, Array[Decidim::Proposals::Admin::ParticipatoryTextProposalForm]
 
         def from_models(proposals)
           self.proposals = proposals.collect do |proposal|
-            ProposalForm.from_model(proposal)
+            Admin::ParticipatoryTextProposalForm.from_model(proposal)
           end
         end
 

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

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to create a proposal.
+      class ProposalBaseForm < Decidim::Form
+        include Decidim::ApplicationHelper
+        mimic :proposal
+
+        attribute :title, String
+        attribute :body, String
+        attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
+        attribute :category_id, Integer
+        attribute :scope_id, Integer
+        attribute :attachment, AttachmentForm
+        attribute :position, Integer
+        attribute :created_in_meeting, Boolean
+        attribute :meeting_id, Integer
+        attribute :suggested_hashtags, Array[String]
+        attribute :photos, Array[String]
+        attribute :add_photos, Array
+
+        validates :title, :body, presence: true
+        validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
+        validates :category, presence: true, if: ->(form) { form.category_id.present? }
+        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+        validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
+
+        validate :scope_belongs_to_participatory_space_scope
+
+        validate :notify_missing_attachment_if_errored
+
+        delegate :categories, to: :current_component
+
+        def map_model(model)
+          return unless model.categorization
+
+          self.category_id = model.categorization.decidim_category_id
+          self.scope_id = model.decidim_scope_id
+
+          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+        end
+
+        alias component current_component
+
+        # Finds the Category from the category_id.
+        #
+        # Returns a Decidim::Category
+        def category
+          @category ||= categories.find_by(id: category_id)
+        end
+
+        # Finds the Scope from the given decidim_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
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the proposal
+        def scope_id
+          @scope_id || scope&.id
+        end
+
+        # Finds the Meetings of the current participatory space
+        def meetings
+          @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
+                               &.order(title: :asc)
+        end
+
+        # Return the meeting as author
+        def meeting_as_author
+          @meeting_as_author ||= meetings.find_by(id: meeting_id)
+        end
+
+        def author
+          return current_organization unless created_in_meeting?
+
+          meeting_as_author
+        end
+
+        def extra_hashtags
+          @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
+        end
+
+        def suggested_hashtags
+          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+          component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
+        end
+
+        def suggested_hashtag_checked?(hashtag)
+          suggested_hashtags.member?(hashtag)
+        end
+
+        def component_automatic_hashtags
+          @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
+        end
+
+        def component_suggested_hashtags
+          @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
+        end
+
+        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
+        # this problem.
+        def notify_missing_attachment_if_errored
+          errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
+          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
+        end
+
+        def ordered_hashtag_list(string)
+          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+        end
+      end
+    end
+  end
+end

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

@@ -4,126 +4,8 @@ module Decidim
   module Proposals
     module Admin
       # A form object to be used when admin users want to create a proposal.
-      class ProposalForm < Decidim::Form
-        include Decidim::ApplicationHelper
-        mimic :proposal
-
-        attribute :title, String
-        attribute :body, String
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :category_id, Integer
-        attribute :scope_id, Integer
-        attribute :attachment, AttachmentForm
-        attribute :position, Integer
-        attribute :created_in_meeting, Boolean
-        attribute :meeting_id, Integer
-        attribute :suggested_hashtags, Array[String]
-        attribute :photos, Array[String]
-        attribute :add_photos, Array
-
-        validates :title, :body, presence: true
-        validates :title, length: { maximum: 150 }
-        validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
-        validates :category, presence: true, if: ->(form) { form.category_id.present? }
-        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
-        validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
-
-        validate :scope_belongs_to_participatory_space_scope
-
-        validate :notify_missing_attachment_if_errored
-
-        delegate :categories, to: :current_component
-
-        def map_model(model)
-          return unless model.categorization
-
-          self.category_id = model.categorization.decidim_category_id
-          self.scope_id = model.decidim_scope_id
-
-          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
-        end
-
-        alias component current_component
-
-        # Finds the Category from the category_id.
-        #
-        # Returns a Decidim::Category
-        def category
-          @category ||= categories.find_by(id: category_id)
-        end
-
-        # Finds the Scope from the given decidim_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
-        end
-
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the proposal
-        def scope_id
-          @scope_id || scope&.id
-        end
-
-        # Finds the Meetings of the current participatory space
-        def meetings
-          @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
-                               &.order(title: :asc)
-        end
-
-        # Return the meeting as author
-        def meeting_as_author
-          @meeting_as_author ||= meetings.find_by(id: meeting_id)
-        end
-
-        def author
-          return current_organization unless created_in_meeting?
-
-          meeting_as_author
-        end
-
-        def extra_hashtags
-          @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
-        end
-
-        def suggested_hashtags
-          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
-          component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
-        end
-
-        def suggested_hashtag_checked?(hashtag)
-          suggested_hashtags.member?(hashtag)
-        end
-
-        def component_automatic_hashtags
-          @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
-        end
-
-        def component_suggested_hashtags
-          @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
-        end
-
-        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
-        # this problem.
-        def notify_missing_attachment_if_errored
-          errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
-          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
-        end
-
-        def ordered_hashtag_list(string)
-          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
-        end
+      class ProposalForm < Admin::ProposalBaseForm
+        validates :title, length: { in: 15..150 }
       end
     end
   end

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

@@ -30,6 +30,10 @@ module Decidim
         super
 
         @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+
+        # 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
       end
 
       # Finds the Category from the category_id.

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

@@ -12,7 +12,11 @@ module Decidim
       attribute :user_group_id, Integer
 
       validates :title, :body, presence: true, etiquette: true
-      validates :title, length: { maximum: 150 }
+      validates :title, length: { in: 15..150 }
+      validates :body, proposal_length: {
+        minimum: 15,
+        maximum: ->(record) { record.component.settings.proposal_length }
+      }
 
       validate :proposal_length
       validate :body_is_not_bare_template