decidim-proposals 0.30.3 → 0.31.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bcede9ffb9cb29cbb5e0b4e6c0f74254d898de3f6139b240b25c8efef9924e5
-  data.tar.gz: 39b2aec60d935966707c6ebc7a1af0037905671d63d7a23aeba43f82945cceba
+  metadata.gz: f3fc135d4b5fa6a137903383c34e0d6569b24f1aaeae240d0152de489fa89238
+  data.tar.gz: adc5bafd0b60c155166b3387acc29dd83d40f3ba5a1c114bb619ba8316c3f1e2
 SHA512:
-  metadata.gz: 0ca0dd95a0d57dd6549e0a3110be5dc9659cc866553d7e0055ffa4cb7bf6dc12b076da65ad64f19bd66e97c8a82f4935f82d2ea2895d8b1ca12ed12fe8c4a37a
-  data.tar.gz: 96d97722ef9810af88a8e0f298506a9517709641e94008db907175222a68ed10bde226291b9b676c5de3c0fe76846b9f0d2df1029ebdaa88b1981b39cadb7ef0
+  metadata.gz: b52053e141031b60b906c9197cc410d998b61ea0c88988eabed468bb1613a390dd41c1bcebdc7948952010262ade37b7abb26eb61dc177e591e72eca2a4525b0
+  data.tar.gz: f80817afdd0a79793e6213000d24f3a8f3f60d883ab00edf3d76ff6b053089a3bb1155f3eeca05fe3dd0702baf69d947f72d28974e8b5be9d545024d48085ed0

data/app/cells/decidim/proposals/collaborative_draft_metadata_cell.rb

@@ -17,7 +17,7 @@ module Decidim
       private
 
       def collaborative_draft_items
-        [coauthors_item, comments_count_item, endorsements_count_item, state_item]
+        [coauthors_item, comments_count_item, likes_count_item, state_item]
       end
 
       def state_item

data/app/cells/decidim/proposals/proposal_g_cell.rb

@@ -55,13 +55,13 @@ module Decidim
           hash << model.cache_key_with_version
           hash << model.proposal_votes_count
           hash << options[:show_voting] ? 0 : 1
-          hash << model.endorsements_count
+          hash << model.likes_count
           hash << model.comments_count
-          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << Digest::SHA256.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::SHA256.hexdigest(resource_image_url) if resource_image_url
           hash << 0 # render space
           hash << model.follows_count
-          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << Digest::SHA256.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
           hash << (current_user&.id || 0)

data/app/cells/decidim/proposals/proposal_l_cell.rb

@@ -37,13 +37,13 @@ module Decidim
           hash << model.cache_key_with_version
           hash << model.proposal_votes_count
           hash << options[:show_voting] ? 0 : 1
-          hash << model.endorsements_count
+          hash << model.likes_count
           hash << model.comments_count
-          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << Digest::SHA256.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::SHA256.hexdigest(resource_image_url) if resource_image_url
           hash << render_space? ? 1 : 0
           hash << model.follows_count
-          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << Digest::SHA256.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
           hash << (current_user&.id || 0)

data/app/cells/decidim/proposals/proposal_metadata_cell.rb

@@ -44,11 +44,11 @@ module Decidim
       private
 
       def proposal_items
-        [coauthors_item] + taxonomy_items + [comments_count_item, endorsements_count_item, state_item, emendation_item]
+        [coauthors_item] + taxonomy_items + [comments_count_item, likes_count_item, state_item, emendation_item]
       end
 
       def items_for_map
