decidim-core 0.26.9 → 0.27.0.rc1

data/app/controllers/decidim/user_activities_controller.rb

@@ -19,34 +19,50 @@ module Decidim
     private
 
     def user
-      @user ||= current_organization.users.find_by(nickname: params[:nickname])
+      return unless params[:nickname]
+
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities
       @activities ||= paginate(
-        ActivitySearch.new(
-          organization: current_organization,
-          user: user,
-          current_user: current_user,
-          resource_type: "all",
-          resource_name: filter.resource_type
-        ).run
+        if own_activities?
+          OwnActivities.new(current_organization, **activity_options).query.with_private_resources
+        else
+          PublicActivities.new(current_organization, **activity_options).query.with_all_resources
+        end
       )
     end
 
+    def activity_options
+      {
+        user: user,
+        current_user: current_user,
+        resource_name: filter.resource_type
+      }
+    end
+
+    def own_activities?
+      @own_activities ||= current_user == user
+    end
+
     def default_filter_params
       { resource_type: nil }
     end
 
     def resource_types
-      @resource_types = %w(Decidim::Proposals::CollaborativeDraft
-                           Decidim::Comments::Comment
-                           Decidim::Debates::Debate
-                           Decidim::Initiative
-                           Decidim::Meetings::Meeting
-                           Decidim::Blogs::Post
-                           Decidim::Proposals::Proposal
-                           Decidim::Consultations::Question)
+      @resource_types = begin
+        array = %w(Decidim::Proposals::CollaborativeDraft
+                   Decidim::Comments::Comment
+                   Decidim::Debates::Debate
+                   Decidim::Initiative
+                   Decidim::Meetings::Meeting
+                   Decidim::Blogs::Post
+                   Decidim::Proposals::Proposal
+                   Decidim::Consultations::Question)
+        array << "Decidim::Budgets::Order" if own_activities?
+        array
+      end
     end
   end
 end

data/app/controllers/decidim/user_interests_controller.rb

@@ -5,8 +5,6 @@ module Decidim
   class UserInterestsController < Decidim::ApplicationController
     include Decidim::UserProfile
 
-    helper_method :scopes
-
     def show
       enforce_permission_to :read, :user, current_user: current_user
       @user_interests = form(UserInterestsForm).from_model(current_user)

data/app/controllers/decidim/user_timeline_controller.rb

@@ -12,27 +12,25 @@ module Decidim
     helper_method :activities, :resource_types, :user
 
     def index
-      raise ActionController::RoutingError, "Not Found" unless user && current_user == user
+      raise ActionController::RoutingError, "Not Found" if current_user != user
     end
 
     private
 
     def user
-      @user ||= Decidim::User.find_by(
-        organization: current_organization,
-        nickname: params[:nickname]
-      )
+      return unless params[:nickname]
+
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities
       @activities ||= paginate(
-        ActivitySearch.new(
-          organization: current_organization,
-          resource_type: "all",
+        PublicActivities.new(
+          current_organization,
           scopes: current_user.interested_scopes,
           follows: follows,
           resource_name: filter.resource_type
-        ).run
+        ).query.with_resource_type("all")
       )
     end
 

data/app/events/decidim/change_nickname_event.rb

@@ -0,0 +1,21 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ChangeNicknameEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    delegate :organization, to: :user, prefix: false
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :link_to_account_settings
+
+    def notification_title
+      I18n.t("decidim.events.nickname_event.notification_body", **i18n_options).to_s.html_safe
+    end
+
+    def i18n_options
+      {
+        link_to_account_settings: url_helpers.account_path
+      }
+    end
+  end
+end

data/app/events/decidim/resource_endorsed_event.rb

@@ -15,8 +15,7 @@ module Decidim
     end
 
     def resource_text
-      return resource.body if resource.respond_to? :body
-      return resource.description if resource.respond_to? :description
+      resource.body
     end
 
     def resource_type

data/app/forms/decidim/account_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # account in her profile page.
+  # account in their profile page.
   class AccountForm < Form
     include Decidim::HasUploadValidations
 
@@ -19,12 +19,12 @@ module Decidim
     attribute :personal_url
     attribute :about
 
-    validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
+    validates :name, presence: true
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
+    validates :nickname, presence: true, format: Decidim::User::REGEXP_NICKNAME
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
-    validates :password, confirmation: { message: I18n.t("errors.messages.password_confirmation_message") }
+    validates :password, confirmation: true
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
     validates :password_confirmation, presence: true, if: :password_present
     validates :avatar, passthru: { to: Decidim::User }

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

@@ -66,8 +66,7 @@ module Decidim
           errors = amendable_form_errors.details[key] - @original_form.errors.details[key]
 
           errors.map do |hash|
