decidim-core 0.29.1 → 0.30.0.rc1

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -9,6 +9,7 @@ module Decidim
     # used in filters that uses checkboxes trees
     def check_boxes_tree_options(value, label, **options)
       parent_id = options.delete(:parent_id) || ""
+      object = options.delete(:object)
       checkbox_options = {
         value:,
         label:,
@@ -16,10 +17,16 @@ module Decidim
         include_hidden: false,
         label_options: {
           "data-children-checkbox": parent_id,
-          value:
+          value:,
+          for: "#{options[:namespace]}_#{options[:id]}"
         }
       }
       options.merge!(checkbox_options)
+      # as taxonomies work with a nested array of values, we need to manually check if the value is checked
+      matches = options[:id]&.match(/^with_any_taxonomies_([0-9]+)__taxonomy-([0-9_]+)/)
+      if matches.present? && object.respond_to?(:with_any_taxonomies) && object.with_any_taxonomies&.dig(matches[1]).is_a?(Array)
+        options[:checked] = object.with_any_taxonomies[matches[1]].include?(value.to_s)
+      end
 
       if options.delete(:is_root_check_box) == true
         options[:label_options].merge!("data-global-checkbox": "")
@@ -37,10 +44,14 @@ module Decidim
     end
 
     # struct for leafs of checkboxes trees
-    TreePoint = Struct.new(:value, :label) do
+    TreePoint = Struct.new(:value, :label, :root) do
       def tree_node?
         is_a?(TreeNode)
       end
+
+      def root?
+        root.present? || value.blank?
+      end
     end
 
     # Overwrite this method in your component helper to define
@@ -49,52 +60,29 @@ module Decidim
       raise StandardError, "Not implemented"
     end
 
-    def filter_categories_values
-      sorted_main_categories = current_participatory_space.categories.first_class.includes(:subcategories).sort_by do |category|
-        [category.weight, decidim_escape_translated(category.name)]
-      end
-
-      categories_values = sorted_main_categories.flat_map do |category|
-        sorted_descendant_categories = category.descendants.includes(:subcategories).sort_by do |subcategory|
-          [subcategory.weight, decidim_escape_translated(subcategory.name)]
-        end
-
-        subcategories = sorted_descendant_categories.flat_map do |subcategory|
-          TreePoint.new(subcategory.id.to_s, decidim_escape_translated(subcategory.name))
-        end
-
-        TreeNode.new(
-          TreePoint.new(category.id.to_s, decidim_escape_translated(category.name)),
-          subcategories
-        )
-      end
-
+    def filter_taxonomy_values_for(taxonomy_filter)
+      taxonomies = filter_taxonomy_values_children(taxonomy_filter.taxonomies)
       TreeNode.new(
-        TreePoint.new("", t("decidim.core.application_helper.filter_category_values.all")),
-        categories_values
+        TreePoint.new(taxonomy_filter.root_taxonomy_id, t("decidim.core.application_helper.filter_taxonomy_values.all"), true),
+        taxonomies
       )
     end
 
-    def resource_filter_scope_values(resource)
-      if resource.is_a?(Scope)
-        filter_scopes_values_from([resource], current_participatory_space)
-      else
-        filter_scopes_values
+    def filter_taxonomy_values_children(children)
+      children.map do |id, hash|
+        TreeNode.new(
+          TreePoint.new(id, decidim_escape_translated(hash[:taxonomy].name).html_safe),
+          filter_taxonomy_values_children(hash[:children])
+        )
       end
     end
 
-    def filter_scopes_values
-      return filter_scopes_values_from_parent(current_component.scope) if current_component.scope.present?
-
-      main_scopes = current_participatory_space.scopes.top_level
-                                               .includes(:scope_type, :children)
-      filter_scopes_values_from(main_scopes, current_participatory_space)
-    end
-
+    # pending initiatives removal
     def filter_global_scopes_values
       filter_scopes_values_from(current_organization.scopes.top_level)
     end
 
+    # pending initiatives removal
     def filter_areas_values
       areas_or_types = areas_for_select(current_organization)
 
@@ -135,22 +123,6 @@ module Decidim
 
     private
 
