decidim-proposals 0.30.5 → 0.31.0.rc1

data/db/migrate/20240110203504_create_default_proposal_states.rb

@@ -10,7 +10,7 @@ class CreateDefaultProposalStates < ActiveRecord::Migration[6.1]
 
     self.table_name = :decidim_proposals_proposals
     STATES = { not_answered: 0, evaluating: 10, accepted: 20, rejected: -10 }.freeze
-    enum old_state: STATES, _default: "not_answered"
+    enum :old_state, STATES, default: "not_answered"
   end
 
   def up

data/db/migrate/20250121110014_rename_proposal_valuation_assignments_to_evaluation_assignments.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RenameProposalValuationAssignmentsToEvaluationAssignments < ActiveRecord::Migration[7.0]
+  def change
+    rename_table :decidim_proposals_valuation_assignments, :decidim_proposals_evaluation_assignments
+
+    rename_index :decidim_proposals_evaluation_assignments,
+                 "decidim_proposals_valuation_assignment_proposal",
+                 "decidim_proposals_evaluation_assignment_proposal"
+
+    rename_index :decidim_proposals_evaluation_assignments,
+                 "decidim_proposals_valuation_assignment_valuator_role",
+                 "decidim_proposals_evaluation_assignment_valuator_role"
+  end
+end

data/db/migrate/20250121110904_rename_valuation_assignments_count_to_evaluation_assignments_count.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RenameValuationAssignmentsCountToEvaluationAssignmentsCount < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :decidim_proposals_proposals, :valuation_assignments_count, :evaluation_assignments_count
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Proposals::Proposal.reset_column_information
+        Decidim::Proposals::Proposal.unscoped.find_each do |record|
+          Decidim::Proposals::Proposal.reset_counters(record.id, :evaluation_assignments)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20250211141313_rename_valuator_columns.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RenameValuatorColumns < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :decidim_proposals_evaluation_assignments, :valuator_role_type, :evaluator_role_type
+    rename_column :decidim_proposals_evaluation_assignments, :valuator_role_id, :evaluator_role_id
+  end
+end

data/db/migrate/20250515132351_rename_proposals_endorsements_count_to_likes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameProposalsEndorsementsCountToLikes < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :decidim_proposals_proposals, :endorsements_count, :likes_count
+  end
+end

data/decidim-proposals.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-comments", Decidim::Proposals.version
   s.add_dependency "decidim-core", Decidim::Proposals.version
-  s.add_dependency "doc2text", "~> 0.4.7"
+  s.add_dependency "doc2text", "~> 0.4.0", ">= 0.4.8"
   s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
 
   s.add_development_dependency "decidim-admin", Decidim::Proposals.version

data/lib/decidim/api/mutations/answer_proposal_attributes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class AnswerProposalAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "ProposalAttributes"
+      description "Attributes of a proposal"
+
+      argument :answer_content, GraphQL::Types::JSON, description: "The answer feedback for the status for this proposal", required: false
+      argument :cost, GraphQL::Types::Float, description: "Estimated cost of the proposal", required: false
+      argument :cost_report, GraphQL::Types::JSON, description: "Report on expenses", required: false
+      argument :execution_period, GraphQL::Types::JSON, description: "Report on the execution period", required: false
+      argument :state, GraphQL::Types::String,
+               description: "The answer status in which the proposal is in. Can be one of 'accepted', 'rejected' or 'evaluating'", required: false
+    end
+  end
+end

data/lib/decidim/api/mutations/proposal_answer_type.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalAnswerType < Decidim::Api::Types::BaseMutation
+      graphql_name "Answer"
+
+      description "Answers a proposal"
+      type Decidim::Proposals::ProposalType
+
+      argument :attributes, AnswerProposalAttributes, description: "input attributes of a proposal", required: true
+
+      def resolve(attributes:)
+        answer_content = attributes.to_h.fetch(:answer_content, object.answer)
+        internal_state = attributes.to_h.fetch(:state, object.internal_state)
+        params = attributes.to_h.reverse_merge(
+          internal_state:,
+          answer: answer_content,
+          cost: object.cost,
+          cost_report: object.cost_report,
+          execution_period: object.execution_period
+        )
+
+        form = Decidim::Proposals::Admin::ProposalAnswerForm.from_params(
+          params
+        ).with_context(
+          current_component: object.component,
+          current_user:,
+          current_organization: current_user.organization
+        )
+
+        Admin::AnswerProposal.call(form, object) do
+          on(:ok) do
+            return object
+          end
+          on(:invalid) do
+            return GraphQL::ExecutionError.new(
+              form.errors.full_messages.join(", ")
+            )
+          end
+
+          GraphQL::ExecutionError.new(
+            I18n.t("decidim.proposals.admin.proposals.answer.invalid")
+          )
+        end
+      end
+
+      def authorized?(attributes:)
+        super && allowed_to?(:create, :proposal_answer, object, context, scope: :admin)
+      end
+
+      def current_user
+        context[:current_user]
+      end
+    end
+  end
+end

