decidim-proposals 0.29.1 → 0.30.0.rc1

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

@@ -8,14 +8,13 @@ module Decidim
         include Decidim::TranslatableAttributes
         include Decidim::AttachmentAttributes
         include Decidim::ApplicationHelper
+        include Decidim::HasTaxonomyFormAttributes
 
         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
@@ -25,46 +24,19 @@ module Decidim
         attachments_attribute :photos
 
         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 ||= @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
-          super || scope&.id
+        def participatory_space_manifest
+          @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
 
         def geocoding_enabled?

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

@@ -6,27 +6,32 @@ module Decidim
       # A form object to be used when admin users want to create a proposal.
       class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
         include Decidim::HasUploadValidations
+        include Decidim::AttachmentAttributes
 
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
-        translatable_attribute :body, String
+        translatable_attribute :body, Decidim::Attributes::RichText
+        attribute :attachment, AttachmentForm
+
+        attachments_attribute :documents
 
         validates :title, :body, translatable_presence: true
+        validates :title, :body, translated_etiquette: true
 
         validate :notify_missing_attachment_if_errored
 
         def map_model(model)
-          super(model)
+          super
           presenter = ProposalPresenter.new(model)
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
-          self.attachment = if model.documents.first.present?
-                              { file: model.documents.first.file, title: translated_attribute(model.documents.first.title) }
-                            else
-                              {}
-                            end
+          self.documents = model.attachments
+        end
+
+        def notify_missing_attachment_if_errored
+          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
         end
       end
     end

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

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to import a collection of proposals
       # from another component.
       class ProposalsImportForm < Decidim::Form
+        include TranslatableAttributes
         mimic :proposals_import
 
         attribute :origin_component_id, Integer
@@ -13,31 +14,22 @@ module Decidim
         attribute :keep_answers, Boolean
         attribute :keep_authors, Boolean
         attribute :states, Array
-        attribute :scope_ids, Array
 
         validates :origin_component_id, :origin_component, :states, :current_component, presence: true
         validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
-        VALID_STATES = %w(accepted not_answered evaluating rejected).freeze
-
         def states_collection
-          VALID_STATES.map do |state|
-            OpenStruct.new(
-              name: I18n.t(state, scope: "decidim.proposals.answers"),
-              value: state
-            )
-          end
+          @states_collection ||= ProposalState.where(component: current_component) + [ProposalState.new(token: "not_answered",
+                                                                                                        title: I18n.t(
+                                                                                                          :not_answered, scope: "decidim.proposals.answers"
+                                                                                                        ))]
         end
 
         def states
           super.compact_blank
         end
 
-        def scopes
-          Decidim::Scope.where(organization: current_organization, id: scope_ids)
-        end
-
         def origin_component
           @origin_component ||= origin_components.find_by(id: origin_component_id)
         end
@@ -56,7 +48,7 @@ module Decidim
 
         def valid_states
           return if states.all? do |state|
-            VALID_STATES.include?(state)
+            states_collection.pluck(:token).include?(state)
           end
 
           errors.add(:states, :invalid)

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

@@ -16,7 +16,10 @@ module Decidim
         end
 
         def valuator_roles
-          @valuator_roles ||= current_component.participatory_space.user_roles(:valuator).where(id: valuator_role_ids)
+          @valuator_roles ||= current_component.participatory_space
+                                               .user_roles(:valuator)
+                                               .order_by_name
+                                               .where(id: valuator_role_ids)
         end
 
         def same_participatory_space

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

@@ -4,14 +4,6 @@ module Decidim
   module Proposals
     # 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
-      end
-
       def user_group
         @user_group ||= Decidim::UserGroup.find user_group_id if user_group_id.present?
       end

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

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::TranslatableAttributes
       include Decidim::AttachmentAttributes
       include Decidim::HasUploadValidations
+      include Decidim::HasTaxonomyFormAttributes
 
       mimic :proposal
 
@@ -17,29 +18,24 @@ module Decidim
       attribute :address, String
       attribute :latitude, Float
       attribute :longitude, Float
-      attribute :category_id, Integer
-      attribute :scope_id, Integer
       attribute :attachment, AttachmentForm
       attribute :suggested_hashtags, Array[String]
 
       attachments_attribute :documents
 
