decidim-core 0.28.1 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800e096eb86537caa7de18236fe0becf73b1c30ee38e4631888025b52e831f3a
-  data.tar.gz: 9f05dfffcd55fcc9d4e76163a4b98c5b7e851bbdbcfe317f9a9566cb73a142d9
+  metadata.gz: 7ed7b2e2e440e7ab68c508dc8242f6adbee52c292cfa8fd3fd43e42fc75e8f8f
+  data.tar.gz: ee75d95c1002bc872483de673a2e21e23c100d387d2bd50d86bb05ed5a91d1fa
 SHA512:
-  metadata.gz: 97568f03aab3b39a4b75e98421a5b9e43f30f8f1c71b548478f0ee2f73c6303981643948289f9483d9cfbe71af47b872bf3e3c49d39009270e9e3ef72e55bf70
-  data.tar.gz: 8fa7ecb28d0d2e8097124330aced622ac52fc96d6cc8d6039e629c897d29af8f79366e8992107a9d8b89c88280c723b667b345ccbc643d2326303f376abd243a
+  metadata.gz: d82a46910165f8510bec81d79677b26057d49e88ddc9ddd3fda2443b0d8529804faebb2eb8949313b4cf4c25fc8fd406da049dc2e33d172430d7614dc043b9cd
+  data.tar.gz: e86a808c22abc5db470d2bcf7d9427a2d8ea13588a73fcbde936fbd22c381d606f30b45353e3638f39150e16966cf75edcf6d81698164b3bdef9055b1881a02f

data/app/cells/decidim/address/online.erb

@@ -5,8 +5,8 @@
       <div class="address">
         <div class="address__location"><%= t(model.type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values") %></div>
         <% if display_online_meeting_url? %>
-          <a href="<%= model.online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
-            <%= model.online_meeting_url %>
+          <a href="<%= online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
+            <%= online_meeting_url %>
           <% end %>
           </a>
       </div>

data/app/cells/decidim/address_cell.rb

@@ -45,6 +45,10 @@ module Decidim
       HTML
     end
 
+    def online_meeting_url
+      URI::Parser.new.escape(model.online_meeting_url)
+    end
+
     def display_online_meeting_url?
       return true unless model.respond_to?(:online?)
       return true unless model.respond_to?(:iframe_access_level_allowed_for_user?)

data/app/cells/decidim/announcement/show.erb

@@ -5,7 +5,7 @@
     </div>
   <% end %>
 
-  <span class="flash__message">
+  <div class="flash__message">
     <%= text %>
-  </span>
+  </div>
 <% end %>

data/app/cells/decidim/author/show.erb

@@ -1,16 +1,16 @@
 <% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<div class="author" data-author>
-  <%= content_tag :div, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+<span class="author" data-author>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
-      <div>
+      <span>
         <%= render :name %>
 
         <% context_actions.each do |action| %>
           <%= render action %>
         <% end %>
-      </div>
+      </span>
     <% elsif layout == :avatar %>
       <%= render :avatar %>
     <% else %>
@@ -24,4 +24,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-</div>
+</span>

data/app/cells/decidim/card/show.erb

@@ -1,5 +1,5 @@
 <div class="py-4 space-y-2">
-  <a href="" class="text-lg text-secondary font-semibold hover:underline"><%= title %></a>
+  <a href="" class="text-lg text-secondary font-semibold hover:underline"><%= decidim_html_escape(title) %></a>
   <div class="flex items-center divide-x divide-gray-3">
    <% metadata.first(4).each do |item| %>
     <div class="flex items-center gap-1 px-4 lg:px-6 first:pl-0 last:pr-0 max-w-xs">

data/app/cells/decidim/card_g/show.erb

@@ -1,7 +1,7 @@
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
-      <%= image_tag resource_image_path, alt: alt_title %>
+      <%= image_tag resource_image_url, alt: alt_title %>
     <% else %>
       <%= external_icon "media/images/placeholder-card-g.svg", class: "card__placeholder-g" %>
     <% end %>

data/app/cells/decidim/card_g_cell.rb

@@ -52,12 +52,15 @@ module Decidim
       @id_base_name ||= resource.class.name.gsub(/\ADecidim::/, "").underscore.split("/").join("__")
     end
 
-    def resource_image_path
+    def resource_image_url
+      # Backwards compatibility.
+      return resource_image_path if respond_to?(:resource_image_path)
+
       nil
     end
 
     def has_image?
-      resource_image_path.present?
+      resource_image_url.present?
     end
 
     def show_description?

data/app/cells/decidim/card_l/image.erb

@@ -1,6 +1,6 @@
 <div class="card__list-image">
-  <% if resource_image_path.present? %>
-    <%= image_tag resource_image_path, class: "w-full h-full object-cover" %>
+  <% if has_image? %>
+    <%= image_tag resource_image_url, class: "w-full h-full object-cover" %>
   <% else %>
     <div class="w-full h-full relative">
       <div class="w-full h-full bg-primary opacity-10 absolute top-0 left-0 z-10">

data/app/cells/decidim/card_l_cell.rb

@@ -68,12 +68,15 @@ module Decidim
       "#{class_base_name}__#{class_name}"
     end
 
-    def resource_image_path
+    def resource_image_url
+      # Backwards compatibility.
+      return resource_image_path if respond_to?(:resource_image_path)
+
       nil
     end
 
     def has_image?
-      resource_image_path.present?
+      resource_image_url.present?
     end
 
     def has_link_to_resource?

data/app/cells/decidim/card_metadata/show.erb

@@ -3,12 +3,12 @@
     <% hook_output = render_hook(item[:hook]) %>
     <% next if hook_output.blank? %>
 
-    <%= content_tag :span, data: item[:data_attributes] do %>
+    <%= content_tag :div, data: item[:data_attributes] do %>
       <%= icon item[:icon] if item[:icon].present? %>
       <%= hook_output %>
     <% end %>
   <% else %>
-    <%= content_tag :span, data: item[:data_attributes] do %>
+    <%= content_tag :div, data: item[:data_attributes] do %>
       <%= icon item[:icon] if item[:icon].present? %>
       <% if item[:text].present? %>
         <%= link_to_if enable_links? && item.has_key?(:url), item[:text], item[:url] %>

data/app/cells/decidim/content_blocks/hero_cell.rb

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def background_image
-        model.images_container.attached_uploader(:background_image).path(variant: :big)
+        model.images_container.attached_uploader(:background_image).variant_url(:big)
       end
 
       private

data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb

@@ -1,4 +1,4 @@
-<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>');">
+<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).url %>');">
   <div class="home__section-content-banner home__section">
     <div>
       <h2 class="home__section-content-banner__title">