data/lib/decidim/api/mutations/proposal_mutation_type.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalMutationType < Decidim::Api::Types::BaseObject
+      include Decidim::ApiResponseHelper
+
+      graphql_name "ProposalMutation"
+      description "a proposal which includes its available mutations"
+
+      field :answer, mutation: Decidim::Proposals::ProposalAnswerType, description: "Answers a proposal"
+    end
+  end
+end

data/lib/decidim/api/mutations/proposals_mutation_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalsMutationType < Decidim::Core::ComponentType
+      description "A proposals of a component."
+
+      field :proposal, type: Decidim::Proposals::ProposalMutationType, description: "Mutates a proposal", null: true do
+        argument :id, GraphQL::Types::ID, "The ID of the proposal", required: true
+      end
+
+      def proposal(id:)
+        collection.find(id)
+      end
+
+      private
+
+      def collection
+        Proposal.where(component: object).not_hidden.published
+      end
+    end
+  end
+end

data/lib/decidim/api/proposal_input_sort.rb

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     class ProposalInputSort < Decidim::Core::BaseInputSort
       include Decidim::Core::HasPublishableInputSort
-      include Decidim::Core::HasEndorsableInputSort
+      include Decidim::Core::HasLikeableInputSort
 
       graphql_name "ProposalSort"
       description "A type used for sorting proposals"

data/lib/decidim/api/proposal_state_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalStateType < Decidim::Api::Types::BaseObject
+      description "A proposal state"
+
+      field :announcement_title, Decidim::Core::TranslatedFieldType, "The announcement for this proposal state", null: true
+      field :bg_color, GraphQL::Types::String, description: "The background color of proposal state label", null: true
+      field :id, GraphQL::Types::ID, "The id of the proposal state", null: false
+      field :proposals_count, GraphQL::Types::Int, "The number of proposals having this state", null: true
+      field :text_color, GraphQL::Types::String, description: "The text color of this proposal state label", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this proposal state", null: true
+    end
+  end
+end

data/lib/decidim/api/proposal_type.rb

@@ -3,6 +3,8 @@
 module Decidim
   module Proposals
     class ProposalType < Decidim::Api::Types::BaseObject
+      include ActiveSupport::NumberHelper
+
       description "A proposal"
 
       implements Decidim::Comments::CommentableInterface
@@ -13,39 +15,77 @@ module Decidim
       implements Decidim::Core::AmendableInterface
       implements Decidim::Core::AmendableEntityInterface
       implements Decidim::Core::TraceableInterface
-      implements Decidim::Core::EndorsableInterface
+      implements Decidim::Core::LikeableInterface
       implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::ReferableInterface
+      implements Decidim::Core::LocalizableInterface
+      implements Decidim::Core::FollowableInterface
 
-      field :address, GraphQL::Types::String, "The physical address (location) of this proposal", null: true
       field :answer, Decidim::Core::TranslatedFieldType, "The answer feedback for the status for this proposal", null: true
       field :answered_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was answered", null: true
       field :body, Decidim::Core::TranslatedFieldType, "The description for this body", null: true
-      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal", null: true
+      field :cost, GraphQL::Types::String, "The proposal cost", null: true
+      field :cost_report, Decidim::Core::TranslatedFieldType, "The cost report for this proposal", null: true
       field :created_in_meeting, GraphQL::Types::Boolean, "Whether this proposal comes from a meeting or not", method: :official_meeting?, null: true