-        [coauthors_item_for_map, comments_count_item, endorsements_count_item, state_item, emendation_item].compact_blank.map do |item|
+        [coauthors_item_for_map, comments_count_item, likes_count_item, state_item, emendation_item].compact_blank.map do |item|
           {
             text: item[:text].to_s.html_safe,
             icon: item[:icon].present? ? icon(item[:icon]).html_safe : nil

data/app/commands/decidim/proposals/admin/{assign_proposals_to_valuator.rb → assign_proposals_to_evaluator.rb}

@@ -4,8 +4,8 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic to assign proposals to a given
-      # valuator.
-      class AssignProposalsToValuator < Decidim::Command
+      # evaluator.
+      class AssignProposalsToEvaluator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -35,38 +35,38 @@ module Decidim
         def assign_proposals
           transaction do
             form.proposals.flat_map do |proposal|
-              form.valuator_roles.each do |valuator_role|
-                find_assignment(proposal, valuator_role) || assign_proposal(proposal, valuator_role)
-                notify_valuator(proposal, valuator_role)
+              form.evaluator_roles.each do |evaluator_role|
+                find_assignment(proposal, evaluator_role) || assign_proposal(proposal, evaluator_role)
+                notify_evaluator(proposal, evaluator_role)
               end
             end
           end
         end
 
-        def find_assignment(proposal, valuator_role)
-          Decidim::Proposals::ValuationAssignment.find_by(
+        def find_assignment(proposal, evaluator_role)
+          Decidim::Proposals::EvaluationAssignment.find_by(
             proposal:,
-            valuator_role:
+            evaluator_role:
           )
         end
 
-        def assign_proposal(proposal, valuator_role)
+        def assign_proposal(proposal, evaluator_role)
           Decidim.traceability.create!(
-            Decidim::Proposals::ValuationAssignment,
+            Decidim::Proposals::EvaluationAssignment,
             form.current_user,
             proposal:,
-            valuator_role:
+            evaluator_role:
           )
         end
 
-        def notify_valuator(proposal, valuator_role)
-          return unless valuator_role.user.email_on_assigned_proposals?
+        def notify_evaluator(proposal, evaluator_role)
+          return unless evaluator_role.user.email_on_assigned_proposals?
 
           data = {
-            event: "decidim.events.proposals.admin.proposal_assigned_to_valuator",
-            event_class: Decidim::Proposals::Admin::ProposalAssignedToValuatorEvent,
+            event: "decidim.events.proposals.admin.proposal_assigned_to_evaluator",
+            event_class: Decidim::Proposals::Admin::ProposalAssignedToEvaluatorEvent,
             resource: proposal,
-            affected_users: [valuator_role.user]
+            affected_users: [evaluator_role.user]
           }
 
           Decidim::EventsManager.publish(**data)

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -6,7 +6,6 @@ module Decidim
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Decidim::Command
         include ::Decidim::MultipleAttachmentsMethods
-        include HashtagsMethods
 
         # Public: Initializes the command.
         #
@@ -57,7 +56,7 @@ module Decidim
         end
 
         def attributes
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
           parsed_body = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite
           {
             title: parsed_title,

data/app/commands/decidim/proposals/admin/create_proposal_note.rb

@@ -27,7 +27,7 @@ module Decidim
 
           create_proposal_note
           notify_mentioned
-          notify_not_mentioned_valuators
+          notify_not_mentioned_evaluators
 
           broadcast(:ok, proposal_note)
         end
@@ -52,11 +52,11 @@ module Decidim
         end
 
         def notify_mentioned
-          notify_creation(mentioned_admins_or_valuators, "decidim.events.proposals.admin.proposal_note_mentioned")
+          notify_creation(mentioned_admins_or_evaluators, "decidim.events.proposals.admin.proposal_note_mentioned")
         end
 
-        def notify_not_mentioned_valuators
-          notify_creation(proposal_valuators - mentioned_admins_or_valuators, "decidim.events.proposals.admin.proposal_note_created")
+        def notify_not_mentioned_evaluators
+          notify_creation(proposal_evaluators - mentioned_admins_or_evaluators, "decidim.events.proposals.admin.proposal_note_created")
         end
 
         def notify_creation(affected_users, event)

data/app/commands/decidim/proposals/admin/merge_proposals.rb

@@ -6,6 +6,7 @@ module Decidim
       # A command with all the business logic when an admin merges proposals from
       # one component to another.
       class MergeProposals < Decidim::Command
+        include ::Decidim::MultipleAttachmentsMethods
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -22,25 +23,38 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
-          broadcast(:ok, merge_proposals)
+          if process_attachments?
+            build_attachments
+            return broadcast(:invalid) if attachments_invalid?
+          end
+
+          transaction do
+            merged_proposals
+          end
+
+          broadcast(:ok, @merge_proposal)
         end
 
         private
 
-        attr_reader :form
+        attr_reader :form, :attachment
 
-        def merge_proposals
-          transaction do
-            merged_proposal = create_new_proposal
-            merged_proposal.link_resources(proposals_to_link, "merged_from_component")
-            form.proposals.each(&:destroy!) if form.same_component?
-            merged_proposal
-          end
+        def merged_proposals
+          @merged_proposal = create_new_proposal
+          merge_authors
+          @merged_proposal.link_resources(proposals_to_link, "merged_from_component")
+          proposals_mark_as_withdrawn if form.same_component?
+          @attached_to = @merged_proposal
+          create_attachments(first_weight: first_attachment_weight) if process_attachments?
+          link_author_meeting if form.created_in_meeting?
+          notify_author
         end
 
-        def proposals_to_link
-          return previous_links if form.same_component?
+        def proposals_mark_as_withdrawn
+          form.proposals.each(&:withdraw!)
+        end
 
+        def proposals_to_link
           form.proposals
         end
 
@@ -55,14 +69,47 @@ module Decidim
 
           Decidim::Proposals::ProposalBuilder.copy(
             original_proposal,
-            author: form.current_organization,
+            author: form.created_in_meeting ? form.author : form.current_organization,
             action_user: form.current_user,
             extra_attributes: {
-              component: form.target_component
+              component: form.target_component,
+              title: form.title,
+              body: form.body,
+              address: form.address,
+              latitude: form.latitude,
+              longitude: form.longitude,
+              created_in_meeting: form.created_in_meeting
             },
             skip_link: true
           )
         end
+
+        def merge_authors
+          authors = form.proposals.flat_map(&:authors).sort_by { |author| author.is_a?(Decidim::Meetings::Meeting) ? 0 : 1 }
+
+          authors.each { |author| @merged_proposal.add_coauthor(author) unless @merged_proposal.authors.include?(author) }
+        end
+
+        def notify_author
+          return unless @merged_proposal.coauthorships.any?
+
+          Decidim::EventsManager.publish(
+            event: "decidim.events.proposals.proposal_merged",
+            event_class: Decidim::Proposals::MergedProposalEvent,
+            resource: @merged_proposal,
+            affected_users: @merged_proposal.notifiable_identities
+          )
+        end
+
+        def first_attachment_weight
+          return 1 if @merged_proposal.photos.count.zero?
+
+          @merged_proposal.photos.count
+        end
+
+        def link_author_meeting
+          @merged_proposal.link_resources(form.author, "proposals_from_meeting")
+        end
       end
     end
   end

data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb

@@ -56,11 +56,11 @@ module Decidim
         def increment_score
           if proposal.accepted?
             proposal.coauthorships.find_each do |coauthorship|
-              Decidim::Gamification.increment_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+              Decidim::Gamification.increment_score(coauthorship.author, :accepted_proposals)
             end
           elsif initial_state == "accepted"
             proposal.coauthorships.find_each do |coauthorship|
-              Decidim::Gamification.decrement_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+              Decidim::Gamification.decrement_score(coauthorship.author, :accepted_proposals)
             end
           end
         end

data/app/commands/decidim/proposals/admin/proposal_notes_methods.rb

@@ -19,9 +19,9 @@ module Decidim
           @rewritten_body ||= parsed_body.rewrite
         end
 
-        def proposal_valuators
-          @proposal_valuators ||= Decidim::Proposals::ValuationAssignment.where(proposal:).filter_map do |assignment|
-            assignment.valuator unless assignment.valuator == form.current_user
+        def proposal_evaluators
+          @proposal_evaluators ||= Decidim::Proposals::EvaluationAssignment.where(proposal:).filter_map do |assignment|
+            assignment.evaluator unless assignment.evaluator == form.current_user
           end
         end
 
@@ -35,11 +35,11 @@ module Decidim
           end
         end
 
-        def mentioned_admins_or_valuators
+        def mentioned_admins_or_evaluators
           mentioned_users.select do |user|
             admins.exists?(user.id) ||
               space_admins.include?(user) ||
-              proposal_valuators.include?(user)
+              proposal_evaluators.include?(user)
           end
         end
       end

data/app/commands/decidim/proposals/admin/reply_proposal_note.rb

@@ -74,7 +74,7 @@ module Decidim
         end
 
         def notify_mentioned
-          affected_users = mentioned_admins_or_valuators - [parent_author]
+          affected_users = mentioned_admins_or_evaluators - [parent_author]
 
           return if affected_users.blank?
 

data/app/commands/decidim/proposals/admin/{unassign_proposals_from_valuator.rb → unassign_proposals_from_evaluator.rb}

@@ -4,8 +4,8 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic to unassign proposals from a given
-      # valuator.
-      class UnassignProposalsFromValuator < Decidim::Command
+      # evaluator.
+      class UnassignProposalsFromEvaluator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -33,18 +33,18 @@ module Decidim
         def unassign_proposals
           transaction do
             form.proposals.flat_map do |proposal|
-              form.valuator_roles.each do |valuator_role|
-                assignment = find_assignment(proposal, valuator_role)
+              form.evaluator_roles.each do |evaluator_role|
+                assignment = find_assignment(proposal, evaluator_role)
                 unassign(assignment) if assignment
               end
             end
           end
         end
 
-        def find_assignment(proposal, valuator_role)
-          Decidim::Proposals::ValuationAssignment.find_by(
+        def find_assignment(proposal, evaluator_role)
+          Decidim::Proposals::EvaluationAssignment.find_by(
             proposal:,
-            valuator_role:
+            evaluator_role:
           )
         end
 

data/app/commands/decidim/proposals/admin/update_proposal.rb

@@ -6,7 +6,6 @@ module Decidim
       # A command with all the business logic when a user updates a proposal.
       class UpdateProposal < Decidim::Command
         include ::Decidim::MultipleAttachmentsMethods
-        include HashtagsMethods
 
         # Public: Initializes the command.
         #
@@ -53,7 +52,7 @@ module Decidim
         end
 
         def update_proposal
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
           parsed_body = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite
           Decidim.traceability.update!(
             proposal,

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

@@ -5,7 +5,6 @@ module Decidim
     # A command with all the business logic when a user creates a new collaborative draft.
     class CreateCollaborativeDraft < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include HashtagsMethods
 
       # Public: Initializes the command.
       #
@@ -61,8 +60,8 @@ module Decidim
           visibility: "public-only"
         ) do
           draft = CollaborativeDraft.new(
-            title: title_with_hashtags,
-            body: body_with_hashtags,
+            title: Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite,
+            body: Decidim::ContentProcessor.parse_with_processor(:inline_images, form.body, current_organization: form.current_organization).rewrite,
             taxonomizations: form.taxonomizations,
             component: form.component,
             address: form.address,
@@ -70,7 +69,7 @@ module Decidim
             longitude: form.longitude,
             state: "open"
           )
-          draft.coauthorships.build(author: @current_user, user_group: @form.user_group)
+          draft.coauthorships.build(author: @current_user)
           draft.save!
           draft
         end
@@ -78,10 +77,6 @@ module Decidim
         @attached_to = @collaborative_draft
       end
 
-      def user_group
-        @user_group ||= Decidim::UserGroup.find_by(organization:, id: form.user_group_id)
-      end
-
       def organization
         @organization ||= @current_user.organization
       end

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

@@ -5,7 +5,6 @@ module Decidim
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include HashtagsMethods
 
       # Public: Initializes the command.
       #
@@ -74,10 +73,10 @@ module Decidim
           ) do
             proposal = Proposal.new(
               title: {
-                I18n.locale => title_with_hashtags
+                I18n.locale => Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
               },
               body: {
-                I18n.locale => body_with_hashtags
+                I18n.locale => Decidim::ContentProcessor.parse_with_processor(:inline_images, form.body, current_organization: form.current_organization).rewrite
               },
               component: form.component
             )
@@ -89,7 +88,7 @@ module Decidim
               proposal.longitude = form.longitude
             end
             proposal.address = form.address if form.has_address?
-            proposal.add_coauthor(@current_user, user_group:)
+            proposal.add_coauthor(@current_user)
             proposal.save!
             @attached_to = proposal
             proposal
@@ -104,15 +103,7 @@ module Decidim
 
         return false if proposal_limit.zero?
 
-        if user_group
-          user_group_proposals.count >= proposal_limit
-        else
-          current_user_proposals.count >= proposal_limit
-        end
-      end
-
-      def user_group
-        @user_group ||= Decidim::UserGroup.find_by(organization:, id: form.user_group_id)
+        current_user_proposals.count >= proposal_limit
       end
 
       def organization
@@ -123,10 +114,6 @@ module Decidim
         Proposal.not_withdrawn.from_author(@current_user).where(component: form.current_component)
       end
 
-      def user_group_proposals
-        Proposal.not_withdrawn.from_user_group(@user_group).where(component: form.current_component)
-      end
-
       def first_attachment_weight
         return 1 if proposal.photos.count.zero?
 

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

@@ -56,8 +56,8 @@ module Decidim
       def proposal_attributes
         fields = {}
 
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.title, current_organization: @collaborative_draft.organization).rewrite
-        parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.body, current_organization: @collaborative_draft.organization).rewrite
+        parsed_title = Decidim::ContentProcessor.parse(@collaborative_draft.title, current_organization: @collaborative_draft.organization).rewrite
+        parsed_body = Decidim::ContentProcessor.parse_with_processor(:inline_images, @collaborative_draft.body, current_organization: @collaborative_draft.organization).rewrite
 
         fields[:title] = { I18n.locale => parsed_title }
         fields[:body] = { I18n.locale => parsed_body }

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

@@ -93,11 +93,7 @@ module Decidim
 
       def increment_scores
         @proposal.coauthorships.find_each do |coauthorship|
-          if coauthorship.user_group
-            Decidim::Gamification.increment_score(coauthorship.user_group, :proposals)
-          else
-            Decidim::Gamification.increment_score(coauthorship.author, :proposals)
-          end
+          Decidim::Gamification.increment_score(coauthorship.author, :proposals)
         end
       end
     end

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

@@ -4,8 +4,6 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user updates a collaborative_draft.
     class UpdateCollaborativeDraft < Decidim::Command
-      include HashtagsMethods
-
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -59,8 +57,8 @@ module Decidim
 
       def attributes
         {
-          title: title_with_hashtags,
-          body: body_with_hashtags,
+          title: Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite,
+          body: Decidim::ContentProcessor.parse_with_processor(:inline_images, form.body, current_organization: form.current_organization).rewrite,
           taxonomizations: form.taxonomizations,
           address: form.address,
           latitude: form.latitude,

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

@@ -5,7 +5,6 @@ module Decidim
     # A command with all the business logic when a user updates a proposal.
     class UpdateProposal < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include HashtagsMethods
 
       # Public: Initializes the command.
       #
@@ -75,7 +74,7 @@ module Decidim
         PaperTrail.request(enabled: false) do
           @proposal.update(attributes)
           @proposal.coauthorships.clear
-          @proposal.add_coauthor(current_user, user_group:)
+          @proposal.add_coauthor(current_user)
         end
       end
 
@@ -87,16 +86,16 @@ module Decidim
           visibility: "public-only"
         )
         @proposal.coauthorships.clear
-        @proposal.add_coauthor(current_user, user_group:)
+        @proposal.add_coauthor(current_user)
       end
 
       def attributes
         {
           title: {
-            I18n.locale => title_with_hashtags
+            I18n.locale => Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
           },
           body: {
-            I18n.locale => body_with_hashtags
+            I18n.locale => Decidim::ContentProcessor.parse_with_processor(:inline_images, form.body, current_organization: form.current_organization).rewrite
           },
           taxonomizations: form.taxonomizations,
           address: form.address,
@@ -110,11 +109,7 @@ module Decidim
 
         return false if proposal_limit.zero?
 
-        if user_group
-          user_group_proposals.count >= proposal_limit
-        else
-          current_user_proposals.count >= proposal_limit
-        end
+        current_user_proposals.count >= proposal_limit
       end
 
       def first_attachment_weight
@@ -123,10 +118,6 @@ module Decidim
         proposal.photos.count
       end
 
-      def user_group
-        @user_group ||= Decidim::UserGroup.find_by(organization:, id: form.user_group_id)
-      end
-
       def organization
         @organization ||= current_user.organization
       end
@@ -134,10 +125,6 @@ module Decidim
       def current_user_proposals
         Proposal.from_author(current_user).where(component: form.current_component).published.where.not(id: proposal.id).not_withdrawn
       end
-
-      def user_group_proposals
-        Proposal.from_user_group(user_group).where(component: form.current_component).published.where.not(id: proposal.id).not_withdrawn
-      end
     end
   end
 end

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -27,9 +27,9 @@ module Decidim
           end
 
           def accessible_proposals_collection
-            return collection if current_participatory_space.user_roles(:valuator).where(user: current_user).empty?
+            return collection if current_participatory_space.user_roles(:evaluator).where(user: current_user).empty?
 
-            collection.with_valuation_assigned_to(current_user, current_participatory_space)
+            collection.with_evaluation_assigned_to(current_user, current_participatory_space)
           end
 
           def search_field_predicate
@@ -50,12 +50,12 @@ module Decidim
             ProposalState.where(component: current_component).pluck(:token) + ["withdrawn"]
           end
 
-          def valuator_role_ids
-            current_participatory_space.user_roles(:valuator).order_by_name.pluck(:id)
+          def evaluator_role_ids
+            current_participatory_space.user_roles(:evaluator).order_by_name.pluck(:id)
           end
 
-          def translated_valuator_role_ids_has(valuator_role_id)
-            user_role = current_participatory_space.user_roles(:valuator).find_by(id: valuator_role_id)
+          def translated_evaluator_role_ids_has(evaluator_role_id)
+            user_role = current_participatory_space.user_roles(:evaluator).find_by(id: evaluator_role_id)
             user_role&.user&.name
           end
         end