-    def filter_scopes_values_from_parent(scope)
-      scopes_values = []
-      scope.children.each do |child|
-        unless child.children
-          scopes_values << TreePoint.new(child.id.to_s, translated_attribute(child.name, current_participatory_space.organization))
-          next
-        end
-        scopes_values << TreeNode.new(
-          TreePoint.new(child.id.to_s, translated_attribute(child.name, current_participatory_space.organization)),
-          scope_children_to_tree(child, current_participatory_space)
-        )
-      end
-
-      filter_tree_from(scopes_values)
-    end
-
     def filter_scopes_values_from(scopes, participatory_space = nil)
       scopes_values = scopes.compact.flat_map do |scope|
         TreeNode.new(

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/decidim_form_helper.rb

@@ -62,35 +62,6 @@ module Decidim
       end
     end
 
-    # A custom helper to include a scope picker field without requiring a form
-    # object
-    #
-    # name - The input name
-    # value - The input value as a scope id
-    # options - The set of options to send to the field
-    #           :id - The id to generate for the element (optional)
-    #
-    # Returns a scopes picker tag to be included in an html template.
-    def scopes_picker_field_tag(name, value, id: nil)
-      picker_options = {
-        id: id || sanitize_to_id(name),
-        class: "picker-single",
-        name:
-      }
-
-      prompt_params = yield(nil)
-      selected_scopes = value ? Decidim::Scope.where(id: value) : []
-      scopes = selected_scopes.map { |scope| [scope, yield(scope)] }
-
-      template = ""
-      template += render("decidim/scopes/scopes_picker_input",
-                         picker_options:,
-                         prompt_params:,
-                         scopes:,
-                         values_on_top: true)
-      template.html_safe
-    end
-
     # A custom helper to include a translated field without requiring a form object.
     #
     # type        - The type of the translated input field.
@@ -220,20 +191,5 @@ module Decidim
 
       organization.area_types
     end
-
-    def ordered_scopes_descendants(root = nil)
-      root = try(:current_participatory_space)&.scope if root == false
-      if root.present?
-        root.descendants
-      else
-        current_organization.scopes
-      end.sort { |a, b| a.part_of.reverse <=> b.part_of.reverse }
-    end
-
-    def ordered_scopes_descendants_for_select(root = nil)
-      ordered_scopes_descendants(root).map do |scope|
-        [" #{"&nbsp;" * 4 * (scope.part_of.count - 1)} #{translated_attribute(scope.name)}".html_safe, scope&.id]
-      end
-    end
   end
 end

data/app/helpers/decidim/endorsable_helper.rb

@@ -3,16 +3,6 @@
 module Decidim
   # A Helper for views with Endorsable resources.
   module EndorsableHelper
-    # Invokes the decidim/endorsement_buttons cell.
-    def endorsement_buttons_cell(resource)
-      cell("decidim/endorsement_block", resource)
-    end
-
-    # Invokes the decidim/endorsers_list cell.
-    def endorsers_list_cell(resource)
-      cell("decidim/endorsers_list", resource)
-    end
-
     #
     # Public: Checks if the given resource has been endorsed by all identities of the user.
     #

data/app/helpers/decidim/layout_helper.rb

@@ -154,6 +154,12 @@ module Decidim
       "#{request.base_url}#{"?#{params.to_query}" unless params.empty?}"
     end
 
+    def root_url
+      return onboarding_manager.root_path if current_user&.ephemeral?
+
+      decidim.root_url(host: current_organization.host)
+    end
+
     private
 
     def each_decidim_engine

data/app/helpers/decidim/map_helper.rb

@@ -35,7 +35,12 @@ module Decidim
             data: { "external-link": "text-only" }
           }.merge(map_html_options)
           return link_to(map_url, html_options) do
-            image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s), alt: "#{map_service_brand} - #{address_text}"
+            # 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}"
           end
         end
       end

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -29,10 +29,9 @@ module Decidim
       # Generates a visualization of users for listing conversations threads
       #
       def username_list(users, shorten: false)
-        content_tags = []
         first_users = shorten ? users.first(3) : users
-        first_users.each do |u|
-          content_tags.push(u.deleted? ? t("decidim.profile.deleted") : u.name)
+        content_tags = first_users.map do |u|
+          u.deleted? ? t("decidim.profile.deleted") : u.name
         end
 
         return content_tags.join(", ") unless shorten

data/app/helpers/decidim/meta_tags_helper.rb

@@ -8,6 +8,7 @@ module Decidim
     # the other methods to see how they work.
     #
     # @param [Hash] tags - A Hash containing the meta tag name as keys and its content as values.
+    # @param [Object, nil] resource - The resource object that may contain the image.
     #
     # @return [nil]
     def add_decidim_meta_tags(tags)
@@ -15,33 +16,31 @@ module Decidim
       add_decidim_meta_description(tags[:description])
       add_decidim_meta_url(tags[:url])
       add_decidim_meta_twitter_handler(tags[:twitter_handler])
