decidim-proposals 0.15.2 → 0.16.0

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

@@ -47,14 +47,14 @@ module Decidim
       end
 
       def send_notification_to_authors
-        recipient_ids = @collaborative_draft.authors.pluck(:id) - [@current_user.id]
-        return if recipient_ids.blank?
+        recipients = @collaborative_draft.authors - [@current_user]
+        return if recipients.blank?
 
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.collaborative_draft_withdrawn",
           event_class: Decidim::Proposals::CollaborativeDraftWithdrawnEvent,
           resource: @collaborative_draft,
-          recipient_ids: recipient_ids.uniq,
+          affected_users: recipients.uniq,
           extra: {
             author_id: @current_user.id
           }

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

@@ -22,7 +22,10 @@ module Decidim
       def call
         return broadcast(:invalid) if @proposal.votes.any?
 
-        change_proposal_state_to_withdrawn
+        transaction do
+          change_proposal_state_to_withdrawn
+          reject_emendations_if_any
+        end
 
         broadcast(:ok, @proposal)
       end
@@ -32,6 +35,16 @@ module Decidim
       def change_proposal_state_to_withdrawn
         @proposal.update state: "withdrawn"
       end
+
+      def reject_emendations_if_any
+        return if @proposal.emendations.empty?
+
+        @proposal.emendations.each do |emendation|
+          @form = form(Decidim::Amendable::RejectForm).from_params(id: emendation.amendment.id)
+          result = Decidim::Amendable::Reject.call(@form)
+          return result[:ok] if result[:ok]
+        end
+      end
     end
   end
 end

data/app/controllers/decidim/proposals/admin/participatory_texts_controller.rb

@@ -16,7 +16,8 @@ module Decidim
 
         def new_import
           enforce_permission_to :import, :participatory_texts
-          @import = form(Admin::ImportParticipatoryTextForm).instance
+          participatory_text = Decidim::Proposals::ParticipatoryText.find_by(component: current_component)
+          @import = form(Admin::ImportParticipatoryTextForm).from_model(participatory_text)
         end
 
         def import

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

@@ -5,8 +5,10 @@ module Decidim
     module Admin
       # This controller allows admins to manage proposals in a participatory process.
       class ProposalsController < Admin::ApplicationController
+        include Decidim::ApplicationHelper
+
         helper Proposals::ApplicationHelper
-        helper_method :proposals, :query
+        helper_method :proposals, :query, :form_presenter
 
         def new
           enforce_permission_to :create, :proposal
@@ -104,6 +106,7 @@ module Decidim
 
         def update_proposals_category_response_successful(response)
           return if response[:successful].blank?
+
           I18n.t(
             "proposals.update_category.success",
             category: response[:category_name],
@@ -114,6 +117,7 @@ module Decidim
 
         def update_proposals_category_response_errored(response)
           return if response[:errored].blank?
+
           I18n.t(
             "proposals.update_category.invalid",
             category: response[:category_name],
@@ -121,6 +125,10 @@ module Decidim
             scope: "decidim.proposals.admin"
           )
         end
+
+        def form_presenter
+          @form_presenter ||= present(@form, presenter_class: Decidim::Proposals::ProposalPresenter)
+        end
       end
     end
   end

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

@@ -7,11 +7,15 @@ module Decidim
       helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
       helper TooltipHelper
+
+      include Decidim::ApplicationHelper
       include FormFactory
       include FilterResource
       include CollaborativeOrderable
       include Paginable
 
+      helper_method :form_presenter
+
       helper_method :geocoded_collaborative_draft, :collaborative_draft
       before_action :collaborative_drafts_enabled?
       before_action :authenticate_user!, only: [:new, :create, :complete]
@@ -140,6 +144,10 @@ module Decidim
 
       private
 
+      def form_presenter
+        @form_presenter ||= present(@form, presenter_class: Decidim::Proposals::CollaborativeDraftPresenter)
+      end
+
       def collaborative_drafts_enabled?
         raise ActionController::RoutingError, "Not Found" unless component_settings.collaborative_drafts_enabled?
       end

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

@@ -6,34 +6,50 @@ module Decidim
     class ProposalsController < Decidim::Proposals::ApplicationController
       helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
+      helper ParticipatoryTextsHelper
+      include Decidim::ApplicationHelper
       include FormFactory
       include FilterResource
       include Orderable
       include Paginable
 
+      helper_method :form_presenter
+
       before_action :authenticate_user!, only: [:new, :create, :complete]
       before_action :ensure_is_draft, only: [:compare, :complete, :preview, :publish, :edit_draft, :update_draft, :destroy_draft]
       before_action :set_proposal, only: [:show, :edit, :update, :withdraw]
       before_action :edit_form, only: [:edit_draft, :edit]
+
+      before_action :set_participatory_text
+
       def index
-        @proposals = search
-                     .results
-                     .published
-                     .not_hidden
-                     .includes(:category)
-                     .includes(:scope)
-
-        @voted_proposals = if current_user
-                             ProposalVote.where(
-                               author: current_user,
-                               proposal: @proposals.pluck(:id)
-                             ).pluck(:decidim_proposal_id)
-                           else
-                             []
-                           end
-
-        @proposals = paginate(@proposals)
-        @proposals = reorder(@proposals)
+        if component_settings.participatory_texts_enabled?
+          @proposals = Decidim::Proposals::Proposal
+                       .where(component: current_component)
+                       .published
+                       .not_hidden
+                       .includes(:category, :scope)
+                       .order(position: :asc)
+          render "decidim/proposals/proposals/participatory_texts/participatory_text"
+        else
+          @proposals = search
+                       .results
+                       .published
+                       .not_hidden
+                       .includes(:category)
+                       .includes(:scope)
+
+          @voted_proposals = if current_user
+                               ProposalVote.where(
+                                 author: current_user,
+                                 proposal: @proposals.pluck(:id)
+                               ).pluck(:decidim_proposal_id)
+                             else
+                               []
+                             end
+          @proposals = paginate(@proposals)
+          @proposals = reorder(@proposals)
+        end
       end
 
       def show
@@ -171,15 +187,27 @@ module Decidim
 
       def withdraw
         enforce_permission_to :withdraw, :proposal, proposal: @proposal
-
-        WithdrawProposal.call(@proposal, current_user) do
-          on(:ok) do |_proposal|
-            flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
-            redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
+        if @proposal.emendation?
+          Decidim::Amendable::Withdraw.call(@proposal, current_user) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
+              redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
+            end
+            on(:invalid) do
+              flash[:alert] = I18n.t("proposals.update.error", scope: "decidim")
+              redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
+            end
           end
-          on(:invalid) do
-            flash[:alert] = I18n.t("proposals.update.error", scope: "decidim")
-            redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
+        else
+          WithdrawProposal.call(@proposal, current_user) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
+              redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
+            end
+            on(:invalid) do
+              flash[:alert] = I18n.t("proposals.update.error", scope: "decidim")
+              redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
+            end
           end
         end
       end
@@ -198,7 +226,8 @@ module Decidim
           category_id: "",
           state: "except_rejected",
           scope_id: nil,
-          related_to: ""
+          related_to: "",
+          type: "all"
         }
       end
 
