decidim-core 0.18.1 → 0.19.0

data/app/events/decidim/amendable/amendment_base_event.rb

@@ -19,6 +19,7 @@ module Decidim::Amendable
 
     def emendation_author
       return unless emendation_resource
+
       @emendation_author ||= if emendation_resource.is_a?(Decidim::Coauthorable)
                                Decidim::UserPresenter.new(emendation_resource.creator_author)
                              else
@@ -28,16 +29,19 @@ module Decidim::Amendable
 
     def emendation_author_nickname
       return unless emendation_resource
+
       @emendation_author_nickname ||= emendation_author.nickname
     end
 
     def emendation_author_path
       return unless emendation_resource
+
       @emendation_author_path ||= emendation_author.profile_path
     end
 
     def emendation_path
       return unless emendation_resource
+
       @emendation_path ||= Decidim::ResourceLocatorPresenter.new(emendation_resource).path
     end
   end

data/app/forms/decidim/account_form.rb

@@ -18,7 +18,7 @@ module Decidim
 
     validates :name, presence: true
     validates :email, presence: true, 'valid_email_2/email': { disposable: true }
-    validates :nickname, presence: true
+    validates :nickname, presence: true, format: /\A[\w\-]+\z/
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, confirmation: true

data/app/forms/decidim/amendable/create_form.rb

@@ -4,35 +4,19 @@ module Decidim
   module Amendable
     # A form object to be used when users want to amend an amendable resource.
     class CreateForm < Decidim::Amendable::Form
-      include Decidim::ApplicationHelper
-
       mimic :amendment
 
       attribute :amendable_gid, String
       attribute :user_group_id, Integer
-      attribute :emendation_params, Object
+      attribute :emendation_params, Hash
 
       validates :amendable_gid, presence: true
-      validates :emendation_params, presence: true
-      validate :emendation_changes_amendable
-      validate :check_amendable_form_validations
-
-      def emendation_changes_amendable
-        return unless amendable.amendable_fields == [:title, :body]
-        return unless present(amendable).title == present(emendation).title
-        return unless present(amendable).body.delete("\r") == present(emendation).body.delete("\r")
-
-        amendable_form.errors.add(:title, :identical)
-        amendable_form.errors.add(:body, :identical)
-      end
+      validate :emendation_must_change_amendable
+      validate :amendable_form_must_be_valid
 
       def amendable
         @amendable ||= GlobalID::Locator.locate_signed(amendable_gid)
       end
-
-      def emendation
-        amendable.amendable_type.constantize.new(@emendation_params)
-      end
     end
   end
 end

data/app/forms/decidim/amendable/edit_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # A form object used to edit emendations
+    class EditForm < Decidim::Amendable::Form
+      mimic :amendment
+
+      attribute :id, Integer
+      attribute :user_group_id, Integer
+      attribute :emendation_params, Hash
+
+      validates :id, presence: true
+      validate :emendation_must_change_amendable
+      validate :amendable_form_must_be_valid
+
+      def map_model(model)
+        self.emendation_params = model.emendation.attributes.slice(*amendable_fields_as_string)
+      end
+    end
+  end
+end

data/app/forms/decidim/amendable/form.rb

@@ -18,40 +18,62 @@ module Decidim
         @emendation ||= amendment&.emendation
       end
 
-      def check_amendable_form_validations
+      def amender
+        @amender ||= amendment&.amender
+      end
+
+      private
+
+      # Validates the emendation is not identical to the amendable.
+      def emendation_must_change_amendable
+        return unless %w(title body).all? { |attr| attr.in? amendable_fields_as_string }
+
+        emendation = amendable.class.new(emendation_params)
+        return unless amendable.title == emendation.title
+        return unless normalized_body(amendable) == normalized_body(emendation)
+
+        amendable_form.errors.add(:title, :identical)
+        amendable_form.errors.add(:body, :identical)
+      end
+
+      # Normalizes the escape sequences used for newlines.
+      def normalized_body(resource)
+        Decidim::ContentParsers::NewlineParser.new(resource.body, context: {}).rewrite
+      end
+
+      # Validates the emendation using the amendable form.
+      def amendable_form_must_be_valid
         parse_hashtaggable_params
-        run_validations
+        amendable_form.validate unless defined?(@amendable_form) # Preserves previously added errors.
         @errors = @amendable_form.errors
       end
 
+      # Parses :title and :body attribute values with HashtagParser.
       def parse_hashtaggable_params
         emendation_params.each do |key, value|
           next unless [:title, :body].include?(key)
-          emendation_params[key] = Decidim::ContentProcessor
-                                   .parse_with_processor(
-                                     :hashtag,
-                                     value,
-                                     current_organization: amendable.organization
-                                   ).rewrite
+
+          emendation_params[key] = Decidim::ContentParsers::HashtagParser.new(value, form_context).rewrite
         end
       end
 
+      # Returns an instance of the Form Object class defined in Decidim::Amendable#amendable_form
+      # constructed with the :emendation_params.
       def amendable_form
