decidim-core 0.28.3 → 0.29.0.rc1

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

@@ -3,8 +3,6 @@
 module Decidim
   module ContentBlocks
     class HighlightedContentBannerCell < Decidim::ViewModel
-      include Decidim::SanitizeHelper
-
       def show
         return unless current_organization.highlighted_content_banner_enabled
 

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

@@ -38,7 +38,7 @@
     </div>
   </div>
   <%= link_to decidim.pages_path, class: "button button__sm md:button__lg button__secondary mt-6" do %>
-    <%= t("more_info", scope: "decidim.pages.home.extended", resource_name: translated_attribute(current_organization.name, current_organization)) %>
+    <%= t("more_info", scope: "decidim.pages.home.extended", resource_name: current_organization_name) %>
     <%= icon "arrow-right-line", class: "fill-current" %>
   <% end %>
 </section>

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

@@ -3,7 +3,6 @@
 module Decidim
   module ContentBlocks
     class HowToParticipateCell < Decidim::ViewModel
-      include Decidim::IconHelper
     end
   end
 end

data/app/cells/decidim/content_blocks/participatory_space_documents/content.erb

@@ -2,4 +2,4 @@
   <h2 class="h2 decorator"><%= t("decidim.application.documents.related_documents") %></h2>
 </div>
 
-<%= cell "decidim/documents_panel", resource %>
+<%= cell "decidim/documents_panel", resource, components_collections: %>

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

@@ -2,6 +2,22 @@
 
 module Decidim
   module ContentBlocks
-    class ParticipatorySpaceDocumentsCell < BaseCell; end
+    class ParticipatorySpaceDocumentsCell < BaseCell
+      COMPONENTS_WITH_DOCUMENTS_COLLECTIONS = [:meetings].freeze
+
+      def components_collections
+        components = resource.try(:components)
+
+        return [] if components.blank?
+
+        components = components.where(manifest_name: COMPONENTS_WITH_DOCUMENTS_COLLECTIONS).published
+
+        include_component_name = components.count > 1
+
+        components.map do |component|
+          Decidim::ComponentAttachmentCollectionPresenter.new(component, include_component_name:)
+        end
+      end
+    end
   end
 end

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

@@ -3,8 +3,6 @@
 module Decidim
   module ContentBlocks
     class ParticipatorySpaceHeroCell < Decidim::ContentBlocks::BaseCell
-      include Decidim::SanitizeHelper
-      include Decidim::TranslationsHelper
       include Decidim::TwitterSearchHelper
 
       delegate :title, :hashtag, :attached_uploader, to: :resource
@@ -34,9 +32,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).url if model.respond_to?(:images_container)
+        return model.images_container.attached_uploader(:background_image).path if model.respond_to?(:images_container)
 
-        attached_uploader(:banner_image).url
+        attached_uploader(:banner_image).path
       end
 
       def has_hashtag?

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

@@ -3,8 +3,6 @@
 module Decidim
   module ContentBlocks
     class ParticipatorySpaceLastActivityCell < BaseCell
-      DEFAULT_MAX_LAST_ACTIVITY_USERS = 6
-
       def render_recent_avatars
         return if last_activities_users.blank?
 
@@ -36,7 +34,7 @@ module Decidim
       end
 
       def max_last_activity_users
-        model.settings.try(:max_last_activity_users) || DEFAULT_MAX_LAST_ACTIVITY_USERS
+        model.settings.try(:max_last_activity_users) || Decidim.default_max_last_activity_users
       end
 
       def hide_participatory_space = true

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

@@ -1,6 +1,6 @@
 <section id="statistics" class="home__section home__section-content-block">
   <h2 class="home__section-title mb-8">
-    <%= t("decidim.pages.home.statistics.headline", organization: current_organization.name) %>
+    <%= t("decidim.pages.home.statistics.headline", organization: current_organization_name) %>
   </h2>
 
   <%= cell("decidim/statistics", stats.highlighted + stats.not_highlighted) %>

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

@@ -3,9 +3,6 @@
 module Decidim
   module ContentBlocks
     class SubHeroCell < Decidim::ViewModel
-      include Decidim::IconHelper
-      include Decidim::SanitizeHelper
-
       def show
         return if translated_attribute(current_organization.description).blank?
 

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