-            error = hash.delete(:error)
-            @amendable_form.errors.add(key, error, **hash) unless @amendable_form.errors.details[key].include?(error: error)
+            @amendable_form.errors.add(key, hash[:error]) unless @amendable_form.errors.details[key].include? error: hash[:error]
           end
         end
       end

data/app/forms/decidim/form.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A base form object to hold common logic, like automatically adding as
   # public method the params sent as context by the `FormFactory` concern.
-  class Form < Rectify::Form
+  class Form < Decidim::AttributeObject::Form
     delegate :current_organization,
              :current_user,
              :current_component,

data/app/forms/decidim/messaging/conversation_form.rb

@@ -7,7 +7,7 @@ module Decidim
       mimic :conversation
 
       attribute :body, Decidim::Attributes::CleanString
-      attribute :recipient_id, Integer
+      attribute :recipient_id, [Integer]
 
       validates :body, :recipient, presence: true, length: { maximum: Decidim.config.maximum_conversation_message_length }
       validate :check_recipient

data/app/forms/decidim/notifications_settings_form.rb

@@ -2,22 +2,24 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # notifications settings in her profile page.
+  # notifications settings in their profile page.
   class NotificationsSettingsForm < Form
     mimic :user
 
-    attribute :email_on_notification, Boolean
     attribute :email_on_moderations, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean
     attribute :allow_public_contact, Boolean
+    attribute :notification_settings, Hash
+    attribute :notifications_sending_frequency, String
 
     def map_model(user)
       self.newsletter_notifications = user.newsletter_notifications_at.present?
       self.notifications_from_followed = ["all", "followed-only"].include? user.notification_types
       self.notifications_from_own_activity = ["all", "own-only"].include? user.notification_types
       self.allow_public_contact = user.direct_message_types == "all"
+      self.notifications_sending_frequency = user.notifications_sending_frequency
     end
 
     def newsletter_notifications_at
@@ -41,5 +43,17 @@ module Decidim
     def direct_message_types
       allow_public_contact ? "all" : "followed-only"
     end
+
+    def user_is_moderator?(user)
+      Decidim.participatory_space_manifests.map do |manifest|
+        participatory_space_type = manifest.model_class_name.constantize
+        return true if participatory_space_type.moderators(user.organization).exists?(id: user.id)
+      end
+      false
+    end
+
+    def meet_push_notifications_requirements?
+      Rails.application.secrets.vapid[:enabled]
+    end
   end
 end

data/app/forms/decidim/password_form.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class PasswordForm < Form
+    attribute :password
+    attribute :password_confirmation
+
+    validates :password, confirmation: true
+  end
+end

data/app/forms/decidim/registration_form.rb

@@ -14,10 +14,10 @@ module Decidim
     attribute :tos_agreement, Boolean
     attribute :current_locale, String
 
-    validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
-    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }, length: { maximum: Decidim::User.nickname_max_length }
+    validates :name, presence: true
+    validates :nickname, presence: true, format: Decidim::User::REGEXP_NICKNAME, length: { maximum: Decidim::User.nickname_max_length }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :password, confirmation: { message: I18n.t("errors.messages.password_confirmation_message") }
+    validates :password, confirmation: true
     validates :password, password: { name: :name, email: :email, username: :nickname }
     validates :password_confirmation, presence: true
     validates :tos_agreement, allow_nil: false, acceptance: true

data/app/forms/decidim/upload_validation_form.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object used to handle upload validations, this is used when user is
+  # adding files to dropzone in upload modal.
+  class UploadValidationForm < Decidim::Form
+    include Decidim::HasUploadValidations
+
+    attribute :resource_class, String
+    # Property is named as attribute in upload modal and passthru validator, but it
+    # cannot be named as attribute here.
+    attribute :property, String
+    attribute :blob, String
+    attribute :form_class, String
+
+    validates :resource_class, presence: true
+    validates :property, presence: true
+    validates :blob, presence: true
+    validate :file, if: ->(form) { form.resource_class.present? && form.property.present? && form.blob.present? }
+
+    def file
+      org = organization
+      PassthruValidator.new(
+        attributes: [property],
+        to: resource_class.constantize,
+        with: lambda { |record|
+          validate_with.tap do |hash|
+            hash.merge!(organization: record.try(:organization) || org) if !hash[:organization] && record.respond_to?(:organization=)
+          end
+        }
+      ).validate_each(self, property.to_sym, blob)
+    end
+
+    private
+
+    def validate_with
+      if form_object_class && form_object_class._validators[property.to_sym].is_a?(Array) && form_object_class._validators[property.to_sym].size.positive?
+        passthru = form_object_class._validators[property.to_sym].find { |v| v.is_a?(PassthruValidator) }
+        return passthru.options[:with] if passthru && passthru.options[:with].present?
+      end
+      {}
+    end
+
+    def form_object_class
+      @form_object_class ||= begin
+        form_class.constantize if form_class.present?
+      rescue NameError
+        nil
+      end
+    end
+
+    alias organization current_organization
+  end
+end

