decidim-proposals 0.30.3 → 0.31.0.rc2

data/lib/decidim/proposals/test/factories.rb

@@ -29,18 +29,18 @@ FactoryBot.define do
       Decidim::Proposals.create_default_states!(proposal_component, nil, with_traceability: false)
     end
 
-    trait :with_endorsements_enabled do
+    trait :with_likes_enabled do
       step_settings do
         {
-          participatory_space.active_step.id => { endorsements_enabled: true }
+          participatory_space.active_step.id => { likes_enabled: true }
         }
       end
     end
 
-    trait :with_endorsements_disabled do
+    trait :with_likes_disabled do
       step_settings do
         {
-          participatory_space.active_step.id => { endorsements_enabled: false }
+          participatory_space.active_step.id => { likes_enabled: false }
         }
       end
     end
@@ -105,12 +105,12 @@ FactoryBot.define do
       end
     end
 
-    trait :with_endorsements_blocked do
+    trait :with_likes_blocked do
       step_settings do
         {
           participatory_space.active_step.id => {
-            endorsements_enabled: true,
-            endorsements_blocked: true
+            likes_enabled: true,
+            likes_blocked: true
           }
         }
       end
@@ -233,23 +233,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_extra_hashtags do
-      transient do
-        automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
-        suggested_hashtags { "SuggestedHashtag AnotherSuggestedHashtag" }
-      end
-
-      step_settings do
-        {
-          participatory_space.active_step.id => {
-            automatic_hashtags:,
-            suggested_hashtags:,
-            creation_enabled: true
-          }
-        }
-      end
-    end
-
     trait :without_publish_answers_immediately do
       step_settings do
         {
@@ -296,8 +279,6 @@ FactoryBot.define do
   factory :proposal, class: "Decidim::Proposals::Proposal" do
     transient do
       users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
       skip_injection { false }
       state { :not_answered }
     end
@@ -334,14 +315,13 @@ FactoryBot.define do
                         evaluator.body
                       end
 
-      proposal.title = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.title, current_organization: proposal.organization).rewrite
-      proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
+      proposal.title = Decidim::ContentProcessor.parse(proposal.title, current_organization: proposal.organization).rewrite
+      proposal.body = Decidim::ContentProcessor.parse_with_processor(:inline_images, proposal.body, current_organization: proposal.organization).rewrite
 
       if proposal.component
         users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
-        users.each_with_index do |user, idx|
-          user_group = evaluator.user_groups[idx]
-          proposal.coauthorships.build(author: user, user_group:)
+        users.each do |user|
+          proposal.coauthorships.build(author: user)
         end
       end
     end
@@ -362,15 +342,6 @@ FactoryBot.define do
       end
     end
 
-    trait :user_group_author do
-      after :build do |proposal, evaluator|
-        proposal.coauthorships.clear
-        user = create(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
-        user_group = create(:user_group, :verified, organization: user.organization, users: [user], skip_injection: evaluator.skip_injection)
-        proposal.coauthorships.build(author: user, user_group:)
-      end
-    end
-
     trait :official do
       after :build do |proposal|
         proposal.coauthorships.clear
@@ -410,9 +381,9 @@ FactoryBot.define do
 
     trait :accepted_not_published do
       state { :accepted }
+      answer { generate_localized_title }
       answered_at { Time.current }
       state_published_at { nil }
-      answer { generate_localized_title }
     end
 
     trait :with_answer do
@@ -442,12 +413,12 @@ FactoryBot.define do
       end
     end
 
-    trait :with_endorsements do
+    trait :with_likes do
       after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal,
-                               author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
-                               skip_injection: evaluator.skip_injection)
+          create(:like, resource: proposal,
+                        author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
+                        skip_injection: evaluator.skip_injection)
         end
       end
     end
@@ -514,8 +485,6 @@ FactoryBot.define do
     transient do
       skip_injection { false }
       users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
     end
 
     title { generate_localized_title(:collaborative_draft_title, skip_injection:)["en"] }