data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb

@@ -34,9 +34,9 @@ module Decidim
       # If it is called from the landing page content block, use the background image defined there
       # Else, use the banner image defined in the space (for assemblies)
       def image_path
-        return model.images_container.attached_uploader(:background_image).path if model.respond_to?(:images_container)
+        return model.images_container.attached_uploader(:background_image).url if model.respond_to?(:images_container)
 
-        attached_uploader(:banner_image).path
+        attached_uploader(:banner_image).url
       end
 
       def has_hashtag?

data/app/cells/decidim/data_consent/category.erb

@@ -2,7 +2,7 @@
   <div class="cookies__category-trigger">
     <label for="dc-<%= category[:slug] %>" class="cookies__category-toggle">
       <input
-        <%= %(checked="checked") if category[:mandatory] %>
+        <%== %(checked="checked") if category[:mandatory] %>
         id="dc-<%= category[:slug] %>"
         type="checkbox"
         name="<%= category[:slug] %>"

data/app/cells/decidim/nav_links/show.erb

@@ -1,10 +1,10 @@
 <div class="participatory-space__nav-container">
-  <button id="dropdown-trigger-participatory-space" data-component="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
+  <button id="dropdown-trigger-participatory-space" data-component="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-scroll-to-menu="true">
     <span><%= t("decidim.searches.filters.jump_to") %></span>
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav">
+  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav" aria-hidden="true">
     <% model.each do |item| %>
       <li>
         <%= link_to item[:url], class: "participatory-space__nav-item" do %>

data/app/cells/decidim/notification/moderated.erb

@@ -0,0 +1,12 @@
+<div class="notification" data-notification>
+  <div class="notification__wrapper">
+    <div class="notification__time" title="<%= l(notification.created_at) %>"> <%= notification.created_at_in_words %></div>
+    <div class="notification__snippet">
+      <span class="notification__snippet-title text-gray"><%= t("decidim.notifications.show.moderated") %></span>
+    </div>
+  </div>
+  <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>
+    <span class="sr-only md:not-sr-only"><%= t("mark_as_read", scope: "layouts.decidim.notifications_dashboard") %></span>
+    <%= icon "check-line", class: "fill-current" %>
+  <% end %>
+</div>

data/app/cells/decidim/notification_cell.rb

@@ -9,7 +9,11 @@ module Decidim
     include Decidim::SanitizeHelper
 
     def show
