decidim-core 0.30.7 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5110ff22ed67aef95bf387023ec7d18d9602a92944c82c2ab9373e786c04393c
-  data.tar.gz: b754a2b2ddb4a72ae07dcd384203d61454ced7f6a3a41a4f80a5bb501b3dc310
+  metadata.gz: 48ac792c6ae7948c567414610e5822df045b3f9f6c4dc638a8e5813a6043c6aa
+  data.tar.gz: 4b19fd5477f45a51b816eeabdb81961c181ef8d4a46d1fbe920c9fbe0a5cef25
 SHA512:
-  metadata.gz: 3659a2a34d2531735e1a03710329261952c724361d0661bb9cf02c7a2acc76c2516266e8030a82e4dcc40789361d67845f1421addfcbf0f1fe4e0743a1288572
-  data.tar.gz: 9ec948751168cd3f4a8cc2b768be6a118cd22b47aecb0712fa64a1c01d58a5cdf2b7f2f20963fdd0eec2384a41753bbaec558016f533bfab7176227df6f3cadd
+  metadata.gz: a44f376207a878d0ac6d250dc82d82e0c9c6ae06ca51f97140fe65e01eecc01780bbfe49c9434bf4dde2631141912d765e6052897ab07ae360ee57848f9e28a3
+  data.tar.gz: ac20b49d78c501a49757a3483e483e60b47ba4de6652ffbafbe6d97d535ab8a25aa6b1d21b8a93870116eff87c8f6489e2171238265393c3976e8ce22dd704aa

data/README.md

