decidim-proposals 0.19.1 → 0.23.0

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

@@ -10,6 +10,7 @@ module Decidim
 
       include Decidim::ApplicationHelper
       include FormFactory
+      include Flaggable
       include FilterResource
       include CollaborativeOrderable
       include Paginable
@@ -171,12 +172,18 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          category_id: "",
-          state: "open",
-          scope_id: nil,
+          category_id: default_filter_category_params,
+          state: %w(open),
+          scope_id: default_filter_scope_params,
           related_to: ""
         }
       end
+
+      def default_filter_category_params
+        return unless current_component.participatory_space.categories.any?
+
+        ["without"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
+      end
     end
   end
 end

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

@@ -8,12 +8,14 @@ module Decidim
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
       include Decidim::ApplicationHelper
+      include Flaggable
+      include Withdrawable
       include FormFactory
       include FilterResource
       include Decidim::Proposals::Orderable
       include Paginable
 
-      helper_method :form_presenter
+      helper_method :proposal_presenter, :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]
@@ -37,8 +39,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(
@@ -65,14 +66,14 @@ module Decidim
         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
-          @form = form(ProposalWizardCreateStepForm).from_params({})
+          @form = form(ProposalWizardCreateStepForm).from_params(body: translated_proposal_body_template)
         end
       end
 
       def create
         enforce_permission_to :create, :proposal
         @step = :step_1
-        @form = form(ProposalWizardCreateStepForm).from_params(params)
+        @form = form(ProposalWizardCreateStepForm).from_params(proposal_creation_params)
 
         CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
@@ -212,16 +213,23 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          origin: "all",
-          activity: "",
-          category_id: "",
-          state: "except_rejected",
-          scope_id: nil,
+          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,
           related_to: "",
           type: "all"
         }
       end
 
+      def default_filter_origin_params
+        filter_origin_params = %w(citizens 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
+      end
+
       def proposal_draft
         Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
                 .where(component: current_component).find_by(published_at: nil)
@@ -245,6 +253,10 @@ module Decidim
         Proposal.only_visible_emendations_for(current_user, current_component).published.include?(@proposal)
       end
 
+      def proposal_presenter
+        @proposal_presenter ||= present(@proposal)
+      end
+
       def form_proposal_params
         form(ProposalForm).from_params(params)
       end
@@ -258,7 +270,7 @@ module Decidim
       end
 
       def form_attachment_new
-        form(AttachmentForm).from_params({})
+        form(AttachmentForm).from_model(Attachment.new)
       end
 
       def edit_form
@@ -271,6 +283,14 @@ module Decidim
       def set_participatory_text
         @participatory_text = Decidim::Proposals::ParticipatoryText.find_by(component: current_component)
       end
+
+      def translated_proposal_body_template
+        translated_attribute component_settings.new_proposal_body_template
+      end
+
+      def proposal_creation_params
+        params[:proposal].merge(body_template: translated_proposal_body_template)
+      end
     end
   end
 end

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

@@ -5,23 +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
-      helper_method :current_version, :item
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceVersionsConcern
 
-      private
-
-      def item
-        @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
-        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/controllers/decidim/proposals/{proposal_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Proposals
-    class ProposalWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Proposals::ApplicationHelper
 
       private
@@ -12,7 +12,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= proposal_proposal_widget_url(model)
+        @iframe_url ||= proposal_widget_url(model)
       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/events/decidim/proposals/admin/update_proposal_scope_event.rb

@@ -0,0 +1,11 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class UpdateProposalScopeEvent < Decidim::Events::SimpleEvent
+        include Decidim::Events::AuthorEvent
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Decidim
       class ImportParticipatoryTextForm < Decidim::Form
         include TranslatableAttributes
 
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.assemblies.admin.new_import.accepted_types when modifying this hash
         ACCEPTED_MIME_TYPES = Decidim::Proposals::DocToMarkdown::ACCEPTED_MIME_TYPES
 
         translatable_attribute :title, String
@@ -33,7 +35,7 @@ module Decidim
 
         # Return ACCEPTED_MIME_TYPES plus `text/plain` for better markdown support
         def valid_mime_types
-          ACCEPTED_MIME_TYPES.values + [Decidim::Proposals::DocToMarkdown::TEXT_PLAIN_MIME_TYPE]
+          ACCEPTED_MIME_TYPES.values + [Decidim::Proposals::DocToMarkdown::TEXT_PLAIN_MIME_TYPE] + ["application/octet-stream"]
         end
 
         def document_type

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

@@ -0,0 +1,20 @@
+# 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
+        attribute :title, String
+        attribute :body, String
+        validates :title, length: { maximum: 150 }, presence: true
+
+        def map_model(model)
+          self.title = translated_attribute(model.title)
+          self.body = translated_attribute(model.body)
+        end
+      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_answer_form.rb

@@ -9,10 +9,35 @@ module Decidim
         mimic :proposal_answer
 
         translatable_attribute :answer, String
-        attribute :state, String
+        translatable_attribute :cost_report, String
+        translatable_attribute :execution_period, String
+        attribute :cost, Float
+        attribute :internal_state, String
 
-        validates :state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
+        validates :internal_state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
+
+        with_options if: :costs_required? do
+          validates :cost, numericality: true, presence: true
+          validates :cost_report, translatable_presence: true
+          validates :execution_period, translatable_presence: true
+        end
+
+        alias state internal_state
+
+        def costs_required?
+          costs_enabled? && state == "accepted"
+        end
+
+        def publish_answer?
+          current_component.current_settings.publish_answers_immediately?
+        end
+
+        private
+
+        def costs_enabled?
+          current_component.current_settings.answers_with_costs?
+        end
       end
     end
   end

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

@@ -0,0 +1,136 @@
+# 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::TranslatableAttributes
+        include Decidim::ApplicationHelper
+
+        mimic :proposal
+
+        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 :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
+        validates :category, presence: true, if: ->(form) { form.category_id.present? }
+        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+        validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
+        validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
+
+        validate :notify_missing_attachment_if_errored
+
+        delegate :categories, to: :current_component
+
+        def map_model(model)
+          body = translated_attribute(model.body)
+          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
+
+          return unless model.categorization
+
+          self.category_id = model.categorization.decidim_category_id
+          self.scope_id = model.decidim_scope_id
+        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_component.scopes.find_by(id: @scope_id) : current_component.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the proposal
+        def scope_id
+          @scope_id || scope&.id
+        end
+
+        def geocoding_enabled?
+          Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
+        end
+
+        def has_address?
+          geocoding_enabled? && address.present?
+        end
+
+        def geocoded?
+          latitude.present? && longitude.present?
+        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
+
+        # 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