-      validates :title, :body, presence: true, etiquette: true
+      validates :title, :body, presence: true
+      validates :title, :body, etiquette: true
       validates :title, length: { in: 15..150 }
       validates :body, proposal_length: {
         minimum: 15,
         maximum: ->(record) { record.component.settings.proposal_length }
       }
       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? }
 
       validate :body_is_not_bare_template
       validate :notify_missing_attachment_if_errored
 
       alias component current_component
-      delegate :categories, to: :current_component
 
       def map_model(model)
         self.title = translated_attribute(model.title)
@@ -50,34 +46,11 @@ module Decidim
         self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
 
         self.user_group_id = model.user_groups.first&.id
-        self.category_id = model.categorization.decidim_category_id if model.categorization
-
-        # 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.documents = model.attachments
       end
 
-      # 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 scope_id, uses participatory space scope if missing.
-      #
-      # Returns a Decidim::Scope
-      def 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
-        super || scope&.id
+      def participatory_space_manifest
+        @participatory_space_manifest ||= current_component.participatory_space.manifest.name
       end
 
       def geocoding_enabled?

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

@@ -8,9 +8,34 @@ module Decidim
           Decidim::Proposals::Proposal.find(id)
         end
 
+        # Public: Generates a select field with the templates of the given component.
+        #
+        # component - A component instance.
+        # prompt - An i18n string to show as prompt
+        #
+        # Returns a String.
+        def bulk_templates_select(component, prompt, id: nil)
+          options_for_select = find_templates_for_select(component)
+          select(:template, :template_id, options_for_select, prompt:, id:)
+        end
+
+        def find_templates_for_select(component)
+          return [] unless Decidim.module_installed? :templates
+          return @templates_for_select if @templates_for_select
+
+          templates = Decidim::Templates::Template.where(
+            target: :proposal_answer,
+            templatable: component
+          ).order(:templatable_id)
+
+          @templates_for_select = templates.map do |template|
+            [translated_attribute(template.name), template.id]
+          end
+        end
+
         # find the valuators for the current space.
         def find_valuators_for_select(participatory_space, current_user)
-          valuator_roles = participatory_space.user_roles(:valuator)
+          valuator_roles = participatory_space.user_roles(:valuator).order_by_name
           valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
 
           filtered_valuator_roles = valuator_roles.filter do |role|

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

@@ -7,7 +7,6 @@ module Decidim
       # in order to use them in select forms for Proposals.
       #
       module ProposalsHelper
-        include Decidim::Admin::ResourceScopeHelper
         include Decidim::TranslatableAttributes
 
         def available_states

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

@@ -144,8 +144,16 @@ module Decidim
         ).count
       end
 
+      def layout_item_classes
+        if show_voting_rules?
+          "layout-item lg:pt-4"
+        else
+          "layout-item"
+        end
+      end
+
       def show_voting_rules?
-        return false if !votes_enabled? || current_settings.votes_blocked?
+        return false if !votes_enabled? || votes_blocked?
 
         return true if vote_limit_enabled?
         return true if threshold_per_proposal_enabled?
@@ -206,41 +214,38 @@ module Decidim
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity
       def filter_sections
         @filter_sections ||= begin
           items = []
           if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled
-            items.append(method: :with_any_state, collection: filter_proposals_state_values, label_scope: "decidim.proposals.proposals.filters", id: "state")
+            items.append(method: :with_any_state, collection: filter_proposals_state_values, label: t("decidim.proposals.proposals.filters.state"), id: "state")
           end
-          if current_component.has_subscopes?
-            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.proposals.proposals.filters", id: "scope")
-          end
-          if current_component.categories.any?
-            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.proposals.proposals.filters", id: "category")
+          current_component.available_taxonomy_filters.each do |taxonomy_filter|
+            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                         collection: filter_taxonomy_values_for(taxonomy_filter),
+                         label: decidim_sanitize_translated(taxonomy_filter.name),
+                         id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
           if component_settings.official_proposals_enabled
-            items.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.proposals.proposals.filters", id: "origin")
+            items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.proposals.proposals.filters.origin"), id: "origin")
           end
           if current_user
-            items.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.proposals.proposals.filters", id: "activity", type: :radio_buttons)
+            items.append(method: :activity, collection: activity_filter_values, label: t("decidim.proposals.proposals.filters.activity"), id: "activity", type: :radio_buttons)
           end
           if @proposals.only_emendations.any?