data/app/forms/decidim/user_group_form.rb

@@ -16,7 +16,7 @@ module Decidim
     attribute :phone
 
     validates :name, presence: true
-    validates :email, presence: true, 'valid_email_2/email': { disposable: true }
+    validates :email, presence: true, "valid_email_2/email": { disposable: true }
     validates :nickname, presence: true
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }

data/app/forms/decidim/user_interest_scope_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestScopeForm < Form
     mimic :scope
 

data/app/forms/decidim/user_interests_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestsForm < Form
     mimic :user
 

data/app/forms/translatable_presence_validator.rb

@@ -9,7 +9,7 @@
 # object (or the `default_locale` of the form's organization) for the given field.
 class TranslatablePresenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
-    translated_attr = "#{attribute}_#{default_locale_for(record)}"
+    translated_attr = "#{attribute}_#{default_locale_for(record)}".gsub("-", "__")
     record.errors.add(translated_attr, :blank) if record.send(translated_attr).blank?
   end
 
@@ -22,7 +22,7 @@ class TranslatablePresenceValidator < ActiveModel::EachValidator
       record.current_organization.default_locale
     else
       record.errors.add(:current_organization, :blank)
-      []
+      Decidim.default_locale
     end
   end
 end

data/app/forms/url_validator.rb

@@ -6,7 +6,7 @@
 #
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add attribute, :url_format, **options unless url_valid?(value)
+    record.errors.add attribute, (options[:message] || "must be a valid URL") unless url_valid?(value)
   end
 
   # a URL may be technically well-formed but may

data/app/helpers/decidim/application_helper.rb

@@ -114,9 +114,9 @@ module Decidim
       base_url, params = decidim_participatory_processes.participatory_process_path(process).split("?")
 
       if params.present?
-        [base_url, "/", process.active_step.cta_path, "?", params].join("")
+        [base_url, "/", process.active_step.cta_path, "?", params].join
       else
-        [base_url, "/", process.active_step.cta_path].join("")
+        [base_url, "/", process.active_step.cta_path].join
       end
     end
 

data/app/helpers/decidim/attachments_helper.rb

@@ -10,7 +10,7 @@ module Decidim
     #
     # Returns nothing.
     def attachments_for(attached_to)
-      render partial: "decidim/application/attachments.html", locals: { attached_to: attached_to }
+      render partial: "decidim/application/attachments", locals: { attached_to: attached_to }
     end
 
     # Renders the attachment's title.

data/app/helpers/decidim/cells_helper.rb

@@ -35,7 +35,6 @@ module Decidim
     end
 
     def user_flaggable?
-      return if (try(:profile_holder) || try(:profile_user) || try(:model)).try(:blocked)
       return unless context[:controller].try(:flaggable_controller?)
 
       true

data/app/helpers/decidim/cells_paginate_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     include Cell::ViewModel::Partial
     include Decidim::PaginateHelper
 
-    def paginate(scope, options = {}, &block)
+    def paginate(scope, **options, &block)
       options = options.reverse_merge(views_prefix: "../views/")
       super
     end

data/app/helpers/decidim/datalist_select_helper.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides a single method to create datalist select.
+  module DatalistSelectHelper
+    # Public: Creates HTML for datalist select so that you can use seperate ids and labels.
+    #
+    # items - Items in datalist, item should have id and name.
+    # options - a Hash with options
+    #           :id - id of wrapper
+    #           :class - wrapper css classes
+    #           :data - wrapper data attributes
+    #           :label - label for input
+    #           :name - name of input
+    #           :autocomplete - enable or disable autocomplete provided by browser.
+    #           :list - id of datalist
+    # yield - additional html (e.g. hidden input)
+    #
+    # Returns a HTML String div containing following children: label, input and datalist elements.
+    def datalist_select(items, options = {})
+      default_options = {
+        list: "datalist-list",
+        autocomplete: "off"
+      }
+      options = default_options.merge(options)
+      tag.div(id: options[:id], class: options[:class], data: options[:data]) do
+        html = ""
+        html += yield if block_given?
+        html += tag.label(options[:label], for: options[:name])
+        html += tag.input(type: "text", name: options[:name], list: options[:list], autocomplete: options[:autocomplete], placeholder: options[:placeholder])
+        html += tag.datalist(id: options[:list]) do
+          items.map do |item|
+            tag.option(translated_attribute(item.name), data: { value: item.id })
+          end.join.html_safe
+        end
+        html.html_safe
+      end
+    end
+  end
+end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -190,7 +190,7 @@ module Decidim
           request.protocol,
           request.host_with_port,
           prepend_slug_path
