decidim-core 0.28.6 → 0.29.0.rc1

data/app/forms/decidim/account_form.rb

@@ -21,10 +21,7 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname,
-              presence: true,
-              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
-              length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
@@ -69,7 +66,7 @@ module Decidim
 
     def unique_nickname
       return true if Decidim::UserBaseEntity.where(
-        "decidim_organization_id = ? AND nickname = ? ",
+        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
         context.current_organization.id,
         nickname.downcase
       ).where.not(id: context.current_user.id).empty?

data/app/forms/decidim/form.rb

@@ -11,5 +11,9 @@ module Decidim
              to: :context, prefix: false, allow_nil: true
 
     delegate :available_locales, to: :current_organization, allow_nil: true
+
+    alias organization current_organization
+    alias component current_component
+    alias participatory_space current_participatory_space
   end
 end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A form object used to fisnish signup from omniauth data
+  # A form object used to finish signup from omniauth data
   class OmniauthRegistrationForm < Form
     mimic :user
 

data/app/forms/decidim/upload_validation_form.rb

@@ -10,7 +10,7 @@ module Decidim
     # Property is named as attribute in upload modal and passthru validator, but
     # it cannot be named as attribute here.
     attribute :property, String
-    attribute :blob, Decidim::Attributes::Blob
+    attribute :blob, String
     attribute :form_class, String
 
     validates :resource_class, presence: true
@@ -73,7 +73,7 @@ module Decidim
     # This class provides ability to interpret the attachment context based on
     # the details available within the context of this class. Normally the
     # attachment context would be defined by the record to which the attachment
-    # are added to, e.g. proposals (participant contenxt) or participatory
+    # are added to, e.g. proposals (participant context) or participatory
     # processes (admin context). Unfortunately this information is not available
     # when the parameters are passed to the upload validation.
     class AttachmentContextProxy

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -43,7 +43,7 @@ module Decidim
       #
       # @param value [String] - The flash message.
       # @param alert_class [String] - The foundation class of the alert message.
-      # @param closable [Boolean] - Wether the close icon is added.
+      # @param closable [Boolean] - Whether the close icon is added.
       #
       # @return [String] the HTML with the alert box
       def alert_box(value, alert_class, closable, opts = {})

data/app/helpers/decidim/amendments_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module AmendmentsHelper
     include RichTextEditorHelper
 
-    TOTAL_STEPS = 4
+    TOTAL_STEPS = 2
 
     # Renders the state of an emendation
     #
@@ -130,14 +130,10 @@ module Decidim
 
     def current_step
       @current_step ||= case params[:action].to_sym
-                        when :new, :create
+                        when :new, :create, :edit_draft, :update_draft, :destroy_draft
                           1
-                        when :compare_draft
-                          2
-                        when :edit_draft, :update_draft, :destroy_draft
-                          3
                         when :preview_draft, :publish_draft
-                          4
+                          2
                         end
     end
 
@@ -147,10 +143,6 @@ module Decidim
             when 1
               :new
             when 2
-              :compare_draft
-            when 3
-              :edit_draft
-            when 4
               :preview_draft
             end
 
@@ -162,9 +154,7 @@ module Decidim
       case current_step
       when 1
         Decidim::ResourceLocatorPresenter.new(amendable).path
-      when 3
-        Decidim::Core::Engine.routes.url_helpers.compare_draft_amend_path(amendable.amendment)
-      when 4
+      when 2
         Decidim::Core::Engine.routes.url_helpers.edit_draft_amend_path(amendable.amendment)
       end
     end

data/app/helpers/decidim/application_helper.rb

@@ -105,5 +105,13 @@ module Decidim
     def prevent_timeout_seconds
       0
     end
+
+    def text_initials(name)
+      name.split(/[\s.]+/).map(&:chr).slice(0, 2).join.upcase
+    end
+
+    def add_body_classes(*class_names)
+      content_for :body_class, class_names.map { |class_name| " #{class_name.strip}" }.join
+    end
   end
 end

data/app/helpers/decidim/authorization_form_helper.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A heper to expose an easy way to add authorization forms in a view.
+  # A helper to expose an easy way to add authorization forms in a view.
   module AuthorizationFormHelper
     # Creates a ew authorization form in a view, accepts the same arguments as
     # `form_for`.
     #