-      add_decidim_meta_image_url(add_base_url_to(tags[:image_url]))
+      image_url = tags[:image_url].presence || resolve_meta_image_url(tags[:resource])
+      add_decidim_meta_image_url(add_base_url_to(image_url)) if image_url.present?
     end
 
-    # Add base url to path if path does not include host.
+    # Adds base URL to the given path if it does not include a host.
     #
-    # @parma [String] path - A String containing path (e.g. "/proposals/1" )
+    # @param [String] path - A String containing the path (e.g. "/proposals/1").
     #
-    # @return [String] - a String of URL including base URL and path, or path if it is blank.
+    # @return [String] - A String with the base URL and path, or the original path if it already includes a host.
     def add_base_url_to(path)
-      return path if path.blank?
-      return path if URI.parse(path).host.present?
+      return path if path.blank? || URI.parse(path).host.present?
 
       "#{resolve_base_url}#{path}"
     end
 
-    # Resolve base url (example: https://www.decidim.org) without url params
+    # Resolves the base URL (example: https://www.decidim.org) without URL parameters.
     #
-    # @return [String] -  a String of base URL
+    # @return [String] - A String of the base URL.
     def resolve_base_url
       return request.base_url if respond_to?(:request) && request&.base_url.present?
 
       uri = URI.parse(decidim.root_url(host: current_organization.host))
-      if uri.port.blank? || [80, 443].include?(uri.port)
-        "#{uri.scheme}://#{uri.host}"
-      else
-        "#{uri.scheme}://#{uri.host}:#{uri.port}"
-      end
+      port = uri.port.present? && [80, 443].exclude?(uri.port) ? ":#{uri.port}" : ""
+
+      "#{uri.scheme}://#{uri.host}#{port}"
     end
 
     #  Accumulates the given `title` so that they can be chained. Since Rails views
@@ -60,22 +59,20 @@ module Decidim
     # @return [Array<String>]
     def add_decidim_page_title(title)
       @decidim_page_title ||= []
-      return @decidim_page_title if title.blank?
-
-      @decidim_page_title << title
+      @decidim_page_title << title if title.present?
+      @decidim_page_title
     end
 
     # 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 `" - "`.
     #
-    # @return [String]
+    # @return [String] - The concatenated title.
     def decidim_page_title
       (@decidim_page_title || []).join(" - ")
     end
 
-    attr_reader :decidim_meta_description, :decidim_meta_url, :decidim_meta_image_url,
-                :decidim_meta_twitter_handler
+    attr_reader :decidim_meta_description, :decidim_meta_url, :decidim_meta_image_url, :decidim_meta_twitter_handler
 
     # Sets the meta description for the current page. We want to keep the most specific
     # one, so you cannot replace the description if it is set by a view that has already
@@ -83,7 +80,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] description - The String to be set as description
+    # @param [String] description - The String to be set as description.
     #
     # @return [nil]
     def add_decidim_meta_description(description)
@@ -96,7 +93,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] twitter_handler - The String to be set as Twitter handler
+    # @param [String] twitter_handler - The String to be set as Twitter handler.
     #
     # @return [nil]
     def add_decidim_meta_twitter_handler(twitter_handler)
@@ -109,7 +106,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] url - The String to be set as URL
+    # @param [String] url - The String to be set as URL.
     #
     # @return [nil]
     def add_decidim_meta_url(url)
@@ -122,11 +119,23 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] image_url - The String to be set as image URL
+    # @param [String] image_url - The String to be set as image URL.
     #
     # @return [nil]
     def add_decidim_meta_image_url(image_url)
       @decidim_meta_image_url ||= image_url
     end
+
+    # Resolves the image URL to be used for meta tags.
+    # This method creates a new instance of MetaImageUrlResolver,
+    # which handles the logic for determining the most appropriate image URL.
+    #
+    # @param [Object, nil] resource - The resource object that may contain the image.
+    #
+    # @return [String, nil] - The resolved image URL, or nil if no appropriate image URL is found.
+    def resolve_meta_image_url(resource)
+      url = MetaImageUrlResolver.new(resource, current_organization).resolve
+      add_base_url_to(url) if url.present?
+    end
   end
 end

data/app/helpers/decidim/modal_helper.rb

@@ -34,5 +34,28 @@ module Decidim
         end
       end
     end