@@ -527,9 +496,8 @@ FactoryBot.define do
     after(:build) do |collaborative_draft, evaluator|
       if collaborative_draft.component
         users = evaluator.users || [create(:user, organization: collaborative_draft.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
-        users.each_with_index do |user, idx|
-          user_group = evaluator.user_groups[idx]
-          collaborative_draft.coauthorships.build(author: user, user_group:)
+        users.each do |user|
+          collaborative_draft.coauthorships.build(author: user)
         end
       end
     end
@@ -566,15 +534,15 @@ FactoryBot.define do
     component { create(:proposal_component, skip_injection:) }
   end
 
-  factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+  factory :evaluation_assignment, class: "Decidim::Proposals::EvaluationAssignment" do
     transient do
       skip_injection { false }
     end
     proposal
-    valuator_role do
+    evaluator_role do
       space = proposal.component.participatory_space
       organization = space.organization
-      build(:participatory_process_user_role, role: :valuator, skip_injection:, user: build(:user, organization:, skip_injection:))
+      build(:participatory_process_user_role, role: :evaluator, skip_injection:, user: build(:user, organization:, skip_injection:))
     end
   end
 end

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.30.3"
+      "0.31.0.rc2"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -22,20 +22,20 @@ module Decidim
     autoload :ParticipatoryTextSection, "decidim/proposals/participatory_text_section"
     autoload :DocToMarkdown, "decidim/proposals/doc_to_markdown"
     autoload :OdtToMarkdown, "decidim/proposals/odt_to_markdown"
-    autoload :Valuatable, "decidim/proposals/valuatable"
+    autoload :Evaluable, "decidim/proposals/evaluable"
 
     include ActiveSupport::Configurable
 
     # Public Setting that defines how many proposals will be shown in the
     # participatory_space_highlighted_elements view hook
     config_accessor :participatory_space_highlighted_proposals_limit do
-      4
+      Decidim::Env.new("PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT", 4).to_i
     end
 
     # Public Setting that defines how many proposals will be shown in the
     # process_group_highlighted_elements view hook
     config_accessor :process_group_highlighted_proposals_limit do
-      3
+      Decidim::Env.new("PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT", 3).to_i
     end
 
     def self.proposal_states_colors

data/lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake

@@ -37,29 +37,29 @@ namespace :decidim_proposals do
       puts "FINISHED"
     end
 
-    desc "Removes all proposal valuator records of which the role assignment does not exists"
-    task remove_valuator_orphan_records: :environment do
+    desc "Removes all proposal evaluator records of which the role assignment does not exists"
+    task remove_evaluator_orphan_records: :environment do
       if Decidim.module_installed?("participatory_processes")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::ParticipatoryProcessUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::ParticipatoryProcessUserRole")
           .where
-          .not(valuator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
           .destroy_all
       end
 
       if Decidim.module_installed?("assemblies")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::AssemblyUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::AssemblyUserRole")
           .where
-          .not(valuator_role_id: Decidim::AssemblyUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::AssemblyUserRole.pluck(:id))
           .destroy_all
       end
 
       if Decidim.module_installed?("conferences")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::ConferenceUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::ConferenceUserRole")
           .where
-          .not(valuator_role_id: Decidim::ConferenceUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::ConferenceUserRole.pluck(:id))
           .destroy_all
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.30.3
+  version: 0.31.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,42 +18,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +86,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -224,7 +230,7 @@ files:
 - app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
 - app/commands/decidim/proposals/accept_coauthorship.rb
 - app/commands/decidim/proposals/admin/answer_proposal.rb
-- app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
+- app/commands/decidim/proposals/admin/assign_proposals_to_evaluator.rb
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/admin/create_proposal_note.rb
 - app/commands/decidim/proposals/admin/create_proposal_state.rb
@@ -239,7 +245,7 @@ files:
 - app/commands/decidim/proposals/admin/publish_participatory_text.rb
 - app/commands/decidim/proposals/admin/reply_proposal_note.rb
 - app/commands/decidim/proposals/admin/split_proposals.rb
-- app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
+- app/commands/decidim/proposals/admin/unassign_proposals_from_evaluator.rb
 - app/commands/decidim/proposals/admin/update_participatory_text.rb
 - app/commands/decidim/proposals/admin/update_proposal.rb
 - app/commands/decidim/proposals/admin/update_proposal_state.rb
@@ -249,7 +255,6 @@ files:
 - app/commands/decidim/proposals/create_proposal.rb
 - app/commands/decidim/proposals/destroy_proposal.rb
 - app/commands/decidim/proposals/gallery_methods.rb
-- app/commands/decidim/proposals/hashtags_methods.rb
 - app/commands/decidim/proposals/invite_coauthor.rb
 - app/commands/decidim/proposals/publish_collaborative_draft.rb
 - app/commands/decidim/proposals/publish_proposal.rb
@@ -267,6 +272,7 @@ files:
 - app/controllers/concerns/decidim/proposals/collaborative_orderable.rb
 - app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
+- app/controllers/decidim/proposals/admin/evaluation_assignments_controller.rb
 - app/controllers/decidim/proposals/admin/participatory_texts_controller.rb
 - app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
 - app/controllers/decidim/proposals/admin/proposal_notes_controller.rb
@@ -275,7 +281,6 @@ files:
 - app/controllers/decidim/proposals/admin/proposals_imports_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_merges_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_splits_controller.rb
-- app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
 - app/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller.rb
 - app/controllers/decidim/proposals/collaborative_drafts_controller.rb
@@ -284,7 +289,7 @@ files:
 - app/controllers/decidim/proposals/proposals_controller.rb
 - app/controllers/decidim/proposals/versions_controller.rb
 - app/events/decidim/proposals/accepted_coauthorship_event.rb
-- app/events/decidim/proposals/admin/proposal_assigned_to_valuator_event.rb
+- app/events/decidim/proposals/admin/proposal_assigned_to_evaluator_event.rb
 - app/events/decidim/proposals/admin/proposal_note_created_event.rb
 - app/events/decidim/proposals/coauthor_accepted_invite_event.rb
 - app/events/decidim/proposals/coauthor_invited_event.rb
@@ -297,8 +302,9 @@ files:
 - app/events/decidim/proposals/collaborative_draft_access_requester_rejected_event.rb
 - app/events/decidim/proposals/collaborative_draft_withdrawn_event.rb
 - app/events/decidim/proposals/creation_enabled_event.rb
-- app/events/decidim/proposals/endorsing_enabled_event.rb
-- app/events/decidim/proposals/proposal_endorsed_event.rb
+- app/events/decidim/proposals/liking_enabled_event.rb
+- app/events/decidim/proposals/merged_proposal_event.rb
+- app/events/decidim/proposals/proposal_liked_event.rb
 - app/events/decidim/proposals/proposal_mentioned_event.rb
 - app/events/decidim/proposals/proposal_state_changed_event.rb
 - app/events/decidim/proposals/publish_proposal_event.rb
@@ -307,6 +313,7 @@ files:
 - app/events/decidim/proposals/voting_enabled_event.rb
 - app/forms/decidim/proposals/accept_access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/access_to_collaborative_draft_form.rb
+- app/forms/decidim/proposals/admin/evaluation_assignment_form.rb
 - app/forms/decidim/proposals/admin/import_participatory_text_form.rb
 - app/forms/decidim/proposals/admin/participatory_text_proposal_form.rb
 - app/forms/decidim/proposals/admin/preview_participatory_text_form.rb
@@ -315,12 +322,10 @@ files:
 - app/forms/decidim/proposals/admin/proposal_form.rb
 - app/forms/decidim/proposals/admin/proposal_note_form.rb
 - app/forms/decidim/proposals/admin/proposal_state_form.rb
-- app/forms/decidim/proposals/admin/proposals_file_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_fork_form.rb
 - app/forms/decidim/proposals/admin/proposals_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_merge_form.rb
 - app/forms/decidim/proposals/admin/proposals_split_form.rb
-- app/forms/decidim/proposals/admin/valuation_assignment_form.rb
 - app/forms/decidim/proposals/collaborative_draft_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb
@@ -347,12 +352,12 @@ files:
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/collaborative_draft.rb
 - app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
+- app/models/decidim/proposals/evaluation_assignment.rb
 - app/models/decidim/proposals/participatory_text.rb
 - app/models/decidim/proposals/proposal.rb
 - app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_state.rb
 - app/models/decidim/proposals/proposal_vote.rb
-- app/models/decidim/proposals/valuation_assignment.rb
 - app/packs/documents/decidim/proposals/participatory_texts/participatory_text.md
 - app/packs/documents/decidim/proposals/participatory_texts/participatory_text.odt
 - app/packs/entrypoints/decidim_proposals.js
@@ -367,6 +372,7 @@ files:
 - app/packs/src/decidim/proposals/add_proposal.js
 - app/packs/src/decidim/proposals/admin/proposals.js
 - app/packs/src/decidim/proposals/admin/proposals_form.js
+- app/packs/src/decidim/proposals/admin/proposals_merge.js
 - app/packs/src/decidim/proposals/choose_proposals.js
 - app/packs/src/decidim/proposals/exit_handler.js
 - app/packs/src/decidim/proposals/utils.js
@@ -374,24 +380,18 @@ files:
 - app/packs/stylesheets/decidim/proposals/proposals.scss
 - app/permissions/decidim/proposals/admin/permissions.rb
 - app/permissions/decidim/proposals/permissions.rb
+- app/presenters/decidim/proposals/admin_log/evaluation_assignment_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_state_presenter.rb
-- app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb
+- app/presenters/decidim/proposals/admin_log/value_types/evaluator_role_user_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_state_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
-- app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb
 - app/presenters/decidim/proposals/collaborative_draft_presenter.rb
-- app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb
+- app/presenters/decidim/proposals/log/evaluation_assignment_presenter.rb
 - app/presenters/decidim/proposals/official_author_presenter.rb
 - app/presenters/decidim/proposals/proposal_presenter.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
-- app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb
-- app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb
-- app/queries/decidim/proposals/metrics/proposal_followers_metric_measure.rb
-- app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb
-- app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
-- app/queries/decidim/proposals/metrics/votes_metric_manage.rb
 - app/services/decidim/proposals/collaborative_draft_diff_renderer.rb
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
@@ -399,7 +399,6 @@ files:
 - app/validators/proposal_length_validator.rb
 - app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb
 - app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb
-- app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/index.html.erb
@@ -416,21 +415,21 @@ files:
 - app/views/decidim/proposals/admin/proposals/_actions.html.erb
 - app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/proposals/_documents.html.erb
-- app/views/decidim/proposals/admin/proposals/_endorsers.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
+- app/views/decidim/proposals/admin/proposals/_likes.html.erb
 - app/views/decidim/proposals/admin/proposals/_meetings.html.erb
 - app/views/decidim/proposals/admin/proposals/_photos.html.erb
 - app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
 - app/views/decidim/proposals/admin/proposals/_proposals-thead.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_apply_answer_template.html.erb
-- app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_evaluator.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_evaluators_picker.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_taxonomy_change.html.erb
-- app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb
-- app/views/decidim/proposals/admin/proposals/bulk_actions/_valuators_picker.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_evaluator.html.erb
 - app/views/decidim/proposals/admin/proposals/edit.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - app/views/decidim/proposals/admin/proposals/manage_trash.html.erb
@@ -439,6 +438,8 @@ files:
 - app/views/decidim/proposals/admin/proposals/show.html.erb
 - app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
 - app/views/decidim/proposals/admin/proposals_imports/new.html.erb
+- app/views/decidim/proposals/admin/proposals_merges/_form.html.erb
+- app/views/decidim/proposals/admin/proposals_merges/new.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_actions.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_draft_aside.html.erb
@@ -634,11 +635,20 @@ files:
 - db/migrate/20240617091140_add_email_on_assigned_proposals_to_users.rb
 - db/migrate/20240617170052_add_parent_relation_to_decidim_proposal_notes.rb
 - db/migrate/20240828103755_add_deleted_at_to_decidim_proposals_proposals.rb
+- db/migrate/20250121110014_rename_proposal_valuation_assignments_to_evaluation_assignments.rb
+- db/migrate/20250121110904_rename_valuation_assignments_count_to_evaluation_assignments_count.rb
+- db/migrate/20250211141313_rename_valuator_columns.rb
+- db/migrate/20250515132351_rename_proposals_endorsements_count_to_likes.rb
 - decidim-proposals.gemspec
 - lib/decidim/api/functions/proposal_finder_helper.rb
 - lib/decidim/api/functions/proposal_list_helper.rb
+- lib/decidim/api/mutations/answer_proposal_attributes.rb
+- lib/decidim/api/mutations/proposal_answer_type.rb
+- lib/decidim/api/mutations/proposal_mutation_type.rb
+- lib/decidim/api/mutations/proposals_mutation_type.rb
 - lib/decidim/api/proposal_input_filter.rb
 - lib/decidim/api/proposal_input_sort.rb
+- lib/decidim/api/proposal_state_type.rb
 - lib/decidim/api/proposal_type.rb
 - lib/decidim/api/proposals_type.rb
 - lib/decidim/content_parsers/proposal_parser.rb
@@ -654,6 +664,7 @@ files:
 - lib/decidim/proposals/doc_to_markdown.rb
 - lib/decidim/proposals/download_your_data_proposal_serializer.rb
 - lib/decidim/proposals/engine.rb
+- lib/decidim/proposals/evaluable.rb
 - lib/decidim/proposals/import.rb
 - lib/decidim/proposals/import/proposal_answer_creator.rb
 - lib/decidim/proposals/import/proposal_creator.rb
@@ -665,7 +676,6 @@ files:
 - lib/decidim/proposals/proposal_serializer.rb
 - lib/decidim/proposals/seeds.rb
 - lib/decidim/proposals/test/factories.rb
-- lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
 - lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake
 homepage: https://decidim.org