-    # record  - The record to use in the form, it shoulde be a descendant of
+    # record  - The record to use in the form, it should be a descendant of
     # AuthorizationHandler.
     # options - An optional hash with options to pass wo the form builder.
     # block   - A block with the content of the form.

data/app/helpers/decidim/breadcrumb_helper.rb

@@ -22,7 +22,7 @@ module Decidim
     #   HasBreadcrumbItems concern with the add_breadcrumb_item_from_menu
     #   method. The list contains the identifier of a menu to insert its items
     #   in the breadcrumb displaying the active element.
-    # * controller_breadcrumb_items: A list of additional breadrumb items
+    # * controller_breadcrumb_items: A list of additional breadcrumb items
     #   which is expected to receive its elements from controllers and contains
     #   the last items of the breadcrumb.
     def breadcrumb_items(context = :public)

data/app/helpers/decidim/cells_helper.rb

@@ -15,7 +15,7 @@ module Decidim
     end
 
     def current_component
-      from_context.component
+      context[:controller].try(:current_component) || from_context.component
     end
 
     def withdrawable?

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -92,7 +92,7 @@ module Decidim
     end
 
     def filter_global_scopes_values
-      filter_scopes_values_from(current_organization.scopes.top_level.includes(:scope_type, :children))
+      filter_scopes_values_from(current_organization.scopes.top_level)
     end
 
     def filter_areas_values

data/app/helpers/decidim/cta_button_helper.rb

@@ -16,7 +16,7 @@ module Decidim
     # Finds the CTA button path to reuse it in other places.
     def cta_button_path
       if current_organization.cta_button_path.present?
-        "/#{current_organization.cta_button_path}"
+        current_organization.cta_button_path
       elsif Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?
         decidim_participatory_processes.participatory_processes_path
       elsif current_user

data/app/helpers/decidim/datalist_select_helper.rb

@@ -3,7 +3,7 @@
 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.
+    # Public: Creates HTML for datalist select so that you can use separate ids and labels.
     #
     # items - Items in datalist, item should have id and name.
     # options - a Hash with options

data/app/helpers/decidim/decidim_form_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A heper to expose an easy way to add authorization forms in a view.
+  # A helper to expose an easy way to add authorization forms in a view.
   module DecidimFormHelper
     # A custom form for that injects client side validations with Abide.
     #
@@ -12,7 +12,7 @@ module Decidim
     # Returns a String.
     def decidim_form_for(record, options = {}, &)
       options[:data] ||= {}
-      options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
+      options[:data].update(:abide => true, "live-validate" => true, "validate-on-blur" => true)
 
       options[:html] ||= {}
       options[:html].update(novalidate: true) unless options[:html].has_key?(:novalidate)
@@ -25,7 +25,7 @@ module Decidim
       if record.is_a?(ActiveRecord::Base)
         object = record.is_a?(Array) ? record.last : record
         format = options[:format]
-        apply_form_for_options!(record, object, options) if object
+        apply_form_for_options!(object, options) if object
         options[:format] = format if format
       end
 

data/app/helpers/decidim/filters_helper.rb

@@ -34,7 +34,7 @@ module Decidim
 
     private
 
-    # Creates a unique namespace for a filter form to prevent dupliacte IDs in
+    # Creates a unique namespace for a filter form to prevent duplicate IDs in
     # the DOM when multiple filter forms are rendered with the same fields (e.g.
     # for desktop and mobile).
     def filter_form_namespace

data/app/helpers/decidim/layout_helper.rb

@@ -3,6 +3,7 @@
 module Decidim
   # View helpers related to the layout.
   module LayoutHelper
+    include Decidim::OrganizationHelper
     include Decidim::ModalHelper
     include Decidim::TooltipHelper
 
@@ -129,28 +130,6 @@ module Decidim
       }
     end
 