+
+    def decidim_drawer(opts = {}, &)
+      opts[:closable] = true unless opts.has_key?(:closable)
+
+      button = if opts[:closable] == false
+                 ""
+               else
+                 content_tag(
+                   :button,
+                   "&times".html_safe,
+                   type: :button,
+                   data: { dialog_close: opts[:id] || "", dialog_closable: "" },
+                   "aria-label": t("close_modal", scope: "decidim.shared.confirm_modal")
+                 )
+               end
+
+      content = opts[:remote].nil? ? button + capture(&).html_safe : button + icon("loader-3-line")
+      content_tag(:div, id: opts[:id], data: { dialog: opts[:id] || "", drawer: true }.merge(opts[:data] || {})) do
+        content_tag(:div, id: "#{opts[:id]}-content", class: opts[:class]) do
+          content
+        end
+      end
+    end
   end
 end

data/app/helpers/decidim/omniauth_helper.rb

@@ -13,17 +13,17 @@ module Decidim
 
     # Public: icon for omniauth buttons
     def oauth_icon(provider)
-      info = current_organization.enabled_omniauth_providers[provider.to_sym]
+      provider_info = current_organization.enabled_omniauth_providers[provider.to_sym]
 
       name = normalize_provider_name(provider)
       name = "twitter-x" if provider == :twitter
       name = "#{name}-fill"
 
-      if info
-        icon_path = info[:icon_path]
-        return external_icon(icon_path) if icon_path
+      if provider_info
+        icon_path = provider_info[:icon_path] || Rails.application.secrets.omniauth[provider][:icon_path].presence
+        return external_icon(icon_path) if icon_path.present?
 
-        name = info[:icon] if info[:icon]
+        name = provider_info[:icon] if provider_info[:icon]
       end
 
       icon(name)

data/app/helpers/decidim/onboarding_action_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A helper to display onboarding action message
+  module OnboardingActionHelper
+    def display_onboarding_action_message(user)
+      return if user.blank?
+      return unless pending_onboarding_action?(user)
+
+      cell("decidim/onboarding_action_message", user)
+    end
+  end
+end

data/app/helpers/decidim/passwords_helper.rb

@@ -30,7 +30,7 @@ module Decidim
         value: @account&.password,
         minlength: min_length,
         maxlength: ::PasswordValidator::MAX_LENGTH,
-        placeholder: "••••••"
+        placeholder: "**********"
       }
     end
 
@@ -42,7 +42,7 @@ module Decidim
         required: true,
         label: false,
         help_text:,
-        placeholder: "••••••"
+        placeholder: "**********"
       }
     end
 

data/app/helpers/decidim/sanitize_helper.rb

@@ -37,13 +37,22 @@ module Decidim
       end
     end
 
+    # Converts the blob and blob variant references to blob URLs.
+    def decidim_rich_text(html, **)
+      renderer = Decidim::ContentProcessor.renderer_klass(:blob).constantize.new(html)
+      renderer.render(**)
+    end
+
     def decidim_sanitize_editor(html, options = {})
       content_tag(:div, decidim_sanitize(html, options), class: %w(rich-text-display))
     end
 
     def decidim_sanitize_editor_admin(html, options = {})
       html = Decidim::IframeDisabler.new(html, options).perform
-      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
+      decidim_sanitize_editor(
+        decidim_rich_text(html),
+        { scrubber: Decidim::AdminInputScrubber.new }.merge(options)
+      )
     end
 
     def decidim_html_escape(text)
@@ -51,7 +60,7 @@ module Decidim
     end
 
     def decidim_url_escape(text)
-      decidim_html_escape(text).sub(/^javascript:/, "")
+      decidim_html_escape(text).sub(/^\s*javascript:/, "")
     end
 
     def decidim_sanitize_translated(text)