+      field :execution_period, Decidim::Core::TranslatedFieldType, "The execution period for this proposal", null: true
       field :id, GraphQL::Types::ID, "The id of the Proposal", null: false
       field :meeting, Decidim::Meetings::MeetingType, description: "If the proposal comes from a meeting, the related meeting", null: true
       field :official, GraphQL::Types::Boolean, "Whether this proposal is official or not", method: :official?, null: true
       field :participatory_text_level, GraphQL::Types::String, description: "If it is a participatory text, the level indicates the type of paragraph", null: true
       field :position, GraphQL::Types::Int, "Position of this proposal in the participatory text", null: true
+      field :proposal_state, Decidim::Proposals::ProposalStateType, "The proposal state for this proposal", null: true
       field :published_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was published", null: true
-      field :reference, GraphQL::Types::String, "This proposal's unique reference", null: true
       field :state, GraphQL::Types::String, "The answer status in which proposal is in", null: true
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this title", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this proposal", null: true
       field :vote_count, GraphQL::Types::Int, description: "The total amount of votes the proposal has received", null: true
       field :withdrawn, GraphQL::Types::Boolean, "Whether this proposal has been withdrawn or not", method: :withdrawn?, null: true
       field :withdrawn_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was withdrawn", null: true
 
-      def coordinates
-        [object.latitude, object.longitude]
+      field :url, GraphQL::Types::String, "The URL for this proposal", null: false
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(object).url
+      end
+
+      def answered_at
+        return unless object.published_state?
+
+        object.answered_at
+      end
+
+      def answer
+        return unless object.published_state?
+
+        object.answer
       end
 
       def meeting
         object.authors.first if object.official_meeting?
       end
 
+      def cost_report
+        return unless object.published_state?
+        return unless proposal_has_costs? && current_settings.answers_with_costs?
+
+        object.cost_report
+      end
+
+      def execution_period
+        return unless object.published_state?
+        return unless proposal_has_costs? && current_settings.answers_with_costs?
+
+        object.execution_period
+      end
+
+      def cost
+        return unless object.published_state?
+        return unless proposal_has_costs? && current_settings.answers_with_costs?
+
+        number_to_currency(object.cost, unit: Decidim.currency_unit)
+      end
+
       def vote_count
-        current_component = object.component
-        object.proposal_votes_count unless current_component.current_settings.votes_hidden?
+        object.proposal_votes_count unless current_settings.votes_hidden?
       end
 
       def self.authorized?(object, context)
@@ -60,6 +100,16 @@ module Decidim
       rescue Decidim::PermissionAction::PermissionNotSetError
         false
       end
+
+      private
+
+      def current_settings
+        object.component.current_settings
+      end
+
+      def proposal_has_costs?
+        object.cost.present?
+      end
     end
   end
 end

data/lib/decidim/proposals/admin_engine.rb

@@ -13,7 +13,7 @@ module Decidim
 
       routes do
         resources :proposals, only: [:show, :index, :new, :create, :edit, :update] do
-          resources :valuation_assignments, only: [:destroy]
+          resources :evaluation_assignments, only: [:destroy]
           member do
             patch :soft_delete
             patch :restore
@@ -24,9 +24,9 @@ module Decidim
             post :update_multiple_answers, controller: "proposal_answers"
             get :manage_trash, controller: "proposals"
             resource :proposals_import, only: [:new, :create]
-            resource :proposals_merge, only: [:create]
+            resource :proposals_merge, only: [:new, :create]
             resource :proposals_split, only: [:create]
-            resource :valuation_assignment, only: [:create, :destroy]
+            resource :evaluation_assignment, only: [:create, :destroy]
           end
           resources :proposal_answers, only: [:edit, :update]
           resources :proposal_notes, only: [:create] do

data/lib/decidim/proposals/admin_filter.rb

@@ -10,7 +10,7 @@ module Decidim
             :state_eq,
             :with_any_state,
             :taxonomies_part_of_contains,