-    # Renders a view with the customizable CSS variables in two flavours:
-    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
-    # 2. as a disassembled RGB components (ie: 255 0 0)
-    #
-    # Example:
-    #
-    # --primary: #ff0000;
-    # --primary-rgb: 255 0 0
-    #
-    # Hexadecimal variables can be used as a normal CSS color:
-    #
-    # color: var(--primary)
-    #
-    # While the disassembled variant can be used where you need to manipulate
-    # the color somehow (ie: adding a background transparency):
-    #
-    # background-color: rgba(var(--primary-rgb), 0.5)
-    def organization_colors
-      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
-      render partial: "layouts/decidim/organization_colors", locals: { css: }
-    end
-
     def current_user_unread_data
       return {} if current_user.blank?
 
@@ -161,50 +140,8 @@ module Decidim
       end
     end
 
-    def organization_description_label
-      @organization_description_label ||= if empty_organization_description?
-                                            t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body_html")
-                                          else
-                                            decidim_sanitize_admin(translated_attribute(current_organization.description))
-                                          end
-    end
-
-    def current_url(params = request.parameters)
-      return url_for(params) if respond_to?(:current_participatory_space) || respond_to?(:current_component)
-
-      each_decidim_engine do |helpers|
-        return helpers.url_for(params)
-      rescue ActionController::UrlGenerationError
-        # Continue to next engine in case the URL is not available.
-      end
-
-      main_app.url_for(params)
-    rescue ActionController::UrlGenerationError
-      "#{request.base_url}#{"?#{params.to_query}" unless params.empty?}"
-    end
-
     private
 
-    def empty_organization_description?
-      organization_description = translated_attribute(current_organization.description)
-
-      organization_description.blank? || organization_description == "<p></p>"
-    end
-
-    def each_decidim_engine
-      Rails.application.railties.each do |engine|
-        next unless engine.is_a?(Rails::Engine)
-        next unless engine.isolated?
-        next unless engine.engine_name.start_with?("decidim_")
-        next unless respond_to?(engine.engine_name)
-
-        yield public_send(engine.engine_name)
-      end
-      return unless respond_to?(:decidim)
-
-      yield decidim
-    end
-
     def tag_builder
       @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
     end

data/app/helpers/decidim/localized_locales_helper.rb

@@ -21,7 +21,7 @@ module Decidim
     # locales.
     #
     # collection - an Array of Strings. By default it uses all the available
-    #   locales in Decidim, but you can passa nother collection of locales (for
+    #   locales in Decidim, but you can pass another collection of locales (for
     #   example, the available locales for an organization)
     def localized_locales(collection = Decidim.available_locales)
       klass = Class.new do

data/app/helpers/decidim/map_helper.rb

@@ -35,12 +35,7 @@ module Decidim
             data: { "external-link": "text-only" }
           }.merge(map_html_options)
           return link_to(map_url, html_options) do
-            # We also add the latitude and the longitude to prevent the Workbox cache to be overly aggressive when updating a map
-            image_tag decidim.static_map_path(
-              sgid: resource.to_sgid.to_s,
-              latitude: resource.latitude,
-              longitude: resource.longitude
-            ), alt: "#{map_service_brand} - #{address_text}"
+            image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s), alt: "#{map_service_brand} - #{address_text}"
           end
         end
       end

data/app/helpers/decidim/menu_helper.rb

@@ -43,13 +43,21 @@ module Decidim
       )
     end
 
+    def mobile_breadcrumb_root_menu
+      @mobile_breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
+        :mobile_menu,
+        self,
+        container_options: { class: "menu-bar__main-dropdown__menu" }
+      )
+    end
+
     def footer_menu
       @footer_menu ||= ::Decidim::FooterMenuPresenter.new(
         :menu,
         self,
         element_class: "font-semibold underline",
         active_class: "is-active",
-        container_options: { class: "space-y-4 break-inside-avoid", role: :menu },
+        container_options: { class: "space-y-4 break-inside-avoid" },
         label: t("layouts.decidim.footer.decidim_title")
       )
     end

data/app/helpers/decidim/meta_tags_helper.rb

@@ -3,13 +3,13 @@
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
-    # Public: Sets the given metatags for the page. It is a wrapper for the individual
+    # Sets the given metatags for the page. It is a wrapper for the individual
     # methods, so that you can set multiple values with a single call. See the docs for
     # the other methods to see how they work.
     #
-    # tags - A Hash containing the meta tag name as keys and its content as values.
+    # @param [Hash] tags - A Hash containing the meta tag name as keys and its content as values.
     #