data/app/helpers/decidim/taxonomies_helper.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper to render taxonomies for forms.
+  module TaxonomiesHelper
+    include DecidimFormHelper
+    include TranslatableAttributes
+
+    def filter_taxonomy_items_select_field(form, name, filter, options = {})
+      label = decidim_sanitize_translated(filter.name)
+      options = options.merge(include_blank: I18n.t("decidim.taxonomies.prompt")) unless options.has_key?(:include_blank)
+      options = options.merge(label:) unless options.has_key?(:label)
+      form.select(
+        name,
+        taxonomy_items_options_for_filter(filter),
+        options,
+        { name: "#{form.object_name}[#{name}][]", id: "#{name}-#{filter.id}" }
+      )
+    end
+
+    def taxonomy_items_options_for_filter(filter)
+      @taxonomy_items_options_for_filter ||= {}
+      @taxonomy_items_options_for_filter[filter.id] ||= begin
+        min_parent_count = filter.taxonomies.values.min_by { |item| item[:taxonomy].parent_ids.count }
+        first_parent_level = (min_parent_count && min_parent_count[:taxonomy].parent_ids.count) || 1
+        taxonomy_items_options_for_taxonomies_tree(filter.taxonomies, first_parent_level)
+      end
+    end
+
+    def taxonomy_items_options_for_taxonomies_tree(taxonomies_tree, first_parent_level = 1)
+      options = []
+      taxonomies_tree.each do |id, item|
+        name = " #{" " * 4 * (item[:taxonomy].parent_ids.count - first_parent_level)} #{decidim_sanitize_translated(item[:taxonomy].name)}".html_safe
+        options.append([name, id])
+        options.concat(taxonomy_items_options_for_taxonomies_tree(item[:children], first_parent_level)) if item[:children].any?
+      end
+      options
+    end
+  end
+end

data/app/jobs/decidim/download_your_data_export_job.rb

@@ -5,25 +5,8 @@ module Decidim
     queue_as :default
 
     def perform(user, export_format = ::Decidim::DownloadYourDataExporter::DEFAULT_EXPORT_FORMAT)
-      filename = "#{SecureRandom.urlsafe_base64}.zip"
-      path = Rails.root.join("tmp/#{filename}")
-      password = SecureRandom.urlsafe_base64
-
-      generate_zip_file(user, path, password, export_format)
-      save_or_upload_file(user, path)
-      # Deletes temporary file
-      File.delete(path)
-      ExportMailer.download_your_data_export(user, filename, password).deliver_later
-    end
-
-    private
-
-    def generate_zip_file(user, path, password, export_format)
-      DownloadYourDataExporter.new(user, path, password, export_format).export
-    end
-
-    def save_or_upload_file(user, path)
-      user.download_your_data_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
+      @export = DownloadYourDataExporter.new(user, "download_your_data", export_format).export
+      ExportMailer.download_your_data_export(user, @export).deliver_later
     end
   end
 end

data/app/jobs/decidim/event_publisher_job.rb

@@ -4,21 +4,26 @@ module Decidim
   class EventPublisherJob < ApplicationJob
     queue_as :events
 
-    attr_reader :resource
+    attr_reader :resource, :data
 
     def perform(event_name, data)
       @resource = data[:resource]
+      @data = data
 
       return unless data[:force_send] || notifiable?
 
-      EmailNotificationGeneratorJob.perform_later(
-        event_name,
-        data[:event_class],
-        data[:resource],
-        data[:followers],
-        data[:affected_users],
-        data[:extra]
-      )
+      if event_type.include?(:email)
+        EmailNotificationGeneratorJob.perform_later(
+          event_name,
+          data[:event_class],
+          data[:resource],
+          data[:followers],
+          data[:affected_users],
+          data[:extra]
+        )
+      end
+
+      return unless event_type.include?(:notification)
 
       NotificationGeneratorJob.perform_later(
         event_name,
@@ -32,6 +37,10 @@ module Decidim
 
     private
 
+    def event_type
+      (data[:event_class].presence && data[:event_class].safe_constantize&.types) || []
+    end
+
     # Whether this event should be notified or not. Useful when you want the
     # event to decide based on the params.
     #

data/app/jobs/decidim/export_job.rb

@@ -2,6 +2,8 @@
 
 module Decidim
   class ExportJob < ApplicationJob
+    include Decidim::PrivateDownloadHelper
+
     queue_as :exports
 
     # rubocop:disable Metrics/ParameterLists
@@ -16,7 +18,9 @@ module Decidim
 
       export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
 
-      ExportMailer.export(user, name, export_data).deliver_now
+      private_export = attach_archive(export_data, name, user)
+
+      ExportMailer.export(user, private_export).deliver_later
     end
     # rubocop:enable Metrics/ParameterLists
   end

data/app/jobs/decidim/export_participatory_space_job.rb

@@ -2,6 +2,8 @@
 
 module Decidim
   class ExportParticipatorySpaceJob < ApplicationJob
+    include Decidim::PrivateDownloadHelper
+
     queue_as :exports
 
     def perform(user, participatory_space, name, format)
@@ -14,7 +16,8 @@ module Decidim
 
       export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
 
-      Decidim::ExportMailer.export(user, name, export_data).deliver_now
+      private_export = attach_archive(export_data, name, user)
+      ExportMailer.export(user, private_export).deliver_later
     end
   end
 end