-            items.append(method: :type, collection: filter_type_values, label_scope: "decidim.proposals.proposals.filters", id: "amendment_type", type: :radio_buttons)
+            items.append(method: :type, collection: filter_type_values, label: t("decidim.proposals.proposals.filters.amendment_type"), id: "amendment_type", type: :radio_buttons)
           end
           if linked_classes_for(Decidim::Proposals::Proposal).any?
             items.append(
               method: :related_to,
               collection: linked_classes_filter_values_for(Decidim::Proposals::Proposal),
-              label_scope: "decidim.proposals.proposals.filters",
+              label: t("decidim.proposals.proposals.filters.related_to"),
               id: "related_to",
               type: :radio_buttons
             )
           end
         end
-        # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/CyclomaticComplexity
-
         items.reject { |item| item[:collection].blank? }
       end
 
@@ -248,6 +253,10 @@ module Decidim
         i18n_key = controller_name == "collaborative_drafts" ? "decidim.proposals.collaborative_drafts.name" : "decidim.components.proposals.name"
         (defined?(current_component) && translated_attribute(current_component&.name).presence) || t(i18n_key)
       end
+
+      def templates_available?
+        Decidim.module_installed?(:templates) && defined?(Decidim::Templates::Template) && Decidim::Templates::Template.exists?(templatable: current_component)
+      end
     end
   end
 end

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

@@ -43,20 +43,20 @@ module Decidim
           items = [{
             method: :with_any_state,
             collection: filter_collaborative_drafts_state_values,
-            label_scope: "decidim.proposals.collaborative_drafts.filters",
+            label: t("decidim.proposals.collaborative_drafts.filters.state"),
             id: "state"
           }]
-          if current_component.has_subscopes?
-            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.proposals.collaborative_drafts.filters", id: "scope")
-          end
-          if current_component.categories.any?
-            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.proposals.collaborative_drafts.filters", id: "category")
+          current_component.available_taxonomy_filters.each do |taxonomy_filter|
+            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                         collection: filter_taxonomy_values_for(taxonomy_filter),
+                         label: decidim_sanitize_translated(taxonomy_filter.name),
+                         id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
           if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any?
             items.append(
               method: :related_to,
               collection: linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft),
-              label_scope: "decidim.proposals.collaborative_drafts.filters",
+              label: t("decidim.proposals.collaborative_drafts.filters.related_to"),
               id: "related_to",
               type: :radio_buttons
             )

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

@@ -5,24 +5,6 @@ module Decidim
     # This helper include some methods for rendering proposals dynamic maps.
     module MapHelper
       include Decidim::ApplicationHelper
-      # Serialize a collection of geocoded proposals to be used by the dynamic map component
-      #
-      # geocoded_proposals - A collection of geocoded proposals
-      def proposals_data_for_map(geocoded_proposals)
-        geocoded_proposals.map do |proposal|
-          proposal_data_for_map(proposal)
-        end
-      end
-
-      def proposal_data_for_map(proposal)
-        proposal
-          .slice(:latitude, :longitude, :address)
-          .merge(
-            title: decidim_html_escape(present(proposal).title),
-            link: proposal_path(proposal),
-            items: cell("decidim/proposals/proposal_metadata", proposal).send(:proposal_items_for_map).to_json
-          )
-      end
 
       def proposal_preview_data_for_map(proposal)
         {

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

@@ -47,14 +47,14 @@ module Decidim
       #
       # Returns true if enabled, false otherwise.
       def votes_enabled?
-        current_settings.votes_enabled
+        current_settings.respond_to?(:votes_enabled) && current_settings.votes_enabled
       end
 
       # Public: Checks if voting is blocked in this step.
       #
       # Returns true if blocked, false otherwise.
       def votes_blocked?
-        current_settings.votes_blocked
+        current_settings.respond_to?(:votes_blocked) && current_settings.votes_blocked
       end
 
       # Public: Checks if the current user is allowed to vote in this step.
@@ -76,6 +76,19 @@ module Decidim
         votes_count = ProposalVote.where(author: user, proposal: proposals).size
         component_settings.vote_limit - votes_count
       end
+
+      # Return the remaining minimum votes for a user if the current component has a vote limit
+      #
+      # user - A User object
+      #
+      # Returns a number with the remaining minimum votes for that user
+      def remaining_minimum_votes_count_for(user)
+        return 0 unless vote_limit_enabled?
+
+        votes_count = Decidim::Proposals::ProposalVote.joins(:proposal).where(decidim_proposals_proposals: { decidim_component_id: current_component.id }).where(author: user).count
+
+        component_settings.minimum_votes_per_user - votes_count
+      end
     end
   end
 end

data/app/jobs/decidim/proposals/admin/proposal_answer_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalAnswerJob < ApplicationJob
+        queue_as :default
+
+        def perform(proposal, attributes, context)
+          answer_form = ProposalAnswerForm.from_params(attributes).with_context(**context)
+
+          Admin::AnswerProposal.call(answer_form, proposal) do
+            on(:ok) { Rails.logger.info "Proposal #{proposal.id} answered successfully." }
+            on(:invalid) { Rails.logger.error "Proposal ID #{proposal.id} could not be updated. Errors: #{answer_form.errors.full_messages}" }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Decidim
     class CollaborativeDraft < Proposals::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::Coauthorable
+      include Decidim::Taxonomizable
       include Decidim::HasComponent
       include Decidim::ScopableResource
       include Decidim::HasReference
@@ -64,7 +65,15 @@ module Decidim
       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]