@@ -1,29 +1,29 @@
-<div class="extra__date-container">
+<div data-date-container>
   <% if same_day? %>
-    <div class="extra__date">
+    <div data-date>
       <%= l start_time, format: "%d" %>
-      <span class="extra__month"><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
+      <span data-month><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
     </div>
-    <div class="extra__time">
+    <div data-time>
       <%= l start_time, format: "%H:%M" %> - <%= l end_time, format: "%H:%M" %>
     </div>
   <% else %>
     <div>
-      <div class="extra__date">
+      <div data-date>
         <%= l start_time, format: "%d" %>
-        <span class="extra__month"><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
+        <span data-month><%= l start_time, format: "%B#{" %Y" if show_year?}" %></span>
       </div>
-      <div class="extra__time">
+      <div data-time>
         <%= l start_time, format: "%H:%M" %>
       </div>
     </div>
     <%= icon "arrow-right-line" %>
     <div>
-      <div class="extra__date">
+      <div data-date>
         <%= l end_time, format: "%d" %>
-        <span class="extra__month"><%= l end_time, format: "%B#{" %Y" if show_year?}" %></span>
+        <span data-month><%= l end_time, format: "%B#{" %Y" if show_year?}" %></span>
       </div>
-      <div class="extra__time">
+      <div data-time>
         <%= l end_time, format: "%H:%M" %>
       </div>
     </div>

data/app/cells/decidim/date_range_cell.rb

@@ -13,8 +13,6 @@ module Decidim
   # }
   #
   class DateRangeCell < Decidim::ViewModel
-    include Decidim::IconHelper
-
     def show
       return unless start_time && end_time
 

data/app/cells/decidim/diff_cell.rb

@@ -6,7 +6,6 @@ module Decidim
   # This cell renders the diff between `:old_data` and `:new_data`.
   class DiffCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include LayoutHelper
     include ActionView::Helpers::FormOptionsHelper
 
     def attribute(data)

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

@@ -1 +1,5 @@
 <%= render partial: "decidim/application/documents", formats: [:html], locals: { documents: } %>
+
+<% components_collections.each do |collection| %>
+  <%= render partial: "decidim/application/component_documents", formats: [:html], locals: { collection: } %>
+<% end %>

data/app/cells/decidim/documents_panel_cell.rb

@@ -22,7 +22,7 @@ module Decidim
     alias resource model
 
     def show
-      return if documents.blank?
+      return if blank?
 
       render
     end
@@ -30,5 +30,13 @@ module Decidim
     def documents
       @documents ||= resource.try(:documents)
     end
+
+    def components_collections
+      @components_collections ||= options[:components_collections] || []
+    end
+
+    def blank?
+      documents.blank? && components_collections.blank?
+    end
   end
 end

data/app/cells/decidim/endorsement_buttons_cell.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This cell renders the endrosement button and the endorsements count.
+  # This cell renders the endorsement button and the endorsements count.
   # It only supports one row of buttons per page due to current tag ids used by javascript.
   class EndorsementButtonsCell < Decidim::ViewModel
-    include LayoutHelper
     include CellsHelper
     include EndorsableHelper
     include ResourceHelper
-    include IconHelper
-    include Decidim::SanitizeHelper
-
-    delegate :current_user, to: :controller, prefix: false
-    delegate :current_settings, to: :controller, prefix: false
-    delegate :current_component, to: :controller, prefix: false
-    delegate :allowed_to?, to: :controller, prefix: false
 
     # Renders the "Endorse" button.
     # Contains all the logic about how the button should be rendered
@@ -49,13 +41,13 @@ module Decidim
     end
 
     # produce the path to endorsements from the engine routes as the cell does not have access to routes
-    def endorsements_path(*args)
-      decidim.endorsements_path(*args)
+    def endorsements_path(*)
+      decidim.endorsements_path(*)
     end
 
     # produce the path to an endorsement from the engine routes as the cell does not have access to routes
-    def endorsement_path(*args)
-      decidim.endorsement_path(*args)
+    def endorsement_path(*)
+      decidim.endorsement_path(*)
     end
 
     def button_content

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