-      render :show
+      if notification.event_class_instance.try(:hidden_resource?)
+        render :moderated
+      else
+        render :show
+      end
     end
 
     def notification_title

data/app/cells/decidim/profile/details.erb

@@ -9,7 +9,7 @@
         <%= icon detail[:icon] %>
         <span>
           <% if detail[:url].present? %>
-            <%= link_to(detail[:url], detail[:text]) %>
+            <%= link_to(detail[:url], detail[:text], rel: "nofollow noopener noreferrer") %>
           <% else %>
             <%= detail[:text] %>
           <% end %>

data/app/cells/decidim/progress_bar/show.erb

@@ -7,7 +7,7 @@
   <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
 
   <% if total != 0 %>
-    <div class="progress-bar" role="progressbar" tabindex="0" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> %" aria-valuemax="<%= total %>">
+    <div class="progress-bar" role="progressbar" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= number_with_precision(percentage, separator: ".", precision: 2) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(percentage, precision: 2) %>">
       <div style="width: <%= percentage %>%"></div>
     </div>
   <% end %>

data/app/cells/decidim/progress_bar_cell.rb

@@ -29,6 +29,8 @@ module Decidim
   #      total: 10,
   #    )
   class ProgressBarCell < Decidim::ViewModel
+    include ActionView::Helpers::NumberHelper
+
     private
 
     def element_id

data/app/cells/decidim/report_button/flag_modal.erb

@@ -34,11 +34,15 @@
               <%= f.check_box :hide,
                               label: t("decidim.shared.flag_modal.hide_content"),
                               include_hidden: false,
+                              id: hide_checkbox_id,
                               data: {
                                 label_action: t("decidim.shared.flag_modal.hide"),
                                 label_report: t("decidim.shared.flag_modal.report"),
                                 hide: "true"
-                              }, id: hide_checkbox_id %>
+                              },
+                              label_options: {
+                                for: hide_checkbox_id
+                              } %>
             <% end %>
           <% end %>
 

data/app/cells/decidim/resource_types_filter/show.erb

@@ -1,5 +1,5 @@
 <div id="<%= id %>" class="filter-container">
-  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true" data-disabled-md="true">
+  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true">
     <% resource_types.each do |resource_type| %>
       <span data-value="<%= resource_type[0] %>" class="<%= "is-active" if filter_param == resource_type[0] %>">
         <%= text_with_resource_icon(*resource_type) %>
@@ -8,7 +8,7 @@
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <%= filter_form_for filter, form_path, class: "new_filter", id: "dropdown-menu-resource" do |form| %>
+  <%= filter_form_for filter, form_path, :class => "new_filter", :id => "dropdown-menu-resource", "aria-hidden" => true do |form| %>
     <%= form.collection_radio_buttons(
           filter_param_key,
           resource_types,
@@ -16,7 +16,7 @@
           :last,
           { checked: filter_param }
         ) do |builder|
-            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:div, text_with_resource_icon(builder.value, builder.text), class: "filter") }
+            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:span, text_with_resource_icon(builder.value, builder.text), class: "filter") }
       end %>
   <% end %>
 </div>

data/app/cells/decidim/statistic/show.erb

@@ -1,7 +1,7 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
-  <h3 class="statistic__title" title="<%= stat_title %>">
+  <span class="statistic__title" title="<%= stat_title %>">
     <%= stat_title %>
-  </h3>
+  </span>
   <span class="statistic__number">
     <%= stat_number %>
   </span>

data/app/cells/decidim/upload_modal/modal.erb

@@ -37,10 +37,10 @@
             <%= icon "upload-cloud-2-line", class: "w-8 h-8 text-gray fill-current" %>
             <%= t("decidim.forms.upload_help.dropzone") %>
           </span>
-          <button class="button button__sm button__secondary" data-select-file-button>
+          <label class="button button__sm button__secondary" for="files-<%= modal_id %>">
             <span><%= t("decidim.forms.upload.select_file") %></span>
             <%= icon "arrow-right-line", class: "fill-current" %>
-          </button>
+          </label>
         </div>
       </div>
     </div>
@@ -60,8 +60,7 @@
     <%= t("decidim.shared.confirm_modal.cancel") %>
   </button>
   <button type="button" class="button button__sm md:button__lg button__secondary" data-dropzone-save data-dialog-close="<%= modal_id %>" disabled>
-    <%= t("next", scope: "decidim.messaging.conversations.index") %>
-    <%= icon "arrow-right-line", class: "fill-current" %>
+    <%= t("save", scope: "decidim.forms.upload.labels") %>
   </button>
 </div>
 <% end %>