+        [:with_any_state, :related_to, :with_any_taxonomies]
+      end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(id_string search_text title body)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies)
       end
     end
   end

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

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::Coauthorable
       include Decidim::HasComponent
+      include Decidim::Taxonomizable
       include Decidim::ScopableResource
       include Decidim::HasReference
       include Decidim::HasCategory
@@ -28,6 +29,7 @@ module Decidim
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
       include Decidim::FilterableResource
+      include Decidim::SoftDeletable
 
       def assign_state(token)
         proposal_state = Decidim::Proposals::ProposalState.where(component:, token:).first
@@ -402,18 +404,22 @@ module Decidim
         where(query, value:)
       end
 
-      def self.ransackable_scopes(auth_object = nil)
-        base = [:with_any_origin, :with_any_state, :state_eq, :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]
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_taxonomies, :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]
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(id_string search_text title body is_emendation comments_count proposal_votes_count published_at proposal_notes_count)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies proposal_state)
+      end
+
       ransacker :state_published do
         Arel.sql("CASE
           WHEN EXISTS (
@@ -459,7 +465,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Proposals::ProposalSerializer
+        Decidim::Proposals::DownloadYourDataProposalSerializer
       end
 
       def self.download_your_data_images(user)
@@ -476,8 +482,18 @@ module Decidim
         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
+        time_value, time_unit = component.settings.edit_time
+
+        limit_time = case time_unit
+                     when "minutes"
+                       updated_at + time_value.minutes
+                     when "hours"
+                       updated_at + time_value.hours
+                     else
+                       updated_at + time_value.days
+                     end
+
+        Time.current < limit_time
       end
 
       def process_amendment_state_change!
@@ -490,10 +506,51 @@ module Decidim
         end
       end
 
+      def user_has_actions?(user)
+        return false if authors.include?(user)
+        return false if user&.blocked?
+        return false if user&.deleted?
+        return false unless user&.confirmed?
+
+        true
+      end
+
+      def actions_for_comment(comment, current_user)
+        return if comment.commentable != self
+        return unless authors.include?(current_user)
+        return unless user_has_actions?(comment.author)
+
+        if coauthor_invitations_for(comment.author).any?
+          [
+            {
+              label: I18n.t("decidim.proposals.actions.cancel_coauthor_invitation"),
+              url: EngineRouter.main_proxy(component).cancel_proposal_invite_coauthors_path(proposal_id: id, id: comment.author.id),
+              icon: "user-forbid-line",
+              method: :delete,
+              data: { confirm: I18n.t("decidim.proposals.actions.cancel_coauthor_invitation_confirm") }
+            }
+          ]
+        else
+          [
+            {
+              label: I18n.t("decidim.proposals.actions.mark_as_coauthor"),
+              url: EngineRouter.main_proxy(component).proposal_invite_coauthors_path(proposal_id: id, id: comment.author.id),
+              icon: "user-add-line",
+              method: :post,
+              data: { confirm: I18n.t("decidim.proposals.actions.mark_as_coauthor_confirm") }
+            }
+          ]
+        end
+      end
+
+      def coauthor_invitations_for(user)
+        Decidim::Notification.where(event_class: "Decidim::Proposals::CoauthorInvitedEvent", resource: self, user:)
+      end
+
       private
 
       def copied_from_other_component?
-        linked_resources(:proposals, "copied_from_component").any?
+        linked_resources(:proposals, %w(splitted_from_component merged_from_component copied_from_component)).any?
       end
     end
   end