-            :valuator_role_ids_has
+            :evaluator_role_ids_has
           )
 
           configuration.add_filters_with_values(
@@ -18,11 +18,11 @@ module Decidim
             state_eq: state_eq_values,
             with_any_state: %w(state_published state_not_published),
             taxonomies_part_of_contains: taxonomy_ids_hash(available_root_taxonomies),
-            valuator_role_ids_has: valuator_role_ids
+            evaluator_role_ids_has: evaluator_role_ids
           )
 
           configuration.add_dynamically_translated_filters(
-            :valuator_role_ids_has,
+            :evaluator_role_ids_has,
             :proposal_state_id_eq,
             :taxonomies_part_of_contains,
             :state_eq

data/lib/decidim/proposals/api.rb

@@ -6,5 +6,10 @@ module Decidim
     autoload :ProposalInputSort, "decidim/api/proposal_input_sort"
     autoload :ProposalType, "decidim/api/proposal_type"
     autoload :ProposalsType, "decidim/api/proposals_type"
+    autoload :ProposalStateType, "decidim/api/proposal_state_type"
+    autoload :ProposalsMutationType, "decidim/api/mutations/proposals_mutation_type"
+    autoload :ProposalMutationType, "decidim/api/mutations/proposal_mutation_type"
+    autoload :ProposalAnswerType, "decidim/api/mutations/proposal_answer_type"
+    autoload :AnswerProposalAttributes, "decidim/api/mutations/answer_proposal_attributes"
   end
 end

data/lib/decidim/proposals/component.rb

@@ -16,29 +16,17 @@ Decidim.register_component(:proposals) do |component|
     Decidim::Proposals.create_default_states!(instance, admin_user)
   end
 
-  component.on(:publish) do |instance|
-    Decidim::Proposals::Proposal.where(component: instance).find_in_batches(batch_size: 100) do |batch|
-      Decidim::UpdateSearchIndexesJob.perform_later(batch)
-    end
-  end
-
-  component.on(:unpublish) do |instance|
-    Decidim::Proposals::Proposal.where(component: instance).find_in_batches(batch_size: 100) do |batch|
-      Decidim::RemoveSearchIndexesJob.perform_later(batch)
-    end
-  end
-
   component.data_portable_entities = ["Decidim::Proposals::Proposal"]
 
   component.newsletter_participant_entities = ["Decidim::Proposals::Proposal"]
 
-  component.actions = %w(endorse vote create withdraw amend comment vote_comment)
+  component.actions = %w(like vote create withdraw amend comment vote_comment)
 
   component.query_type = "Decidim::Proposals::ProposalsType"
 
   component.permissions_class_name = "Decidim::Proposals::Permissions"
 
-  POSSIBLE_SORT_ORDERS = %w(automatic random recent most_endorsed most_voted most_commented most_followed with_more_authors).freeze
+  POSSIBLE_SORT_ORDERS = %w(automatic random recent most_liked most_voted most_commented most_followed with_more_authors).freeze
 
   component.settings(:global) do |settings|
     settings.attribute :taxonomy_filters, type: :taxonomy_filters
@@ -46,12 +34,12 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :minimum_votes_per_user, type: :integer, default: 0, required: true
     settings.attribute :proposal_limit, type: :integer, default: 0, required: true
     settings.attribute :proposal_length, type: :integer, default: 500
-    settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(infinite limited) }
+    settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: ->(_context) { %w(infinite limited) }
     settings.attribute :edit_time, type: :integer_with_units, default: [5, "minutes"], required: true, units: %w(minutes hours days)
     settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
     settings.attribute :can_accumulate_votes_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
-    settings.attribute :default_sort_order, type: :select, default: "automatic", choices: -> { POSSIBLE_SORT_ORDERS }
+    settings.attribute :default_sort_order, type: :select, default: "automatic", choices: ->(_context) { POSSIBLE_SORT_ORDERS }
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: true
@@ -75,8 +63,8 @@ Decidim.register_component(:proposals) do |component|
   end
 
   component.settings(:step) do |settings|
-    settings.attribute :endorsements_enabled, type: :boolean, default: true
-    settings.attribute :endorsements_blocked, type: :boolean
+    settings.attribute :likes_enabled, type: :boolean, default: true
+    settings.attribute :likes_blocked, type: :boolean
     settings.attribute :votes_enabled, type: :boolean
     settings.attribute :votes_blocked, type: :boolean
     settings.attribute :votes_hidden, type: :boolean, default: false
@@ -85,16 +73,14 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :publish_answers_immediately, type: :boolean, default: true
     settings.attribute :answers_with_costs, type: :boolean, default: false