@@ -1,6 +1,6 @@
-<div class="reveal flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
-  <div class="reveal__header">
-    <h3 id="flagUserModal-label" class="reveal__title"><%= t("decidim.shared.flag_user_modal.title") %></h3>
+<div class="flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
+  <div>
+    <h3 id="flagUserModal-label"><%= t("decidim.shared.flag_user_modal.title") %></h3>
     <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_user_modal.close") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/cells/decidim/followers_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class FollowersCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/following_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class FollowingCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

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

@@ -0,0 +1,8 @@
+<nav role="navigation" aria-label="Help">
+  <h2 class="h4 mb-4">Help</h2>
+  <ul class="space-y-4 break-inside-avoid">
+    <% topics.each do |topic| %>
+      <%= topic_item(topic, class: "font-semibold underline") %>
+    <% end %>
+  </ul>
+</nav>

data/app/cells/decidim/footer_topics_cell.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  # Topics and their corresponding pages are mapped out to the footer
+  # of the layout.
+  #
+  #  Example:
+  #
+  #   cell("decidim/footer_topics", nil)
+  #
+  class FooterTopicsCell < Decidim::ViewModel
+    def show
+      return if topics.blank?
+
+      render
+    end
+
+    private
+
+    def topics
+      @topics ||= current_organization.static_page_topics.where(show_in_footer: true).map do |topic|
+        next if topic.pages.empty?
+
+        {
+          title: decidim_escape_translated(topic.title),
+          path: decidim.page_path(topic.pages.first)
+        }
+      end.compact
+    end
+
+    def topic_item(page_data, opts = {})
+      content_tag(:li, **opts.slice(:class)) do
+        link_to page_data[:title], page_data[:path]
+      end
+    end
+  end
+end

data/app/cells/decidim/groups_cell.rb

@@ -4,9 +4,6 @@ module Decidim
   # This cell is intended to be used on profiles.
   class GroupsCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::LayoutHelper
-    include Decidim::ApplicationHelper
-    include Decidim::LayoutHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/linked_resources_for_cell.rb

@@ -23,9 +23,6 @@ module Decidim
   #   )
   class LinkedResourcesForCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
-
-    delegate :current_settings, to: :controller
 
     alias resource model
 

data/app/cells/decidim/members_cell.rb

@@ -5,7 +5,6 @@ module Decidim
   # Lists the members of the given user group.
   class MembersCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/navbar_admin_link_cell.rb

@@ -8,8 +8,6 @@ module Decidim
   #   <%= cell("decidim/navbar_admin_link", { link_url: link_url, link_options: link_options }) %>
   #
   class NavbarAdminLinkCell < Decidim::ViewModel
-    include Decidim::IconHelper
-
     def show
       render if link_url
     end

data/app/cells/decidim/newsletter_templates/base_cell.rb

@@ -5,7 +5,6 @@ require "cell/partial"
 module Decidim
   module NewsletterTemplates
     class BaseCell < Decidim::ViewModel
-      include Decidim::SanitizeHelper
       include Cell::ViewModel::Partial
       include Decidim::NewslettersHelper
 

data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb

@@ -62,9 +62,9 @@
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
               <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+                <%= link_to organization_name(organization).html_safe, custom_url_for_mail_root %>
               <% else %>
-                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+                <%= link_to organization_name(organization).html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
             </div>
           </th>

data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb

@@ -101,9 +101,9 @@ table.button table td {
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
               <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+                <%= link_to organization_name(organization).html_safe, custom_url_for_mail_root %>
               <% else %>
-                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+                <%= link_to organization_name(organization).html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
             </div>
           </th>

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

@@ -6,6 +6,11 @@
       <% if notification.display_resource_text? %>
         <div class="editor-content"><%= notification.resource_text %></div>
       <% end %>
+      <% if action_cell %>
+        <div class="notification__snippet-actions">
+          <%= cell(action_cell, model) %>
+        </div>
+      <% end %>
     </div>
   </div>
   <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>

data/app/cells/decidim/notification_actions/base_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NotificationActions
+    class BaseCell < Decidim::NotificationCell
+      def data
+        model&.event_class_instance&.action_data
+      end
+    end
+  end
+end

data/app/cells/decidim/notification_actions/buttons/show.erb

@@ -0,0 +1,5 @@
+<div class="flex items-start gap-4">
+  <% buttons.each do |button| %>
+    <%= link_to *button %>
+  <% end %>
+</div>

data/app/cells/decidim/notification_actions/buttons_cell.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NotificationActions
+    class ButtonsCell < BaseCell
+      def show
+        return unless data.present? && data.respond_to?(:map)
+
+        render :show
+      end
+
+      def buttons
+        @buttons ||= data.map do |item|
+          [
+            label_for(item),
+            item[:url],
+            {
+              class: "button button__sm #{class_for(item)}",
+              remote: true,
+              data: { "notification-action" => "button" }
+            }
+          ].tap do |button|
+            button[2][:method] = item[:method] if item[:method].in?(%w(get patch put delete post))
+          end
+        end
+      end
+
+      private
+
+      def label_for(item)
+        "#{item[:label].presence || I18n.t(item[:i18n_label])}#{icon(item[:icon]) if item[:icon].present?}"
+      end
+
+      def class_for(item)
+        (item[:class].presence || "button__transparent-secondary")
+      end
+    end
+  end
+end

data/app/cells/decidim/notification_cell.rb

@@ -4,9 +4,7 @@ module Decidim
   # This cell renders a notification from a notifications collection
 
   class NotificationCell < Decidim::ViewModel
-    include Decidim::IconHelper
     include Decidim::Core::Engine.routes.url_helpers
-    include Decidim::SanitizeHelper
 
     def show
       if notification.event_class_instance.try(:hidden_resource?)
@@ -27,11 +25,19 @@ module Decidim
 
       participatory_space = notification.resource.participatory_space
       link_to(
-        decidim_html_escape(translated_attribute(participatory_space.title)),
+        decidim_escape_translated(participatory_space.title),
         resource_locator(participatory_space).path
       )
     end
 
+    def action_class
+      @action ||= ("#{notification.event_class_instance.action_cell.camelize}Cell" if notification.event_class_instance.action_cell)
+    end
+
+    def action_cell
+      @action_cell ||= (notification.event_class_instance.action_cell if action_class&.safe_constantize)
+    end
+
     private
 
     def notification

data/app/cells/decidim/notifications_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class NotificationsCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::LayoutHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     helper_method :notifications

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

@@ -1,6 +1,6 @@
 <div class="row etherpad">
   <div class="columns large-12">
-    <div class="section documents">
+    <div class="documents">
       <h4><%= t("decidim.pad_iframe.pad") %></h4>
       <p><%= t("decidim.pad_iframe.explanation") %></p>
       <iframe
@@ -8,7 +8,7 @@
         src="<%= iframe_url %>"
         style="border: solid 4px #fff; border-radius: 4px; box-shadow: 0 0 0 1px #e8e8e8; width: 100%; height: 600px">
       </iframe>
-      <p><%= t("decidim.pad_iframe.disclaimer", organization: current_organization.name) %></p>
+      <p><%= t("decidim.pad_iframe.disclaimer", organization: current_organization_name) %></p>
     </div>
   </div>
 </div>

data/app/cells/decidim/pad_iframe_cell.rb

@@ -4,7 +4,6 @@ module Decidim
   # This cell is used to render an iframe to embed an Etherpad from a
   # Paddable model.
   class PadIframeCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     def show

data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class ParticipatorySpaceDropdownMetadataCell < Decidim::ViewModel
     include Decidim::TwitterSearchHelper
-    include Decidim::SanitizeHelper
 
     private
 
@@ -17,7 +16,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(model.try(:title) || model.try(:name) || ""))
+      decidim_escape_translated(model.try(:title) || model.try(:name) || "")
     end
 
     def hashtag

data/app/cells/decidim/photo_cell.rb

@@ -3,10 +3,6 @@
 module Decidim
   # This cell renders the media link card for an instance of a MediaLink
   class PhotoCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-    include Decidim::LayoutHelper
-    include Decidim::SanitizeHelper
-
     def show
       render
     end
@@ -30,7 +26,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(model.title))
+      decidim_escape_translated(model.title)
     end
 
     def short_description

data/app/cells/decidim/photos_list_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   # This cell renders the photos list
   class PhotosListCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
 
     def show
       return unless model.any?

data/app/cells/decidim/profile_cell.rb

@@ -2,11 +2,9 @@
 
 module Decidim
   class ProfileCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::UserProfileHelper
     include Decidim::AriaSelectedLinkToHelper
-    include Decidim::LayoutHelper
     include Decidim::ViewHooksHelper
     include ActiveLinkTo