data/app/commands/decidim/create_omniauth_registration.rb

@@ -55,7 +55,12 @@ module Decidim
         # If user has left the account unconfirmed and later on decides to sign
         # in with omniauth with an already verified account, the account needs
         # to be marked confirmed.
-        @user.skip_confirmation! if !@user.confirmed? && @user.email == verified_email
+        if !@user.confirmed? && @user.email == verified_email
+          @user.skip_confirmation!
+          @user.after_confirmation
+        end
+        @user.tos_agreement = "1"
+        @user.save!
       else
         @user.email = (verified_email || form.email)
         @user.name = form.name
@@ -69,10 +74,11 @@ module Decidim
           @user.avatar.attach(io: file, filename:)
         end
         @user.skip_confirmation! if verified_email
-      end
+        @user.tos_agreement = "1"
+        @user.save!
 
-      @user.tos_agreement = "1"
-      @user.save!
+        @user.after_confirmation if verified_email
+      end
     end
 
     def create_identity

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -20,6 +20,7 @@ module Decidim
       include Decidim::SafeRedirect
       include NeedsSnippets
       include UserBlockedChecker
+      include ActiveStorage::SetCurrent
 
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper

data/app/controllers/concerns/decidim/force_authentication.rb

@@ -17,7 +17,7 @@ module Decidim
     # Breaks the request lifecycle, if user is not authenticated.
     # Otherwise returns.
     def ensure_authenticated!
-      return true unless current_organization.force_users_to_authenticate_before_access_organization
+      return true unless current_organization&.force_users_to_authenticate_before_access_organization
 
       # Next stop: Check whether auth is ok
       unless user_signed_in?

data/app/controllers/concerns/decidim/paginable.rb

@@ -7,7 +7,7 @@ module Decidim
   module Paginable
     extend ActiveSupport::Concern
 
-    OPTIONS = [10, 20, 50, 100].freeze
+    OPTIONS = [25, 50, 100].freeze
 
     included do
       helper_method :per_page, :page_offset

data/app/controllers/concerns/decidim/use_organization_time_zone.rb

@@ -25,7 +25,7 @@ module Decidim
       #
       # Returns a String.
       def organization_time_zone
-        @organization_time_zone ||= current_organization.time_zone
+        @organization_time_zone ||= current_organization&.time_zone
       end
     end
   end

data/app/controllers/decidim/application_controller.rb

@@ -23,6 +23,7 @@ module Decidim
     include DisableRedirectionToExternalHost
     include NeedsPasswordChange
     include LinkedResourceReference
+    include ActiveStorage::SetCurrent
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper

data/app/controllers/decidim/gamification/badges_controller.rb

@@ -9,6 +9,8 @@ module Decidim
         @badges = Decidim::Gamification.badges.sort_by(&:name)
       end
 