-    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
+    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: ->(_context) { POSSIBLE_SORT_ORDERS }
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
     settings.attribute :amendments_visibility,
                        type: :enum, default: "all",
-                       choices: -> { Decidim.config.amendments_visibility_options }
+                       choices: ->(_context) { Decidim.config.amendments_visibility_options }
     settings.attribute :announcement, type: :text, translated: true, editor: true
-    settings.attribute :automatic_hashtags, type: :text, editor: false, required: false
-    settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
   end
 
   component.register_resource(:proposal) do |resource|
@@ -102,7 +88,7 @@ Decidim.register_component(:proposals) do |component|
     resource.template = "decidim/proposals/proposals/linked_proposals"
     resource.card = "decidim/proposals/proposal"
     resource.reported_content_cell = "decidim/proposals/reported_content"
-    resource.actions = %w(endorse vote amend comment vote_comment)
+    resource.actions = %w(like vote amend comment vote_comment)
     resource.searchable = true
   end
 
@@ -112,30 +98,55 @@ Decidim.register_component(:proposals) do |component|
     resource.reported_content_cell = "decidim/proposals/collaborative_drafts/reported_content"
   end
 
-  component.register_stat :proposals_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :proposals_count,
+                          primary: true,
+                          admin: false,
+                          priority: Decidim::StatsRegistry::HIGH_PRIORITY,
+                          icon_name: "chat-new-line",
+                          tooltip_key: "proposals_count_tooltip" do |components, start_at, end_at|
     Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_withdrawn.not_hidden.count
   end
 
-  component.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :participatory_space_proposals_count,
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                          sub_title: "votes",
+                          icon_name: "chat-new-line",
+                          tooltip_key: "proposals_count_tooltip" do |components, start_at, end_at|
+    proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_withdrawn.not_hidden
+    [
+      proposals.count,
+      Decidim::Proposals::ProposalVote.where(proposal: proposals).count
+    ]
+  end
+
+  component.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
     Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.not_hidden.count
   end
 
-  component.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :votes_count, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
 
-  component.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+  component.register_stat :likes_count, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).not_hidden
-    proposals.sum(:endorsements_count)
+    proposals.sum(:likes_count)
   end
 
-  component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|
+  component.register_stat :comments_count,
+                          priority: Decidim::StatsRegistry::HIGH_PRIORITY,
+                          icon_name: "chat-1-line",
+                          tooltip_key: "comments_count",
+                          tag: :comments do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden
     proposals.sum(:comments_count)
   end
 
-  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+  component.register_stat :followers_count,
+                          tag: :followers,
+                          icon_name: "user-follow-line",
+                          tooltip_key: "followers_count_tooltip",
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     proposals_ids = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden.pluck(:id)
     Decidim::Follow.where(decidim_followable_type: "Decidim::Proposals::Proposal", decidim_followable_id: proposals_ids).count
   end
@@ -150,8 +161,8 @@ Decidim.register_component(:proposals) do |component|
                    .where(component: component_instance)
                    .includes(:taxonomies, :component)
 
-      if space.user_roles(:valuator).where(user:).any?
-        collection.with_valuation_assigned_to(user, space)
+      if space.user_roles(:evaluator).where(user:).any?
+        collection.with_evaluation_assigned_to(user, space)
       else
         collection
       end
@@ -166,7 +177,7 @@ Decidim.register_component(:proposals) do |component|
     exports.collection do |component_instance|
       Decidim::Comments::Export.comments_for_resource(
         Decidim::Proposals::Proposal, component_instance
-      ).includes(:author, :user_group, root_commentable: { component: { participatory_space: :organization } })
+      ).includes(:author, root_commentable: { component: { participatory_space: :organization } })
     end
 
     exports.include_in_open_data = true
@@ -175,9 +186,6 @@ Decidim.register_component(:proposals) do |component|
   end
 
   component.imports :proposals do |imports|
-    imports.form_view = "decidim/proposals/admin/imports/proposals_fields"
-    imports.form_class_name = "Decidim::Proposals::Admin::ProposalsFileImportForm"
-
     imports.messages do |msg|
       msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.proposals", count:) }
       msg.set(:title) { I18n.t("decidim.proposals.admin.imports.title.proposals") }