-        @amendable_form ||= amendable
-                            .amendable_form
-                            .from_params(emendation_params)
-                            .with_context(
-                              current_component: amendable.component,
-                              current_participatory_space: amendable.participatory_space
-                            )
+        @amendable_form ||= amendable.amendable_form.from_params(emendation_params).with_context(form_context)
       end
 
-      # Run validations only if `@amendable_form` is `nil`. This preserves
-      # the artificial errors (:identical) added in `create_form.rb`
-      def run_validations
-        return if @amendable_form.present?
+      # Returns the amendable fields keys as String.
+      def amendable_fields_as_string
+        amendable.amendable_fields.map(&:to_s)
+      end
 
-        amendable_form.validate
+      # Adds additional information to the base context from the current controller.
+      def form_context
+        context.to_h.merge(
+          current_component: amendable.component,
+          current_participatory_space: amendable.participatory_space
+        )
       end
     end
   end

data/app/forms/decidim/amendable/promote_form.rb

@@ -6,16 +6,13 @@ module Decidim
     class PromoteForm < Decidim::Amendable::Form
       mimic :amendment
 
-      attribute :id, String
-      attribute :emendation_params, Object
+      attribute :id, Integer
+      attribute :emendation_params, Hash
 
       validates :id, presence: true
 
-      def emendation_params
-        {
-          title: emendation&.title,
-          body: emendation&.body
-        }
+      def map_model(model)
+        self.emendation_params = model.emendation.attributes.slice(*amendable_fields_as_string)
       end
     end
   end

data/app/forms/decidim/amendable/publish_form.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # A form object used to publish emendations
+    class PublishForm < Decidim::Amendable::Form
+      mimic :amendment
+
+      attribute :id, Integer
+      attribute :amendable_params, Hash
+      attribute :emendation_params, Hash
+
+      validates :id, presence: true
+
+      def map_model(model)
+        self.amendable_params = model.amendable.attributes.slice(*amendable_fields_as_string)
+        self.emendation_params = model.emendation.attributes.slice(*amendable_fields_as_string)
+      end
+    end
+  end
+end

data/app/forms/decidim/amendable/reject_form.rb

@@ -6,7 +6,7 @@ module Decidim
     class RejectForm < Decidim::Amendable::Form
       mimic :amendment
 
-      attribute :id, String
+      attribute :id, Integer
 
       validates :id, presence: true
     end

data/app/forms/decidim/amendable/review_form.rb

@@ -6,11 +6,16 @@ module Decidim
     class ReviewForm < Decidim::Amendable::Form
       mimic :amendment
 
-      attribute :id, String
-      attribute :emendation_params, Object
+      attribute :id, Integer
+      attribute :emendation_params, Hash
 
-      validates :emendation_params, presence: true
-      validate :check_amendable_form_validations
+      validates :id, presence: true
+      validate :emendation_must_change_amendable
+      validate :amendable_form_must_be_valid
+
+      def map_model(model)
+        self.emendation_params = model.emendation.attributes.slice(*amendable_fields_as_string)
+      end
     end
   end
 end

data/app/forms/decidim/invite_user_form.rb

@@ -16,6 +16,7 @@ module Decidim
     validates :email, :name, :organization, :invitation_instructions, presence: true
     validates :role, inclusion: { in: Decidim::User::Roles.all }
 