+      private
+
       def breadcrumb_item
         {
           label: t("decidim.gamification.badges.index.title"),

data/app/controllers/decidim/links_controller.rb

@@ -14,7 +14,8 @@ module Decidim
     rescue_from URI::InvalidURIError, with: :modal
 
     def new
-      headers["X-Robots-Tag"] = "noindex"
+      headers["X-Robots-Tag"] = "none"
+      headers["Link"] = %(<#{url_for}>; rel="canonical")
     end
 
     private
@@ -36,7 +37,19 @@ module Decidim
     end
 
     def external_url
-      @external_url ||= URI.parse(URI::Parser.new.escape(params[:external_url]))
+      @external_url ||= URI.parse(escape_url(params[:external_url]))
+    end
+
+    def escape_url(external_url)
+      before_fragment, fragment = external_url.split("#", 2)
+      escaped_before_fragment = URI::Parser.new.escape(before_fragment)
+
+      if fragment
+        escaped_fragment = URI::Parser.new.escape(fragment)
+        "#{escaped_before_fragment}##{escaped_fragment}"
+      else
+        escaped_before_fragment
+      end
     end
   end
 end

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

@@ -106,9 +106,9 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:span, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
+        return content_tag(:div, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
 
-        content_tag(:span, class: "flash__message") do
+        content_tag(:div, class: "flash__message") do
           concat value[:title]
           concat content_tag(:span, value[:body], class: "flash__message-body")
         end

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -16,8 +16,7 @@ module Decidim
         include_hidden: false,
         label_options: {
           "data-children-checkbox": parent_id,
-          value:,
-          class: "filter"
+          value:
         }
       }
       options.merge!(checkbox_options)

data/app/helpers/decidim/paginate_helper.rb

@@ -11,16 +11,14 @@ 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", formats: ["html"] if collection.total_pages.positive?
+        template += render(partial: "decidim/shared/results_per_page", locals: { 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/mailers/decidim/application_mailer.rb

@@ -7,23 +7,57 @@ module Decidim
     include LocalisedMailer
     include MultitenantAssetHost
     after_action :set_smtp
+    after_action :set_from
 
     default from: Decidim.config.mailer_sender
     layout "decidim/mailer"
 
     private
 
+    attr_reader :organization
+
     def set_smtp
-      return if @organization.nil? || @organization.smtp_settings.blank?
+      return if organization.nil? || organization.smtp_settings.blank? || organization.smtp_settings.except("from", "from_label", "from_email").all?(&:blank?)
 
-      mail.from = @organization.smtp_settings["from"].presence || mail.from
       mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
       mail.delivery_method.settings.merge!(
-        address: @organization.smtp_settings["address"],
-        port: @organization.smtp_settings["port"],
-        user_name: @organization.smtp_settings["user_name"],
-        password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
+        address: organization.smtp_settings["address"],
+        port: organization.smtp_settings["port"],
+        user_name: organization.smtp_settings["user_name"],
+        password: Decidim::AttributeEncryptor.decrypt(organization.smtp_settings["encrypted_password"])
       ) { |_k, o, v| v.presence || o }.compact_blank!
     end
+
+    def set_from
+      return if organization.nil?
+      return if already_defined_name_in_mail?(mail.from.first)
+
+      mail.from = sender
+    end
+
+    def sender
+      return Decidim.config.mailer_sender if return_mailer_sender?
+      return default_sender if organization.smtp_settings.blank?
+      return default_sender if organization.smtp_settings["from"].nil?
+      return default_sender if organization.smtp_settings["from"].empty?
+
+      smtp_settings_from = organization.smtp_settings["from"]
+      return smtp_settings_from if already_defined_name_in_mail?(smtp_settings_from)
+
+      email_address_with_name(smtp_settings_from, organization.name)
+    end
+
+    def default_sender
+      email_address_with_name(Decidim.config.mailer_sender, organization.name)
+    end
+
+    def already_defined_name_in_mail?(mail_address)
+      # if there is an space, there is already a name in the address
+      mail_address.match?(/ /)
+    end
+
+    def return_mailer_sender?
+      already_defined_name_in_mail?(Decidim.config.mailer_sender) && organization.smtp_settings.present?
+    end
   end
 end

data/app/models/decidim/attachment.rb

@@ -69,7 +69,7 @@ module Decidim
     end
 
     def url
-      attached_uploader(:file).path
+      attached_uploader(:file).url
     end
 
     # The URL to download the thumbnail of the file. Only works with images.
@@ -78,7 +78,7 @@ module Decidim
     def thumbnail_url
       return unless photo?
 
-      attached_uploader(:file).path(variant: :thumbnail)
+      @thumbnail_url ||= attached_uploader(:file).variant_url(:thumbnail)
     end
 
     # The URL to download the a big version of the file. Only works with images.
@@ -87,7 +87,7 @@ module Decidim
     def big_url
       return unless photo?
 
-      attached_uploader(:file).path(variant: :big)
+      @big_url ||= attached_uploader(:file).variant_url(:big)
     end
 
     def set_content_type_and_size

data/app/models/decidim/component.rb

@@ -14,7 +14,10 @@ module Decidim
 
     belongs_to :participatory_space, polymorphic: true
 
-    default_scope { order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
+    scope :registered_component_manifests, -> { where(manifest_name: Decidim.component_registry.manifests.collect(&:name)) }
+    scope :registered_space_manifests, -> { where(participatory_space_type: Decidim.participatory_space_registry.manifests.collect(&:model_class_name)) }
+
+    default_scope { registered_component_manifests.registered_space_manifests.order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
 
     delegate :organization, :categories, to: :participatory_space
 

data/app/models/decidim/content_block.rb

@@ -60,8 +60,8 @@ module Decidim
     #
     #     # This is how you can access the image data, just like with any other
     #     # uploader field. You can use the uploader variants too.
-    #     content_block.images_container.attached_uploader(:my_image).path
-    #     content_block.images_container.attached_uploader(:my_image).path(variant: :big)
+    #     content_block.images_container.attached_uploader(:my_image).url
+    #     content_block.images_container.attached_uploader(:my_image).variant_url(:big)
     #
     #     # This will delete the attached image
     #     content_block.images_container.my_image = nil