@@ -223,6 +252,10 @@ module Decidim
         form(ProposalForm).from_model(@proposal)
       end
 
+      def form_presenter
+        @form_presenter ||= present(@form, presenter_class: Decidim::Proposals::ProposalPresenter)
+      end
+
       def form_attachment_new
         form(AttachmentForm).from_params({})
       end
@@ -233,6 +266,10 @@ module Decidim
         @form.attachment = form_attachment_model
         @form
       end
+
+      def set_participatory_text
+        @participatory_text = Decidim::Proposals::ParticipatoryText.find_by(component: current_component)
+      end
     end
   end
 end

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

@@ -11,7 +11,11 @@ module Decidim
       private
 
       def item
-        @item ||= CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
+        @item ||= if params[:proposal_id]
+                    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

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

@@ -4,6 +4,14 @@ module Decidim
   module Proposals
     class AcceptedProposalEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent
+
+      def resource_text
+        translated_attribute(resource.answer)
+      end
+
+      def event_has_roles?
+        true
+      end
     end
   end
 end

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

@@ -3,6 +3,9 @@
 module Decidim
   module Proposals
     class EvaluatingProposalEvent < Decidim::Events::SimpleEvent
+      def event_has_roles?
+        true
+      end
     end
   end
 end

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

@@ -15,6 +15,10 @@ module Decidim
         endorser.profile_path
       end
 
+      def resource_text
+        resource.body
+      end
+
       private
 
       def endorser

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

@@ -5,6 +5,10 @@ module Decidim
     class PublishProposalEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::CoauthorEvent
 
+      def resource_text
+        resource.body
+      end
+
       private
 
       def i18n_scope

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

@@ -4,6 +4,14 @@ module Decidim
   module Proposals
     class RejectedProposalEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent
+
+      def resource_text
+        translated_attribute(resource.answer)
+      end
+
+      def event_has_roles?
+        true
+      end
     end
   end
 end

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

@@ -22,6 +22,10 @@ module Decidim
         def document_text
           document&.read
         end
+
+        def document_type
+          document.content_type
+        end
       end
     end
   end

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

@@ -5,6 +5,7 @@ module Decidim
     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
@@ -16,12 +17,16 @@ module Decidim
         attribute :scope_id, Integer
         attribute :attachment, AttachmentForm
         attribute :position, Integer
+        attribute :created_in_meeting, Boolean
+        attribute :meeting_id, Integer
+        attribute :suggested_hashtags, Array[String]
 
         validates :title, :body, presence: true, etiquette: 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
 
@@ -34,6 +39,8 @@ module Decidim
 
           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
@@ -59,6 +66,44 @@ module Decidim
           @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
@@ -72,6 +117,10 @@ module Decidim
         def notify_missing_attachment_if_errored
           errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
         end
+
+        def ordered_hashtag_list(string)
+          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+        end
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Decidim
     # A form object to be used when public users want to create a Collaborative Draft.
     class CollaborativeDraftForm < Decidim::Proposals::ProposalForm
       def map_model(model)
+        super
+
         return unless model.categorization
 
         self.category_id = model.categorization.decidim_category_id