+    validates :name, format: { with: /\A(?!.*[<>?%&\^*#@\(\)\[\]\=\+\:\;\"\{\}\\\|])/ }
     validate :admin_uniqueness
 
     def email

data/app/forms/decidim/notifications_settings_form.rb

@@ -19,6 +19,7 @@ module Decidim
 
     def newsletter_notifications_at
       return nil unless newsletter_notifications
+
       Time.current
     end
 

data/app/forms/decidim/registration_form.rb

@@ -14,7 +14,7 @@ module Decidim
     attribute :tos_agreement, Boolean
 
     validates :name, presence: true
-    validates :nickname, presence: true, length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname, presence: true, format: /\A[\w\-]+\z/, length: { maximum: Decidim::User.nickname_max_length }
     validates :email, presence: true, 'valid_email_2/email': { disposable: true }
     validates :password, confirmation: true
     validates :password, password: { name: :name, email: :email, username: :nickname }
@@ -26,17 +26,18 @@ module Decidim
 
     def newsletter_at
       return nil unless newsletter?
+
       Time.current
     end
 
     private
 
     def email_unique_in_organization
-      errors.add :email, :taken if User.find_by(email: email, organization: current_organization).present?
+      errors.add :email, :taken if User.no_active_invitation.find_by(email: email, organization: current_organization).present?
     end
 
     def nickname_unique_in_organization
-      errors.add :nickname, :taken if User.find_by(nickname: nickname, organization: current_organization).present?
+      errors.add :nickname, :taken if User.no_active_invitation.find_by(nickname: nickname, organization: current_organization).present?
     end
   end
 end

data/app/forms/decidim/user_group_form.rb

@@ -29,6 +29,7 @@ module Decidim
 
     def unique_document_number
       return if document_number.blank?
+
       errors.add :document_number, :taken if UserGroup
                                              .with_document_number(
                                                context.current_organization,

data/app/forms/decidim/user_interests_form.rb

@@ -10,6 +10,7 @@ module Decidim
 
     def newsletter_notifications_at
       return nil unless newsletter_notifications
+
       Time.current
     end
 

data/app/helpers/decidim/amendments_helper.rb

@@ -7,16 +7,17 @@ module Decidim
     #
     # Returns Html grid of CardM.
     def amendments_for(amendable)
-      return unless amendable.amendable? && amendable.emendations.count.positive?
+      return unless amendable.amendable?
+      return unless (emendations = amendable.visible_emendations_for(current_user)).any?
 
       content = content_tag(:h2, class: "section-heading", id: "amendments") do
-        t("section_heading", scope: "decidim.amendments.amendable", count: amendable.emendations.count)
+        t("section_heading", scope: "decidim.amendments.amendable", count: emendations.count)
       end
 
       content << cell("decidim/collapsible_list",
-                      amendable.emendations,
+                      emendations,
                       cell_options: { context: { current_user: current_user } },
-                      list_class: "row small-up-1 medium-up-2 card-grid",
+                      list_class: "row small-up-1 medium-up-2 card-grid amendment-list",
                       size: 4).to_s
 
       content_tag :div, content.html_safe, class: "section"
@@ -41,10 +42,20 @@ module Decidim
     # Returns Html action button card to AMEND an amendable resource
     def amend_button_for(amendable)
       return unless amendments_enabled? && amendable.amendable?
+      return unless current_component.current_settings.amendment_creation_enabled
+      return unless can_participate_in_private_space?
 
       cell("decidim/amendable/amend_button_card", amendable)
     end
 
+    # Checks if the user can participate in a participatory space
+    # based on its settings related with Decidim::HasPrivateUsers.
+    def can_participate_in_private_space?
+      return true unless current_participatory_space.class.included_modules.include?(HasPrivateUsers)
+
+      current_participatory_space.can_participate?(current_user)
+    end
+
     # Returns Html action button cards for an emendation
     def emendation_actions_for(emendation)
       return unless amendments_enabled? && can_react_to_emendation?(emendation)
@@ -76,7 +87,7 @@ module Decidim
     def can_react_to_emendation?(emendation)
       return unless current_user && emendation.emendation?
 
-      true
+      current_component.current_settings.amendment_reaction_enabled
     end
 
     # Checks if the user can accept and reject the emendation
@@ -89,18 +100,9 @@ module Decidim
     # Checks if the user can promote the emendation
     def allowed_to_promote?(emendation)
       return unless emendation.amendment.rejected? && emendation.created_by?(current_user)
-      return if promoted?(emendation)
+      return if emendation.amendment.promoted?
 
-      true
-    end
-
-    # Checks if the unique ActionLog created in the promote command exists.
-    def promoted?(emendation)
-      logs = Decidim::ActionLog.where(decidim_component_id: emendation.component)
-                               .where(decidim_user_id: emendation.creator_author)
-                               .where(action: "promote")
-
-      logs.select { |log| log.extra["promoted_from"] == emendation.id }.present?
+      current_component.current_settings.amendment_promotion_enabled
     end
 
     # Renders a UserGroup select field in a form.
@@ -112,11 +114,23 @@ module Decidim
                   label: t("new.amendment_author", scope: "decidim.amendments"))
     end
 
+    # Return the translated attribute name to use as label in a form.
+    # Returns a String.
+    def amendments_form_fields_label(attribute)
+      model_name = amendable.model_name.singular_route_key
+      I18n.t(attribute, scope: "activemodel.attributes.#{model_name}")
+    end
+
     # Return the edited field value or presents the original attribute value in a form.
-    def emendation_field_value(form, original, key)
-      return params[:amendment][:emendation_params][key] if params[:amendment].present?
+    #
+    # original_resource - name of the method to send to the controller (:amendable or :emendation)
+    # attribute         - name of the attribute to send to the original_resource Presenter
+    #
+    # Returns a String.
+    def amendments_form_fields_value(original_resource, attribute)
+      return params[:amendment][:emendation_params][attribute] if params[:amendment].present?
 
-      present(form.object.send(original)).send(key)
+      present(send(original_resource)).send(attribute)
     end
   end
 end

data/app/helpers/decidim/cells_helper.rb

@@ -34,6 +34,7 @@ module Decidim
       return unless from_context
       return unless proposals_controller?
       return if index_action?
+
       from_context.withdrawable_by?(current_user)
     end
 
@@ -41,6 +42,7 @@ module Decidim
       return unless from_context
       return unless proposals_controller? || collaborative_drafts_controller?
       return if index_action?
+
       true
     end
   end

data/app/helpers/decidim/layout_helper.rb

@@ -69,6 +69,7 @@ module Decidim
 
     def extended_navigation_bar(items, max_items: 5)
       return unless items.any?
+
       extra_items = items.slice((max_items + 1)..-1) || []
       active_item = items.find { |item| item[:active] }