decidim-proposals 0.30.2 → 0.31.0.rc1

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -22,7 +22,7 @@ module Decidim
           @possible_orders ||= begin
             possible_orders = %w(random recent)
             possible_orders << "most_voted" if most_voted_order_available?
-            possible_orders << "most_endorsed" if current_settings.endorsements_enabled?
+            possible_orders << "most_liked" if current_settings.likes_enabled?
             possible_orders << "most_commented" if component_settings.comments_enabled?
             possible_orders << "most_followed" << "with_more_authors"
             possible_orders
@@ -60,8 +60,8 @@ module Decidim
           case order
           when "most_commented"
             proposals.order(comments_count: :desc)
-          when "most_endorsed"
-            proposals.order(endorsements_count: :desc)
+          when "most_liked"
+            proposals.order(likes_count: :desc)
           when "most_followed"
             proposals.order(follows_count: :desc)
           when "most_voted"

data/app/controllers/decidim/proposals/admin/evaluation_assignments_controller.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class EvaluationAssignmentsController < Admin::ApplicationController
+        def create
+          @form = form(Admin::EvaluationAssignmentForm).from_params(params)
+
+          @form.proposals.each do |proposal|
+            enforce_permission_to :assign_to_evaluator, :proposals, proposal:
+          end
+
+          Admin::AssignProposalsToEvaluator.call(@form) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("evaluation_assignments.create.success", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("evaluation_assignments.create.invalid", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+
+        def destroy
+          @form = form(Admin::EvaluationAssignmentForm).from_params(params)
+
+          @form.evaluator_roles.each do |evaluator_role|
+            enforce_permission_to :unassign_from_evaluator, :proposals, evaluator: evaluator_role.user
+          end
+
+          Admin::UnassignProposalsFromEvaluator.call(@form) do
+            on(:ok) do |_proposal|
+              flash.keep[:notice] = I18n.t("evaluation_assignments.delete.success", scope: "decidim.proposals.admin")
+              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+            end
+
+            on(:invalid) do
+              flash.keep[:alert] = I18n.t("evaluation_assignments.delete.invalid", scope: "decidim.proposals.admin")
+              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+
+        private
+
+        def skip_manage_component_permission
+          true
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/admin/participatory_texts_controller.rb

@@ -32,12 +32,12 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_texts.import.invalid", scope: "decidim.proposals.admin")
-              render action: "new_import"
+              render action: "new_import", status: :unprocessable_entity
             end
 
             on(:invalid_file) do
               flash.now[:alert] = I18n.t("participatory_texts.import.invalid_file", scope: "decidim.proposals.admin")
-              render action: "new_import"
+              render action: "new_import", status: :unprocessable_entity
             end
           end
         end
@@ -47,8 +47,8 @@ module Decidim
         def update
           enforce_permission_to :manage, :participatory_texts
 
-          form_params = params.require(:preview_participatory_text)
-          @preview_form = form(Admin::PreviewParticipatoryTextForm).from_params(proposals: form_params[:proposals_attributes]&.values)
+          form_params = params.require(:preview_participatory_text).fetch(:proposals_attributes).to_unsafe_h
+          @preview_form = form(Admin::PreviewParticipatoryTextForm).from_params(proposals: form_params)
 
           if params.has_key?("save_draft")
             UpdateParticipatoryText.call(@preview_form) do
@@ -62,7 +62,7 @@ module Decidim
                 failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
                 flash.now[:alert] = alert_msg.join("<br/>").html_safe
                 index
-                render action: "index"
+                render action: "index", status: :unprocessable_entity
               end
             end
           else
@@ -77,7 +77,7 @@ module Decidim
                 failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
                 flash.now[:alert] = alert_msg.join("<br/>").html_safe
                 index
-                render action: "index"
+                render action: "index", status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
             on(:invalid) do
               flash.keep[:alert] = I18n.t("proposals.answer.invalid", scope: "decidim.proposals.admin")
-              render template: "decidim/proposals/admin/proposals/show"
+              render template: "decidim/proposals/admin/proposals/show", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposal_states_controller.rb

@@ -30,7 +30,7 @@ module Decidim
             on(:invalid) do
               flash.keep[:alert] = I18n.t("proposal_states.create.error", scope: "decidim.proposals.admin")
 
-              render action: :new
+              render action: :new, status: :unprocessable_entity
             end
           end
         end
@@ -54,7 +54,7 @@ module Decidim
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposal_states.update.error", scope: "decidim.proposals.admin")
 
-              render action: :edit
+              render action: :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -44,7 +44,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposals.create.invalid", scope: "decidim.proposals.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -129,7 +129,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = t("proposals.update.error", scope: "decidim")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposals_imports_controller.rb

@@ -23,7 +23,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.proposals.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposals_merges_controller.rb

@@ -4,6 +4,15 @@ module Decidim
   module Proposals
     module Admin
       class ProposalsMergesController < Admin::ApplicationController
+        layout false
+        helper Decidim::Proposals::Admin::ProposalsHelper
+
+        def new
+          @form = form(Admin::ProposalsMergeForm).from_params(
+            params.merge(attachment: form(AttachmentForm).from_params({}))
+          )
+        end
+
         def create
           enforce_permission_to :merge, :proposals
 
@@ -12,15 +21,15 @@ module Decidim
           Admin::MergeProposals.call(@form) do
             on(:ok) do |_proposal|
               flash[:notice] = I18n.t("proposals_merges.create.success", scope: "decidim.proposals.admin")
-              redirect_to EngineRouter.admin_proxy(@form.target_component).root_path
+              render json: { redirect_url: EngineRouter.admin_proxy(@form.target_component).root_path }, status: :ok
             end
 
             on(:invalid) do
-              flash[:alert_html] = Decidim::ValidationErrorsPresenter.new(
+              flash.now[:alert_html] = Decidim::ValidationErrorsPresenter.new(
                 I18n.t("proposals_merges.create.invalid", scope: "decidim.proposals.admin"),
                 @form
               ).message
-              redirect_to EngineRouter.admin_proxy(current_component).root_path
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -6,7 +6,6 @@ module Decidim
     class CollaborativeDraftsController < Decidim::Proposals::ApplicationController
       helper ProposalWizardHelper
       helper TooltipHelper
-      helper UserGroupHelper
 
       include Decidim::ApplicationHelper
       include Decidim::IconHelper
@@ -62,7 +61,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.collaborative_drafts.create.error", scope: "decidim")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -86,7 +85,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.collaborative_drafts.update.error", scope: "decidim")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -6,7 +6,6 @@ module Decidim
     class ProposalsController < Decidim::Proposals::ApplicationController
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
-      helper UserGroupHelper
       helper Decidim::Admin::IconLinkHelper
       include Decidim::ApplicationHelper
       include Flaggable
@@ -80,7 +79,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.create.error", scope: "decidim")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -102,7 +101,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.publish.error", scope: "decidim")
-            render :edit_draft
+            render :edit_draft, status: :unprocessable_entity
           end
         end
       end
@@ -125,7 +124,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.update_draft.error", scope: "decidim")
-            render :edit_draft
+            render :edit_draft, status: :unprocessable_entity
           end
         end
       end
@@ -141,7 +140,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.destroy_draft.error", scope: "decidim")
-            render :edit_draft
+            render :edit_draft, status: :unprocessable_entity
           end
         end
       end
@@ -162,7 +161,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.update.error", scope: "decidim")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/events/decidim/proposals/admin/{proposal_assigned_to_valuator_event.rb → proposal_assigned_to_evaluator_event.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     module Admin
-      class ProposalAssignedToValuatorEvent < Decidim::Events::SimpleEvent
+      class ProposalAssignedToEvaluatorEvent < Decidim::Events::SimpleEvent
         include Rails.application.routes.mounted_helpers
 
         i18n_attributes :admin_proposal_info_url, :admin_proposal_info_path

data/app/events/decidim/proposals/{endorsing_enabled_event.rb → liking_enabled_event.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Proposals
-    class EndorsingEnabledEvent < Decidim::Events::SimpleEvent
+    class LikingEnabledEvent < Decidim::Events::SimpleEvent
     end
   end
 end

data/app/events/decidim/proposals/merged_proposal_event.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class MergedProposalEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::AuthorEvent
+    end
+  end
+end

data/app/events/decidim/proposals/proposal_liked_event.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalLikedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :liker_nickname, :liker_name, :liker_path, :nickname
+
+      delegate :nickname, :name, to: :liker, prefix: true
+
+      def nickname
+        liker_nickname
+      end
+
+      def liker_path
+        liker.profile_path
+      end
+
+      def resource_text
+        resource.body
+      end
+
+      private
+
+      def liker
+        @liker ||= Decidim::UserPresenter.new(liker_user)
+      end
+
+      def liker_user
+        @liker_user ||= Decidim::User.find_by(id: extra[:liker_id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class EvaluationAssignmentForm < Decidim::Form
+        attribute :id, Integer
+        attribute :proposal_ids, Array
+        attribute :evaluator_role_ids, Array
+
+        validates :evaluator_roles, :proposals, :current_component, presence: true
+        validate :same_participatory_space
+
+        def proposals
+          @proposals ||= Decidim::Proposals::Proposal.where(component: current_component, id: proposal_ids).uniq
+        end
+
+        def evaluator_roles
+          @evaluator_roles ||= current_component.participatory_space
+                                                .user_roles(:evaluator)
+                                                .order_by_name
+                                                .where(id: evaluator_role_ids)
+        end
+
+        def same_participatory_space
+          return if evaluator_roles.empty? || !current_component
+
+          evaluator_roles.each do |evaluator_role|
+            if current_component.participatory_space != evaluator_role.participatory_space
+              errors.add(:id, :invalid)
+              break
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,6 @@ module Decidim
         attribute :position, Integer
         attribute :created_in_meeting, Boolean
         attribute :meeting_id, Integer
-        attribute :suggested_hashtags, Array[String]
 
         attachments_attribute :photos
 
@@ -30,7 +29,7 @@ module Decidim
 
         def map_model(model)
           body = translated_attribute(model.body)
-          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
+          Decidim::ContentRenderers::BlobRenderer.new(body)
         end
 
         alias component current_component
@@ -68,27 +67,6 @@ module Decidim
           meeting_as_author
         end
 
-        def extra_hashtags
-          @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
-        end
-
-        def suggested_hashtags
-          downcased_suggested_hashtags = super.to_set(&:downcase)
-          component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
-        end
-
-        def suggested_hashtag_checked?(hashtag)
-          suggested_hashtags.member?(hashtag)
-        end
-
-        def component_automatic_hashtags
-          @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
-        end
-
-        def component_suggested_hashtags
-          @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
-        end
-
         private
 
         # This method will add an error to the `attachment` field only if there is
@@ -99,10 +77,6 @@ module Decidim
           errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
           errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
         end
-
-        def ordered_hashtag_list(string)
-          string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
-        end
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Decidim
 
           proposals.each do |proposal|
             errors_set << :not_official unless proposal.official?
-            errors_set << :voted if proposal.votes.any? || proposal.endorsements.any?
+            errors_set << :voted if proposal.votes.any? || proposal.likes.any?
           end
 
           errors_set.each { |error| errors.add(:base, error) } if errors_set.any?

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

@@ -5,8 +5,64 @@ module Decidim
     module Admin
       # A form object to be used when admin users wants to merge two or more
       # proposals into a new one to another proposal component in the same space.
-      class ProposalsMergeForm < ProposalsForkForm
-        validates :proposals, length: { minimum: 2 }
+      class ProposalsMergeForm < 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, Decidim::Attributes::RichText
+        attribute :target_component_id, Array[Integer]
+        attribute :proposal_ids, Array
+
+        attachments_attribute :documents
+
+        validates :target_component, :proposals, :current_component, presence: true
+        validates :proposal_ids, length: { minimum: 2 }
+        validates :title, :body, translatable_presence: true
+        validate :mergeable_to_same_component
+        validate :notify_missing_attachment_if_errored
+
+        def proposals
+          @proposals ||= Decidim::Proposals::Proposal.where(component: current_component, id: proposal_ids).uniq
+        end
+
+        def target_component
+          return current_component if clean_target_component_id == current_component.id
+
+          @target_component ||= current_component.siblings.find_by(id: target_component_id)
+        end
+
+        def same_component?
+          target_component == current_component
+        end
+
+        private
+
+        def errors_set
+          @errors_set ||= Set[]
+        end
+
+        def mergeable_to_same_component
+          return true unless same_component?
+
+          proposals.each do |proposal|
+            errors_set << :voted if proposal.votes.any?
+          end
+
+          errors_set.each { |error| errors.add(:base, error) } if errors_set.any?
+        end
+
+        # Private: Returns the id of the target component.
+        #
+        # We receive this as ["id"] since it is from a select in a form.
+        def clean_target_component_id
+          target_component_id.first
+        end
+
+        def notify_missing_attachment_if_errored
+          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+        end
       end
     end
   end

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

@@ -3,10 +3,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 user_group
-        @user_group ||= Decidim::UserGroup.find user_group_id if user_group_id.present?
-      end
-    end
+    class CollaborativeDraftForm < Decidim::Proposals::ProposalForm; end
   end
 end

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

@@ -14,12 +14,10 @@ module Decidim
       attribute :title, String
       attribute :body, Decidim::Attributes::CleanString
       attribute :body_template, String
-      attribute :user_group_id, Integer
       attribute :address, String
       attribute :latitude, Float
       attribute :longitude, Float
       attribute :attachment, AttachmentForm
-      attribute :suggested_hashtags, Array[String]
 
       attachments_attribute :documents
 
@@ -40,12 +38,10 @@ module Decidim
       def map_model(model)
         self.title = translated_attribute(model.title)
         self.body = translated_attribute(model.body)
-        @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
 
         presenter = ProposalPresenter.new(model)
         self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
 
-        self.user_group_id = model.user_groups.first&.id
         self.documents = model.attachments
       end
 
@@ -65,27 +61,6 @@ module Decidim
         latitude.present? && longitude.present?
       end
 
-      def extra_hashtags
-        @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
-      end
-
-      def suggested_hashtags
-        downcased_suggested_hashtags = super.to_set(&:downcase)
-        component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
-      end
-
-      def suggested_hashtag_checked?(hashtag)
-        suggested_hashtags.member?(hashtag)
-      end
-
-      def component_automatic_hashtags
-        @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
-      end
-
-      def component_suggested_hashtags
-        @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
-      end
-
       private
 
       def body_is_not_bare_template
@@ -100,10 +75,6 @@ module Decidim
       def notify_missing_attachment_if_errored
         errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
       end
-
-      def ordered_hashtag_list(string)
-        string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
-      end
     end
   end
 end

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

@@ -33,19 +33,19 @@ module Decidim
           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).order_by_name
-          valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
+        # find the evaluators for the current space.
+        def find_evaluators_for_select(participatory_space, current_user)
+          evaluator_roles = participatory_space.user_roles(:evaluator).order_by_name
+          evaluators = Decidim::User.where(id: evaluator_roles.pluck(:decidim_user_id)).to_a
 
-          filtered_valuator_roles = valuator_roles.filter do |role|
+          filtered_evaluator_roles = evaluator_roles.filter do |role|
             role.decidim_user_id != current_user.id
           end
 
-          filtered_valuator_roles.map do |role|
-            valuator = valuators.find { |user| user.id == role.decidim_user_id }
+          filtered_evaluator_roles.map do |role|
+            evaluator = evaluators.find { |user| user.id == role.decidim_user_id }
 
-            [valuator.name, role.id]
+            [evaluator.name, role.id]
           end
         end
       end

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

@@ -17,7 +17,7 @@ module Decidim
         #
         # Examples:
         #   ranking_for(proposal, proposal_votes_count: :desc)
-        #   ranking_for(proposal, endorsements_count: :desc)
+        #   ranking_for(proposal, likes_count: :desc)
         def ranking_for(proposal, order = {})
           siblings = Decidim::Proposals::Proposal.where(component: proposal.component)
           ranked = siblings.order([order, { id: :asc }])
@@ -26,9 +26,9 @@ module Decidim
           { ranking: ranked_ids.index(proposal.id) + 1, total: ranked_ids.count }
         end
 
-        # Public: Gets the ranking for a given proposal, ordered by endorsements.
-        def endorsements_ranking_for(proposal)
-          ranking_for(proposal, endorsements_count: :desc)
+        # Public: Gets the ranking for a given proposal, ordered by likes.
+        def likes_ranking_for(proposal)
+          ranking_for(proposal, likes_count: :desc)
         end
 
         # Public: Gets the ranking for a given proposal, ordered by votes.
@@ -36,8 +36,8 @@ module Decidim
           ranking_for(proposal, proposal_votes_count: :desc)
         end
 
-        def i18n_endorsements_ranking_for(proposal)
-          rankings = endorsements_ranking_for(proposal)
+        def i18n_likes_ranking_for(proposal)
+          rankings = likes_ranking_for(proposal)
 
           I18n.t(
             "ranking",