decidim-core 0.29.2 → 0.30.0.rc1

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/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

data/app/jobs/decidim/open_data_job.rb

@@ -4,13 +4,13 @@ module Decidim
   class OpenDataJob < ApplicationJob
     queue_as :exports
 
-    def perform(organization)
-      path = Rails.root.join("tmp/#{organization.open_data_file_path}")
+    def perform(organization, resource = nil)
+      path = Rails.root.join("tmp/#{organization.open_data_file_path(resource)}")
 
-      exporter = OpenDataExporter.new(organization, path)
+      exporter = OpenDataExporter.new(organization, path, resource)
       raise "Could not generate Open Data export" unless exporter.export.positive?
 
-      organization.open_data_file.attach(io: File.open(path, "rb"), filename: organization.open_data_file_path)
+      organization.open_data_files.attach(io: File.open(path, "rb"), filename: organization.open_data_file_path(resource))
       # Deletes the temporary file file
       File.delete(path)
     end

data/app/mailers/decidim/export_mailer.rb

@@ -8,21 +8,16 @@ module Decidim
     # zipped file.
     #
     # user        - The user to be notified.
-    # export_name - The name of the export.
-    # export_data - The data containing the result of the export.
+    # private_export - The PrivateExport instance where the export data has been attached.
     #
     # Returns nothing.
-    def export(user, export_name, export_data)
+    def export(user, private_export)
       @user = user
       @organization = user.organization
-
-      filename = export_data.filename(export_name)
-      filename_without_extension = export_data.filename(export_name, extension: false)
-
-      attachments["#{filename_without_extension}.zip"] = FileZipper.new(filename, export_data.read).zip
+      @private_export = private_export
 
       with_user(user) do
-        mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: filename))
+        mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: private_export.export_type))
       end
     end
 
@@ -30,13 +25,13 @@ module Decidim
     # the result of a download_your_data export in a zipped file.
     #
     # user - The user to be notified.
+    # private_export - The PrivateExport instance where the export data has been attached.
     #
     # Returns nothing.
-    def download_your_data_export(user, filename, password)
+    def download_your_data_export(user, private_export)
       @user = user
       @organization = user.organization
-      @filename = filename
-      @password = password
+      @private_export = private_export
 
       with_user(user) do
         mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: user.name))

data/app/models/decidim/action_log.rb

@@ -5,6 +5,7 @@ module Decidim
   # for transparency reasons, to log all actions so all other users can
   # see the actions being performed.
   class ActionLog < ApplicationRecord
+    include Decidim::Taxonomizable
     include Decidim::ScopableParticipatorySpace
 
     belongs_to :organization,
@@ -175,6 +176,16 @@ module Decidim
       base + [:with_participatory_space]
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      return [] unless auth_object&.admin?
+
+      %w(created_at)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(user)
+    end
+
     # Overwrites the method so that records cannot be modified.
     #
     # Returns a Boolean.

data/app/models/decidim/category.rb

@@ -47,6 +47,10 @@ module Decidim
     # Allow ransacker to search for a key in a hstore column (`name`.`en`)
     ransacker_i18n :name
 
+    def self.ransackable_attributes(_auth_object = nil)
+      %w(description id name)
+    end
+
     private
 
     # This is done since we only allow one level of subcategories.

data/app/models/decidim/component.rb

@@ -6,11 +6,14 @@ module Decidim
   # component that spans over several steps.
   class Component < ApplicationRecord
     include HasSettings
+    include HasTaxonomySettings
     include Publicable
     include Traceable
     include Loggable
     include Decidim::ShareableWithToken
     include ScopableComponent
+    include Decidim::SoftDeletable
+    include TranslatableAttributes
 
     belongs_to :participatory_space, polymorphic: true
 