@@ -68,10 +68,6 @@ This can be done in an initializer (like user does), in a participatory_space ma
         ...
 ```
 
-## Metrics docs
-
-Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://docs.decidim.org/en/develop/metrics/)
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/cells/decidim/activity_cell.rb

@@ -12,12 +12,6 @@ module Decidim
       return unless renderable?
 
       render
-    rescue NoMethodError => e
-      # Soft-deleted components or participatory spaces could cause errors
-      # when rendering activities. We log them for further inspection but
-      # avoid breaking the entire activity feed.
-      Rails.logger.error("Error rendering activity cell for #{model.id}: #{e.message}")
-      nil
     end
 
     # Since activity logs could be linked to resource no longer available
@@ -87,7 +81,6 @@ module Decidim
     end
 
     def user
-      return resource.normalized_author if resource.respond_to?(:normalized_author)
       return resource.author if resource.respond_to?(:author)
       # As Proposals have Coauthorable concern instead of Authorable
       return resource.identities.first if resource.respond_to?(:identities)
@@ -137,8 +130,6 @@ module Decidim
       presenter = case user
                   when Decidim::User
                     UserPresenter.new(user)
-                  when Decidim::UserGroup
-                    UserGroupPresenter.new(user)
                   end
 
       return unless presenter

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

@@ -24,6 +24,7 @@
             <%= start_and_end_time %>
           </div>
         </div>
+      </div>
     </li>
   <% end %>
 </ul>

data/app/cells/decidim/address_cell.rb

@@ -24,11 +24,17 @@ module Decidim
     end
 
     def location
+      return pending_location_text if model.respond_to?(:pending_location?) && model.pending_location?
+
       decidim_sanitize_translated(model.location)
     end
 
     def address
-      decidim_sanitize_translated(model.address)
+      decidim_sanitize_translated(model.address) if model.respond_to?(:address) && model.address.present?
+    end
+
+    def pending_location_text
+      t("show.pending_address", scope: "decidim.meetings.meetings")
     end
 
     def display_start_and_end_time?

data/app/cells/decidim/amendable/amend_button_card/show.erb

@@ -1,5 +1,5 @@
-<li role="menuitem">
-  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "button button__sm button__text button__text-secondary" do %>
+<li role="menuitem" class="dropdown__item">
+  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button" do %>
     <span><%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %></span>
     <%= icon "pencil-line" %>
   <% end %>

data/app/cells/decidim/announcement_cell.rb

@@ -68,23 +68,15 @@ module Decidim
     def clean_body
       return unless body
 
-      Array(body).map { |paragraph| clean(paragraph) }.join
+      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join
     end
 
     def clean_announcement
-      return if announcement.is_a?(Hash) && announcement.values.all?(&:blank?)
-
       clean(announcement)
     end
 
     def clean(value)
-      return if value.blank? || value.nil?
-
-      if value.include?("rich-text-display")
-        decidim_sanitize_admin(translated_attribute(value))
-      else
-        tag.p(decidim_sanitize_admin(translated_attribute(value)))
-      end
+      decidim_sanitize_admin(translated_attribute(value))
     end
   end
 end

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

@@ -1,3 +1,3 @@
 <div class="row column">
-  <%= form.upload :file, attachments: form.object.file.present? ? [form.object.file] : [], button_class: "button button__sm button__transparent-secondary" %>
+  <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
 </div>

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

@@ -0,0 +1,4 @@
+<%= link_to "#{resource_locator(from_context).path}#list-of-likes", title: t("decidim.author.likes", count: from_context.likes_count), class: "author__metadata" do %>
+  <%= icon "like" if show_icons? %>
+  <%= from_context.likes_count %> <%= t("decidim.author.likes", count: from_context.likes_count) %>
+<% end %>

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

@@ -1,15 +1,10 @@
-<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
-<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
 <%= content_tag(:p, class: :author, data: ) do %>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}" do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
       <span>
-        <span class="flex gap-2">
-          <%= render :name %>
-          <%= render :badge %>
-        </span>
+        <%= render :name %>
 
         <% context_actions.each do |action| %>
           <%= render action %>
@@ -20,7 +15,6 @@
     <% else %>
       <%= render :avatar %>
       <%= render :name %>
-      <%= render :badge %>
     <% end %>
   <% end %>
 

data/app/cells/decidim/author_cell.rb

@@ -16,7 +16,6 @@ module Decidim
 
     property :profile_path
     property :can_be_contacted?
-    property :has_tooltip?
 
     delegate :current_user, to: :controller, prefix: false
 
@@ -47,24 +46,10 @@ module Decidim
       @context_actions_options ||= options[:context_actions].map(&:to_sym)
     end
 
-    def profile_minicard
-      render
-    end
-
     private
 
-    # If the options hash has the demo key it means we are in the decidim-design engine,
-    # so it is not a real-world scenario with actual users
     def data
-      @data ||= begin
-        internal_data = { author: true }
-        if has_tooltip? && !options.has_key?(:demo)
-          internal_data["remote_tooltip"] = true
-          internal_data["tooltip-url"] = decidim.profile_tooltip_path(raw_model.nickname)
-        end
-
-        internal_data
-      end
+      @data ||= { author: true }
     end
 
     def layout
@@ -80,7 +65,7 @@ module Decidim
         list << :date if creation_date?
         list << :cancelled_on if cancelable?
         list << :comments if commentable?
-        list << :endorsements if endorsable?
+        list << :likes if likeable?
         list << :withdraw if withdrawable?
       end
       return actions unless has_context_actions_options?
@@ -101,7 +86,7 @@ module Decidim
       hash.push(current_user.try(:id))
       hash.push(current_user.present?)
       hash.push(commentable?)
-      hash.push(endorsable?)
+      hash.push(likeable?)
       hash.push(actionable?)
       hash.push(withdrawable?)
       hash.push(profile_path?)
@@ -147,8 +132,8 @@ module Decidim
       from_context && from_context.respond_to?(:cancelled_on)
     end
 
-    def endorsable?
-      from_context && from_context.class.include?(Decidim::Endorsable)
+    def likeable?
+      from_context && from_context.class.include?(Decidim::Likeable)
     end
 
     def actionable?
@@ -178,23 +163,5 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
-
-    def has_tooltip?
-      return false if model.deleted?
-      return false if model.respond_to?(:blocked?) && model.blocked?
-      return true if options.has_key?(:tooltip)
-
-      model.has_tooltip?
-    end
-
-    def show_badge?
-      return false unless model.respond_to? :officialized?
-
-      model.officialized?
-    end
-
-    def officialization_text
-      translated_attribute(model.officialized_as).presence || t("decidim.profiles.show.officialized")
-    end
   end
 end

data/app/cells/decidim/badge_cell.rb

@@ -17,13 +17,7 @@ module Decidim
     end
 
     def own_profile?
-      return @own_profile if defined?(@own_profile)
-
-      @own_profile = if model.is_a?(User)
-                       model == current_user
-                     elsif model.is_a?(UserGroup) && current_user
-                       current_user.user_groups.include?(model)
-                     end
+      model == current_user
     end
 
     def description

data/app/cells/decidim/card_cell.rb

@@ -49,9 +49,7 @@ module Decidim
     def resource_cell
       @resource_cell ||= if resource_card
                            resource_card
-                         elsif group_membership?
-                           "decidim/user_profile"
-                         elsif official_author? || user_or_user_group?
+                         elsif official_author? || user_base_entity?
                            "decidim/author"
                          end
     end
@@ -82,18 +80,10 @@ module Decidim
       model.is_a? Decidim::OfficialAuthorPresenter
     end
 
-    def user_or_user_group?
+    def user_base_entity?
       model.is_a?(Decidim::UserBaseEntity)
     end
 
-    def group_membership?
-      model.instance_of?(::Decidim::UserGroupMembership)
-    end
-
-    def user_group?
-      model.instance_of?(::Decidim::UserGroup)
-    end
-
     def stats
       []
     end

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_url, alt: "" %>
+      <%= 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_metadata_cell.rb

@@ -45,13 +45,13 @@ module Decidim
       }
     end
 
-    def endorsements_count_item
-      return unless resource.respond_to?(:endorsements_count)
+    def likes_count_item
+      return unless resource.respond_to?(:likes_count)
 
       {
-        text: resource.endorsements_count,
+        text: resource.likes_count,
         icon: resource_type_icon_key(:like),
-        data_attributes: { endorsements_count: "" }
+        data_attributes: { likes_count: "" }
       }
     end
 

data/app/cells/decidim/coauthorships_cell.rb

@@ -39,7 +39,7 @@ module Decidim
       if official?
         "#{model.class.module_parent}::OfficialAuthorPresenter".constantize.new
       else
-        authorable.user_group&.presenter || authorable.author.presenter
+        authorable.author.presenter
       end
     end
 

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

@@ -1,4 +1,4 @@
-<div class="author__coauthors" data-component="accordion">
+<div class="author__coauthors" data-controller="accordion">
   <% visible_authors.each do |author| %>
     <%= cell "decidim/author", author, layout: :compact %>
   <% end %>

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

@@ -3,9 +3,6 @@
 module Decidim
   module ContentBlocks
     class HeroCell < Decidim::ViewModel
-      include Decidim::CtaButtonHelper
-
-      # Needed so that the `CtaButtonHelper` can work.
       def decidim_participatory_processes
         Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
       end
@@ -25,13 +22,35 @@ module Decidim
       def cache_hash
         hash = []
         hash << "decidim/content_blocks/hero"
-        hash << Digest::MD5.hexdigest(model.attributes.to_s)
+        hash << Digest::SHA256.hexdigest(model.attributes.to_s)
         hash << current_organization.cache_key_with_version
         hash << I18n.locale.to_s
         hash << background_image
 
         hash.join(Decidim.cache_key_separator)
       end
+
+      def cta_button_text
+        translated_attribute(model.settings.cta_button_text).presence || t("decidim.pages.home.hero.participate")
+      end
+
+      def cta_button
+        link_to cta_button_text, cta_button_path, class: "hero-cta button expanded large button--sc", title: t("decidim.pages.home.hero.participate_title")
+      end
+
+      def cta_button_path
+        if model.settings.cta_button_path.present?
+          translated_attribute(model.settings.cta_button_path)
+        elsif Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?
+          decidim_participatory_processes.participatory_processes_path
+        elsif current_user
+          decidim.account_path
+        elsif current_organization.sign_up_enabled?
+          decidim.new_user_registration_path
+        else
+          decidim.new_user_session_path
+        end
+      end
     end
   end
 end

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

@@ -1,7 +1,21 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :text_field, :welcome_text, label: t(".welcome_text") %>
+  <div class="row column">
+    <%= settings_fields.translated :text_field, :welcome_text, label: t(".welcome_text") %>
+  </div>
+
+  <div class="row column" data-controller="slug">
+    <%= settings_fields.translated :text_field, :cta_button_path, label: t(".cta_button_path") %>
+    <p class="help-text"><%= t(".cta_button_path_help", url: decidim_form_slug_url("", translated_attribute(form.object.settings.cta_button_path))) %></p>
+  </div>
+
+  <div class="row column">
+    <%= settings_fields.translated :text_field, :cta_button_text, label: t(".cta_button_text") %>
+    <p class="help-text"><%= t(".cta_button_text_help") %></p>
+  </div>
 <% end %>
 
 <% form.fields_for :images, form.object.images do |images_fields| %>
-  <%= images_fields.upload :background_image, label: t(".background_image") %>
+  <div class="row column">
+    <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
+  </div>
 <% end %>

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

@@ -1,18 +1,18 @@
-<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).url %>');">
+<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= background_image %>');">
   <div class="home__section-content-banner home__section">
     <div>
       <h2 class="home__section-content-banner__title">
-        <%= translated_attribute current_organization.highlighted_content_banner_title %>
+        <%= translated_title %>
       </h2>
       <div class="editor-content">
-        <%= translated_attribute current_organization.highlighted_content_banner_short_description %>
+        <%= translated_short_description %>
       </div>
     </div>
-    <%= link_to current_organization.highlighted_content_banner_action_url, class: "button button__lg button__secondary mt-4 md:mt-0 mr-auto md:mr-0 md:ml-auto" do %>
+    <%= link_to model.settings.action_button_url, class: "button button__lg button__secondary mt-4 md:mt-0 mr-auto md:mr-0 md:ml-auto" do %>
       <span>
-        <%= translated_attribute current_organization.highlighted_content_banner_action_title %>
+        <%= translated_banner_action_title %>
         <span class="block font-normal text-sm">
-          <%= translated_attribute current_organization.highlighted_content_banner_action_subtitle %>
+          <%= translated_banner_action_subtitle %>
         </span>
       </span>
     <% end %>

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

@@ -4,10 +4,37 @@ module Decidim
   module ContentBlocks
     class HighlightedContentBannerCell < Decidim::ViewModel
       def show
-        return unless current_organization.highlighted_content_banner_enabled
+        return unless render?
 
         render
       end
+
+      def translated_title
+        translated_attribute model.settings.title
+      end
+
+      def translated_short_description
+        translated_attribute model.settings.short_description
+      end
+
+      def translated_banner_action_title
+        translated_attribute model.settings.action_button_title
+      end
+
+      def translated_banner_action_subtitle
+        translated_attribute model.settings.action_button_subtitle
+      end
+
+      def background_image
+        model.images_container.attached_uploader(:background_image).variant_url(:big)
+      end
+
+      private
+
+      def render?
+        required_keys = [:title, :short_description, :action_button_title, :action_button_subtitle, :action_button_url]
+        required_keys.all? { |key| model.settings.public_send(key).present? }
+      end
     end
   end
 end

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

@@ -0,0 +1,27 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <div class="row column">
+    <%= settings_fields.translated :text_field, :title, label: t(".title") %>
+  </div>
+
+  <div class="row column">
+    <%= settings_fields.translated :editor, :short_description, label: t(".short_description") %>
+  </div>
+
+  <div class="row column">
+    <%= settings_fields.translated :text_field, :action_button_title, label: t(".action_button_title") %>
+  </div>
+
+  <div class="row column">
+    <%= settings_fields.translated :text_field, :action_button_subtitle, label: t(".action_button_subtitle") %>
+  </div>
+
+  <div class="row column">
+    <%= settings_fields.text_field :action_button_url, label: t(".action_button_url") %>
+  </div>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <div class="row column">
+    <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HighlightedContentBannerSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+    end
+  end
+end

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

@@ -1,4 +1,11 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select(:order, order_options, prompt: "", label:) if include_order_setting? %>
-  <%= settings_fields.select :component_id, component_options, prompt: "", label: component_label %>
+  <% if include_order_setting? %>
+    <div class="row column">
+      <%= settings_fields.select(:order, order_options, prompt: "", label:) %>
+    </div>
+  <% end %>
+
+  <div class="row column">
+    <%= settings_fields.select :component_id, component_options, prompt: "", label: component_label %>
+  </div>
 <% end %>

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

@@ -19,14 +19,10 @@ module Decidim
         @list_cell ||= cell(
           list_cell_path,
           published_components.one? ? published_components.first : published_components,
-          **model.settings.to_h, **extra_list_cell_options, see_all_path:
+          **model.settings.to_h, see_all_path:
         )
       end
 
-      def extra_list_cell_options
-        {}
-      end
-
       def see_all_path; end
     end
   end

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

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :text_area, :html_content, label: %>
+  <div class="row column">
+    <%= settings_fields.translated :text_area, :html_content, label: %>
+  </div>
 <% end %>

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

@@ -49,7 +49,7 @@ module Decidim
       def cache_hash
         hash = []
         hash << "decidim/content_blocks/last_activity"
-        hash << Digest::MD5.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
+        hash << Digest::SHA256.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
         hash << I18n.locale.to_s
 
         hash.join(Decidim.cache_key_separator)

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

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.number_field :max_last_activity_users, label: %>
+  <div class="row column">
+    <%= settings_fields.number_field :max_last_activity_users, label: %>
+  </div>
 <% end %>

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

@@ -27,7 +27,7 @@ module Decidim
         hash = []
         hash << "decidim/content_blocks/menu_breadcrumb_last_activity"
         hash << id_prefix
-        hash << Digest::MD5.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
+        hash << Digest::SHA256.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
         hash << I18n.locale.to_s
 
         hash.join(Decidim.cache_key_separator)

data/app/cells/decidim/content_blocks/participatory_space_extra_data/recent_users.erb

@@ -1,5 +1,5 @@
 <div class="participatory-space__metadata-link">
-  <div class="participatory-space__metadata-link-endorsers">
+  <div class="participatory-space__metadata-link-likes">
     <%= cell("decidim/content_blocks/participatory_space_last_activity", model, base_model:).render_recent_avatars %>
   </div>
 </div>

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

@@ -5,11 +5,6 @@
         <%= title_text %>
       </h1>
       <p class="participatory-space__hero-slogan">
-        <% if has_hashtag? %>
-          <span>
-            <%= link_to "##{escaped_hashtag}", twitter_hashtag_url(escaped_hashtag), target: "_blank" %>
-          </span>
-        <% end %>
         <%= subtitle_text %>
       </p>
       <% if has_cta? %>

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

@@ -3,9 +3,7 @@
 module Decidim
   module ContentBlocks
     class ParticipatorySpaceHeroCell < Decidim::ContentBlocks::BaseCell
-      include Decidim::TwitterSearchHelper
-
-      delegate :title, :hashtag, :attached_uploader, to: :resource
+      delegate :title, :attached_uploader, to: :resource
 
       def cta_text
         return unless model
@@ -37,19 +35,9 @@ module Decidim
         attached_uploader(:banner_image).url
       end
 
-      def has_hashtag?
-        @has_hashtag ||= hashtag.present?
-      end
-
       def has_cta?
         [cta_text, cta_path].all?
       end
-
-      def escaped_hashtag
-        return unless has_hashtag?
-
-        @escaped_hashtag ||= decidim_html_escape(hashtag)
-      end
     end
   end
 end