-        ].join("").html_safe +
+        ].join.html_safe +
           content_tag(:span, value, class: "slug-url-value")
       end
     end

data/app/helpers/decidim/external_domain_helper.rb

@@ -3,21 +3,10 @@
 module Decidim
   module ExternalDomainHelper
     def highlight_domain
-      highlighted_domain = [
-        external_url.host,
-        (external_url.port && [80, 443].include?(external_url.port) ? "" : ":#{external_url.port}")
-      ].join
-
-      path = [
-        external_url.path,
-        (external_url.query ? "?#{external_url.query}" : ""),
-        (external_url.fragment ? "##{external_url.fragment}" : "")
-      ].join
-
       tag.div do
-        content_tag(:span, "#{external_url.scheme}://") +
-          content_tag(:span, highlighted_domain, class: "text-alert") +
-          content_tag(:span, path)
+        content_tag(:span, "#{@url_parts[:protocol]}//") +
+          content_tag(:span, @url_parts[:domain], class: "alert") +
+          content_tag(:span, @url_parts[:path])
       end
     end
   end

data/app/helpers/decidim/filters_helper.rb

@@ -24,11 +24,7 @@ module Decidim
           remote: true,
           html: { id: nil }.merge(html_options)
         ) do |form|
-          # Cannot use `concat()` here because it's not available in cells
-          inner = []
-          inner << hidden_field_tag("per_page", params[:per_page], id: nil) if params[:per_page]
-          inner << capture { yield form }
-          inner.join.html_safe
+          yield form
         end
       end
     end

data/app/helpers/decidim/followable_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module FollowableHelper
     # Invokes the decidim/shared/follow_button partial.
     def follow_button_for(model, large = nil)
-      render partial: "decidim/shared/follow_button.html", locals: { followable: model, large: large }
+      controller.view_context.render partial: "decidim/shared/follow_button", locals: { followable: model, large: large }
     end
   end
 end

data/app/helpers/decidim/icon_helper.rb

@@ -24,7 +24,7 @@ module Decidim
     #
     # Returns an HTML tag with the icon.
     def manifest_icon(manifest, options = {})
-      if manifest.respond_to?(:icon) && manifest.icon.present?
+      if manifest.icon
         external_icon manifest.icon, options
       else
         icon "question-mark", options
@@ -40,11 +40,11 @@ module Decidim
     #
     # Returns an HTML tag with the icon.
     def resource_icon(resource, options = {})
-      if resource.class.name == "Decidim::Comments::Comment"
+      if resource.instance_of?(Decidim::Comments::Comment)
         icon "comment-square", options
-      elsif resource.respond_to?(:component) && resource.component.present?
+      elsif resource.respond_to?(:component)
         component_icon(resource.component, options)
-      elsif resource.respond_to?(:manifest) && resource.manifest.present?
+      elsif resource.respond_to?(:manifest)
         manifest_icon(resource.manifest, options)
       elsif resource.is_a?(Decidim::User)
         icon "person", options

data/app/helpers/decidim/layout_helper.rb

@@ -15,6 +15,20 @@ module Decidim
       end)
     end
 
+    def apple_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
+    end
+
+    def legacy_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:small, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image.gsub(".png", ".ico"), rel: "icon", sizes: "any", type: nil)
+    end
+
     # Outputs an SVG-based icon.
     #
     # name    - The String with the icon name.
@@ -74,11 +88,8 @@ module Decidim
       classes = _icon_classes(options) + ["external-icon"]
 
       if path.split(".").last == "svg"
-        icon_path = application_path(path)
-        return unless icon_path
-
         attributes = { class: classes.join(" ") }.merge(options)
-        asset = File.read(icon_path)
+        asset = File.read(application_path(path))
         asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
       else
         image_pack_tag(path, class: classes.join(" "), style: "display: none")
@@ -86,17 +97,9 @@ module Decidim
     end
 
     def application_path(path)
-      # Force the path to be returned without the protocol and host even when a
-      # custom asset host has been defined. The host parameter needs to be a
-      # non-nil because otherwise it will be set to the asset host at
-      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
-      img_path = asset_pack_path(path, host: "", protocol: :relative)
-      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
-      return unless File.exist?(path)
-
-      path
-    rescue ::Webpacker::Manifest::MissingEntryError
-      nil
+      img_path = asset_pack_path(path)
+      img_path = URI(img_path).path if Decidim.cors_enabled
+      Rails.root.join("public/#{img_path}")
     end
 
     # Allows to create role attribute according to accessibility rules
@@ -118,7 +121,7 @@ module Decidim
       extra_items = items.slice((max_items + 1)..-1) || []
       active_item = items.find { |item| item[:active] }
 
-      render partial: "decidim/shared/extended_navigation_bar.html", locals: {
+      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
         items: items,
         extra_items: extra_items,
         active_item: active_item,