-    # Returns nothing.
+    # @return [nil]
     def add_decidim_meta_tags(tags)
       add_decidim_page_title(tags[:title])
       add_decidim_meta_description(tags[:description])
@@ -18,9 +18,11 @@ module Decidim
       add_decidim_meta_image_url(add_base_url_to(tags[:image_url]))
     end
 
-    # Public: Add base url to path if path does not include host.
-    # path - A String containing path (e.g. "/proposals/1" )
-    # Returns a String of URL including base URL and path, or path if it is blank.
+    # Add base url to path if path does not include host.
+    #
+    # @parma [String] path - A String containing path (e.g. "/proposals/1" )
+    #
+    # @return [String] - a String of URL including base URL and path, or path if it is blank.
     def add_base_url_to(path)
       return path if path.blank?
       return path if URI.parse(path).host.present?
@@ -28,8 +30,9 @@ module Decidim
       "#{resolve_base_url}#{path}"
     end
 
-    # Public: Resolve base url (example: https://www.decidim.org) without url params
-    # Returns a String of base URL
+    # Resolve base url (example: https://www.decidim.org) without url params
+    #
+    # @return [String] -  a String of base URL
     def resolve_base_url
       return request.base_url if respond_to?(:request) && request&.base_url.present?
 
@@ -41,20 +44,20 @@ module Decidim
       end
     end
 
-    # Public: Accumulates the given `title` so that they can be chained. Since Rails views
-    # are rendered inside-out, `title` is appended to an array. This way the beggining of
+    #  Accumulates the given `title` so that they can be chained. Since Rails views
+    # are rendered inside-out, `title` is appended to an array. This way the beginning of
     # the title will be the most specific one. Use the `decidim_page_title` method to
     # render the title whenever you need to (most surely, in the `<title>` tag in the HTML
     # head and in some `title` metatags).
     #
-    # Example:
+    # @example
     #   add_decidim_page_title("My Process")
     #   add_decidim_page_title("My Organization")
     #   decidim_page_title # => "My Process - My Organization"
     #
-    # title - A String to be added to the title
+    # @param [String] title - A String to be added to the title
     #
-    # Returns an Array of Strings.
+    # @return [Array<String>]
     def add_decidim_page_title(title)
       @decidim_page_title ||= []
       return @decidim_page_title if title.blank?
@@ -62,11 +65,11 @@ module Decidim
       @decidim_page_title << title
     end
 
-    # Public: Renders the title for a page. Use the `add_decidim_page_title` method to
+    # Renders the title for a page. Use the `add_decidim_page_title` method to
     # accumulate elements for the title. Basically, it joins the elements of the title
     # array with `" - "`.
     #
-    # Returns a String.
+    # @return [String]
     def decidim_page_title
       (@decidim_page_title || []).join(" - ")
     end
@@ -80,9 +83,9 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # description - The String to be set as description
+    # @param [String] description - The String to be set as description
     #
-    # Returns nothing.
+    # @return [nil]
     def add_decidim_meta_description(description)
       @decidim_meta_description ||= strip_tags(description)
     end
@@ -93,9 +96,9 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # twitter_handler - The String to be set as Twitter handler
+    # @param [String] twitter_handler - The String to be set as Twitter handler
     #
-    # Returns nothing.
+    # @return [nil]
     def add_decidim_meta_twitter_handler(twitter_handler)
       @decidim_meta_twitter_handler ||= twitter_handler
     end
@@ -106,9 +109,9 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # url - The String to be set as URL
+    # @param [String] url - The String to be set as URL
     #
-    # Returns nothing.
+    # @return [nil]
     def add_decidim_meta_url(url)
       @decidim_meta_url ||= url
     end
@@ -119,9 +122,9 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # image_url - The String to be set as image URL
+    # @param [String] image_url - The String to be set as image URL
     #
-    # Returns nothing.
+    # @return [nil]
     def add_decidim_meta_image_url(image_url)
       @decidim_meta_image_url ||= image_url
     end

data/app/helpers/decidim/modal_helper.rb

@@ -8,7 +8,7 @@ module Decidim
   # you also can add your custom close button through data-dialog-close="<seed>"
   #
   # Options available:
-  #  - id: String. Unique identificator for the dialog, if the page has distinct modal windows (default: "")
+  #  - id: String. Unique identifier for the dialog, if the page has distinct modal windows (default: "")
   #  - class: String. CSS classes for the modal content.
   #  - closable: Boolean. Whether the modal can be closed or not (default: true)
   module ModalHelper

data/app/helpers/decidim/orders_helper.rb

@@ -7,14 +7,13 @@ module Decidim
     # (Note) This method requires the javascript 'decidim/orders' to be
     # present in the page.
     #
-    # orders - An array of order criterias
+    # orders - An array of order criteria
     # options - An optional hash of options
     #         * i18n_scope - The scope of the i18n translations
     def order_selector(orders, options = {})
       render partial: "decidim/shared/orders", locals: {
         orders:,
-        i18n_scope: options[:i18n_scope],
-        css_class: options[:css_class]
+        i18n_scope: options[:i18n_scope]
       }
     end
 

data/app/helpers/decidim/organization_helper.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  # View helpers related to the organization.
+
+  module OrganizationHelper
+    include Decidim::TranslatableAttributes
+
+    # Renders a view with the customizable CSS variables in two flavours:
+    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
+    # 2. as a disassembled RGB components (ie: 255 0 0)
+    #
+    # Example:
+    #
+    # --primary: #ff0000;
+    # --primary-rgb: 255 0 0
+    #
+    # Hexadecimal variables can be used as a normal CSS color:
+    #
+    # color: var(--primary)
+    #
+    # While the disassembled variant can be used where you need to manipulate
+    # the color somehow (ie: adding a background transparency):
+    #
+    # background-color: rgba(var(--primary-rgb), 0.5)
+    def organization_colors
+      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
+      render partial: "layouts/decidim/organization_colors", locals: { css: }
+    end
+
+    def organization_description_label
+      @organization_description_label ||= if empty_organization_description?
+                                            t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body_html")
+                                          else
+                                            decidim_sanitize_admin(translated_attribute(current_organization.description))
+                                          end
+    end
+
+    def organization_name(organization = current_organization)
+      translated_attribute(organization.name, organization)
+    end
+
+    def current_organization_name
+      organization_name(current_organization)
+    end
+
+    private
+
+    def empty_organization_description?
+      organization_description = translated_attribute(current_organization.description)
+
+      organization_description.blank? || organization_description == "<p></p>"
+    end
+  end
+end

data/app/helpers/decidim/paginate_helper.rb

@@ -11,14 +11,16 @@ module Decidim
     def decidim_paginate(collection, paginate_params = {})
       return if collection.total_pages <= 1
 
-      per_page = (params[:per_page] || paginate_params[:per_page] || Decidim::Paginable::OPTIONS.first).to_i
-
       content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16", data: { pagination: "" } do
         template = ""
-        template += render(partial: "decidim/shared/results_per_page", locals: { per_page: }, formats: [:html]) if collection.total_pages.positive?
+        template += render(partial: "decidim/shared/results_per_page", formats: [:html]) if collection.total_pages.positive?
         template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: paginate_params
         template.html_safe
       end
     end
+
+    def per_page
+      params[:per_page].to_i || Decidim::Paginable::OPTIONS.first
+    end
   end
 end

data/app/helpers/decidim/participatory_space_helpers.rb

@@ -28,7 +28,7 @@ module Decidim
     end
 
     def participatory_space_floating_help
-      return if help_section.blank? || strip_tags(translated_attribute(help_section).html_safe).blank?
+      return if help_section.blank?
 
       floating_help(help_id) { translated_attribute(help_section).html_safe }
     end

data/app/helpers/decidim/resource_helper.rb

@@ -47,12 +47,5 @@ module Decidim
 
       ::Decidim::ResourceLocatorPresenter.new(resource)
     end
-
-    # Returns a descriptive title for the resource
-    def resource_title(resource)
-      title = resource.try(:title) || resource.try(:name) || resource.try(:subject) || "#{resource.model_name.human} ##{resource.id}"
-      title = translated_attribute(title) if title.is_a?(Hash)
-      title
-    end
   end
 end