@@ -19,7 +22,7 @@ module Decidim
 
     default_scope { registered_component_manifests.registered_space_manifests.order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
 
-    delegate :organization, :categories, to: :participatory_space
+    delegate :organization, to: :participatory_space
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::ComponentPresenter
@@ -61,7 +64,7 @@ module Decidim
       {
         :host => organization.host,
         :component_id => id,
-        "#{participatory_space.underscored_name}_slug".to_sym => participatory_space.slug
+        :"#{participatory_space.underscored_name}_slug" => participatory_space.slug
       }
     end
 
@@ -82,6 +85,14 @@ module Decidim
       name
     end
 
+    def hierarchy_title
+      [
+        I18n.t("decidim.admin.menu.#{participatory_space.class.name.demodulize.underscore.pluralize}"),
+        translated_attribute(participatory_space.title),
+        translated_attribute(name)
+      ].join(" / ")
+    end
+
     # Public: Returns an empty description
     def resource_description; end
 
@@ -92,9 +103,20 @@ module Decidim
       participatory_space.can_participate?(user)
     end
 
+    def private_non_transparent_space?
+      return false unless participatory_space.respond_to?(:private_space?)
+      return false unless participatory_space.private_space?
+
+      if participatory_space.respond_to?(:is_transparent?)
+        !participatory_space.is_transparent?
+      else
+        true
+      end
+    end
+
     # Public: Public URL for component with given share token as query parameter
     def shareable_url(share_token)
-      EngineRouter.main_proxy(self).root_path(self, share_token: share_token.token)
+      EngineRouter.main_proxy(self).root_url(self, share_token: share_token.token)
     end
 
     delegate :serializes_specific_data?, to: :manifest

data/app/models/decidim/metric.rb

@@ -9,6 +9,7 @@ module Decidim
     belongs_to :participatory_space, foreign_type: "participatory_space_type", polymorphic: true, optional: true
     belongs_to :related_object, foreign_type: "related_object_type", polymorphic: true, optional: true
     belongs_to :category, foreign_key: "decidim_category_id", class_name: "Decidim::Category", optional: true
+    belongs_to :taxonomy, foreign_key: "decidim_taxonomy_id", class_name: "Decidim::Taxonomy", optional: true
 
     validates :day, uniqueness: { scope:
                                   [
@@ -18,7 +19,7 @@ module Decidim
                                     :participatory_space_id,
                                     :related_object_type,
                                     :related_object_id,
-                                    :decidim_category_id
+                                    :decidim_taxonomy_id
                                   ] }
   end
 end

data/app/models/decidim/moderation.rb

@@ -30,5 +30,21 @@ module Decidim
     ransacker :reportable_type_string do
       Arel.sql(%{cast("decidim_moderations"."decidim_reportable_type" as text)})
     end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w(reported_id_string reported_content created_at)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      []
+    end
+
+    def title
+      return reportable.reported_title if reportable.respond_to?(:reported_title)
+      return reportable.title if reportable.respond_to?(:title)
+      return reportable.name if reportable.respond_to?(:name)
+
+      reportable.id.to_s
+    end
   end
 end

data/app/models/decidim/newsletter.rb

@@ -26,23 +26,23 @@ module Decidim
       sent_at.present?
     end
 
-    def sent_scopes_ids
-      extended_data["scope_ids"] || []
+    def sent_to_all_users?
+      extended_data["send_to_all_users"]
     end
 
-    def sent_scopes
-      @sent_scopes ||= organization.scopes.where(id: sent_scopes_ids)
+    def sent_to_verified_users?
+      extended_data["send_to_verified_users"]
     end
 
-    def sended_to_all_users?
-      extended_data["send_to_all_users"]
+    def sent_to_users_with_verification_types
+      extended_data["verification_types"]
     end
 
-    def sended_to_followers?
+    def sent_to_followers?
       extended_data["send_to_followers"]
     end
 
-    def sended_to_participants?
+    def sent_to_participants?
       extended_data["send_to_participants"]
     end
 
@@ -50,6 +50,10 @@ module Decidim
       extended_data["participatory_space_types"]
     end
 
+    def sent_to_private_members?
+      extended_data["send_to_private_members"]
+    end
+
     def template
       @template ||= Decidim::ContentBlock
                     .for_scope(:newsletter_template, organization:)

data/app/models/decidim/organization.rb

@@ -35,6 +35,8 @@ module Decidim
 
     has_many :templates, foreign_key: "decidim_organization_id", class_name: "Decidim::Templates::Template", dependent: :destroy if defined? Decidim::Templates
 
+    has_many :taxonomies, foreign_key: "decidim_organization_id", class_name: "Decidim::Taxonomy", inverse_of: :organization, dependent: :destroy
+
     # Users registration mode. Whether users can register or access the system. Does not affect users that access through Omniauth integrations.
     #  enabled: Users registration and sign in are enabled (default value).
     #  existing: Users cannot be registered in the system. Only existing users can sign in.
@@ -58,7 +60,7 @@ module Decidim
     has_one_attached :highlighted_content_banner_image
     validates_upload :highlighted_content_banner_image, uploader: Decidim::ImageUploader
 
-    has_one_attached :open_data_file
+    has_many_attached :open_data_files
 
     validate :unique_name
 
@@ -148,8 +150,10 @@ module Decidim
       !users_registration_mode_disabled?
     end
 
-    def open_data_file_path
-      "#{host}-open-data.zip"
+    def open_data_file_path(resource = nil)
+      return "#{host}-open-data.zip" if resource.nil?
+
+      "#{host}-open-data-#{resource}.csv"
     end
 
     def enabled_omniauth_providers