decidim-core 0.30.1 → 0.31.0.rc1

data/app/cells/decidim/content_blocks/participatory_space_main_data/title.erb

@@ -2,20 +2,28 @@
 
 <% if short_description_text.present? %>
   <div class="content-block__description editor-content">
-    <%= short_description_text %>
+    <% if rich_text_processors? %>
+      <%= render_rich_text(resource, :short_description) %>
+    <% else %>
+      <%= short_description_text %>
+    <% end %>
   </div>
 <% end %>
 
 <% if description_text.present? %>
   <% should_truncate = strip_tags(description_text).length > 300 %>
-  <div class="content-block__description editor-content" <%= "data-component='accordion'" if should_truncate %>>
+  <div class="content-block__description editor-content" <%= "data-controller='accordion'" if should_truncate %>>
     <% if should_truncate %>
       <% seed = SecureRandom.hex(4) %>
-      <div id="panel-view-more-<%= seed %>" aria-hidden="true">
-        <%= description_text %>
+      <div id="panel-view-more-<%= seed %>" class="editor-content" inert>
+        <% if rich_text_processors? %>
+          <%= render_rich_text(resource, :description) %>
+        <% else %>
+          <%= description_text %>
+        <% end %>
       </div>
 
-      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false">
+      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false" onclick="document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')">
         <span>
           <%= t("view_more", scope: "layouts.decidim.announcements") %>
         </span>
@@ -26,7 +34,20 @@
         <%= icon "arrow-up-s-line" %>
       </button>
     <% else %>
-      <%= description_text %>
+      <% if rich_text_processors? %>
+        <%= render_rich_text(resource, :description) %>
+      <% else %>
+        <%= description_text %>
+      <% end %>
     <% end %>
   </div>
 <% end %>
+<script>
+  const button = document.querySelector('button[data-controls^="panel-view-more"]')
+  button.addEventListener('keydown', function(e){
+    // press space or enter
+    if (e.keyCode === 32 || e.keyCode === 13){
+      document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')
+    }
+  })
+</script>

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

@@ -9,6 +9,10 @@ module Decidim
         "participatory-space__content-block"
       end
 
+      def rich_text_processors?
+        false
+      end
+
       def title; end
 
       def short_description_text; end

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

@@ -1,7 +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") %>
   </h2>
-
-  <%= cell("decidim/statistics", stats.highlighted + stats.not_highlighted) %>
+  <%= cell("decidim/statistics", stats.collection) %>
 </section>

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

@@ -5,7 +5,7 @@
       <p id="dialog-desc-dc-modal">
         <%= t("layouts.decidim.data_consent.modal.description") %>
       </p>
-      <div class="mt-8" data-component="accordion" data-multiselectable="false">
+      <div class="mt-8" data-controller="accordion" data-multiselectable="false">
         <% categories.each do |category| %>
           <%= render(
             {

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

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

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

@@ -1,7 +1,10 @@
 <div class="grid grid-cols-1 md:grid-cols-4 gap-6">
-  <% photos.each_with_index do |photo, index| %>
+  <% photos.each_with_index do |photo| %>
     <%= link_to photo.big_url, target: "_blank", rel: "noopener", class: "overflow-hidden rounded aspect-video" do %>
-      <%= image_tag photo.thumbnail_url, class:"w-full h-full object-cover", alt: strip_tags(translated_attribute(photo.title)) %>
+      <%= image_tag photo.thumbnail_url,
+                    class: "w-full h-full object-cover",
+                    role: "presentation",
+                    "data-filename": strip_tags(translated_attribute(photo.title)) %>
     <% end %>
   <% end %>
 </div>

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

@@ -0,0 +1,3 @@
+<div id="resource-<%= resource&.id %>-like-block" class="flex gap-2">
+  <%= cell "decidim/like_buttons", resource %>
+</div>

data/app/cells/decidim/{endorsement_block_cell.rb → like_block_cell.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Decidim
-  class EndorsementBlockCell < Decidim::ViewModel
+  class LikeBlockCell < Decidim::ViewModel
     def show
-      return unless endorsements_enabled?
+      return unless likes_enabled?
 
       render :show
     end

data/app/cells/decidim/like_buttons/button_content.erb

@@ -0,0 +1,2 @@
+<span><%= t("decidim.like_buttons_cell.like") %></span>
+<%= like_icon %>

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

@@ -0,0 +1,17 @@
+<div id="resource-<%= resource&.id %>-like-button">
+  <% path = resource.liked_by?(current_user) ? path_to_destroy_like(resource) : path_to_create_like(resource) %>
+  <% method = resource.liked_by?(current_user) ? :delete : :post %>
+  <%= action_authorized_button_to(
+        :like,
+        path,
+        :resource => resource,
+        :method => method,
+        :remote => true,
+        :class => button_classes,
+        :id => "like-button",
+        "aria-label" => like_translated
+      ) do %>
+    <span><%= t("decidim.like_buttons_cell.like") %></span>
+    <%= like_icon %>
+  <% end %>
+</div>

data/app/cells/decidim/{endorsement_buttons → like_buttons}/verification_modal.erb

@@ -1,7 +1,7 @@
-<%= button_to(endorsement_path(resource),
-              :data => { "dialog-open": "authorizationModal", "dialog-remote-url": modal_path(:endorse, resource) },
+<%= button_to(like_path(resource),
+              :data => { "dialog-open": "authorizationModal", "dialog-remote-url": modal_path(:like, resource) },
               :class => button_classes,
-              "aria-label" => endorse_translated
+              "aria-label" => like_translated
     ) do %>
   <%= render "button_content" %>
 <% end %>

data/app/cells/decidim/like_buttons_cell.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the like button and the likes count.
+  # It only supports one row of buttons per page due to current tag ids used by javascript.
+  class LikeButtonsCell < Decidim::ViewModel
+    include CellsHelper
+    include LikeableHelper
+    include ResourceHelper
+
+    # Renders the "Like" button.
+    # Contains all the logic about how the button should be rendered
+    # and which actions the button must trigger.
+    #
+    # It takes into account:
+    # - if likes are enabled
+    # - if users are logged in
+    # - if users require verification
+    def show
+      return render :disabled_likes if likes_blocked?
+      return render unless current_user
+      return render :disabled_likes if user_can_not_participate?
+      return render :verification_modal unless like_allowed?
+
+      render
+    end
+
+    def button_classes
+      "button button__sm button__transparent-secondary"
+    end
+
+    # The resource being un/liked is the Cell's model.
+    def resource
+      model
+    end
+
+    # produce the path to likes from the engine routes as the cell does not have access to routes
+    def likes_path(*)
+      decidim.likes_path(*)
+    end
+
+    # produce the path to a like from the engine routes as the cell does not have access to routes
+    def like_path(*)
+      decidim.like_path(*)
+    end
+
+    def button_content
+      render
+    end
+
+    private
+
+    def likes_blocked?
+      current_settings.likes_blocked?
+    end
+
+    def user_can_not_participate?
+      !current_component.participatory_space.can_participate?(current_user)
+    end
+
+    def like_allowed?
+      allowed_to?(:create, :like, resource:)
+    end
+
+    def like_translated
+      @like_translated ||= resource.liked_by?(current_user) ? t("decidim.like_buttons_cell.already_liked") : t("decidim.like_buttons_cell.like")
+    end
+
+    def like_icon
+      @like_icon ||= resource_type_icon(resource.liked_by?(current_user) ? "dislike" : "like")
+    end
+
+    def raw_model
+      model.try(:__getobj__) || model
+    end
+  end
+end

data/app/cells/decidim/likers_list/empty.erb

@@ -0,0 +1,3 @@
+<section class="hidden layout-main__section" id="liker-list-<%= model.id %>">
+
+</section>

data/app/cells/decidim/{endorsers_list → likers_list}/full.erb

@@ -1,9 +1,9 @@
-<%= decidim_modal id: "endorsersModal-#{model.id}", class: "endorsers-list__modal" do %>
+<%= decidim_modal id: "likesModal-#{model.id}", class: "likes-list__modal" do %>
   <div data-dialog-container>
     <%= icon "like" %>
-    <h2 id="dialog-title-endorsersModal" tabindex="-1" data-dialog-title><%= t("decidim.endorsers_list.title") %></h2>
+    <h2 id="dialog-title-likesModal" tabindex="-1" data-dialog-title><%= t("decidim.likes_list.title") %></h2>
     <div>
-      <% full_endorsers.each do |author| %>
+      <% full_likers.each do |author| %>
         <div class="list-item__author">
           <div>
             <%= cell "decidim/author", author, has_actions: true, skip_profile_link: true %>

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

@@ -0,0 +1,20 @@
+<section class="layout-main__section" id="liker-list-<%= model.id %>">
+  <div class="likes-list__container">
+    <% visible_likers.each do |visible_liker| %>
+      <span class="likes-list__avatar">
+        <%= cell "decidim/author", visible_liker, layout: :avatar, skip_profile_link: true %>
+      </span>
+    <% end %>
+
+    <div class="text-center">
+      <div class="likes-list__text">
+        <%= t("decidim.likes_list.liked_by",
+              visible: display_link(voted_by_me? ? t("decidim.likes_list.you") : visible_likers.first.try(:name)),
+              others: display_link(t("decidim.likes_list.others", count: likers_count - 1), css_class: " first-letter:uppercase"),
+              count: likers_count
+            ) %>
+      </div>
+    </div>
+  </div>
+  <%= render :full %>
+</section>

data/app/cells/decidim/likers_list_cell.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  # This cell renders the list of likes.
+  #
+  # Example:
+  #
+  #    cell("decidim/likers_list", my_component)
+  class LikersListCell < Decidim::ViewModel
+    include ApplicationHelper
+
+    MAX_ITEMS_STACKED = 8
+
+    def show
+      return render :empty if visible_likers.count.zero?
+      return render :full if full_list?
+
+      render
+    end
+
+    def likers_count
+      base_relation.count
+    end
+
+    private
+
+    def full_list?
+      options[:layout] == :full
+    end
+
+    # Finds the correct author for each like.
+    #
+    # Returns an Array of presented Users
+    def visible_likers
+      @visible_likers ||= if voted_by_me?
+                            base_relation.where.not(author: current_user).limit(MAX_ITEMS_STACKED - 1).map do |identity|
+                              present(identity.author)
+                            end + [present(current_user)]
+                          else
+                            base_relation.limit(MAX_ITEMS_STACKED).map { |identity| present(identity.author) }
+                          end
+    end
+
+    def full_likers
+      @full_likers ||= base_relation.map { |identity| present(identity.author) }
+    end
+
+    def base_relation
+      @base_relation ||= model.likes.for_listing.includes(:author)
+    end
+
+    def voted_by_me?
+      @voted_by_me ||= model.liked_by?(current_user)
+    end
+
+    def display_link(text, css_class: "")
+      link_to(text, "#",
+              class: "text-sm font-semibold text-secondary inline-block #{css_class}",
+              data: { "dialog-open": "likesModal-#{model.id}" })
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 <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-scroll-to-menu="true" data-open-md="true">
+  <button id="dropdown-trigger-participatory-space" data-controller="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-scroll-to-menu="true" data-open-md="true">
     <span><%= t("decidim.searches.filters.jump_to") %></span>
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>

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

@@ -19,7 +19,7 @@ module Decidim
             {
               class: "button button__sm #{class_for(item)}",
               remote: true,
-              data: { "notification-action" => "button" }
+              data: { controller: "notification-action", action: "click->notification-action#click" }
             }
           ].tap do |button|
             button[2][:method] = item[:method] if item[:method].in?(%w(get patch put delete post))

data/app/cells/decidim/onboarding_action_message_cell.rb

@@ -25,7 +25,7 @@ module Decidim
     private
 
     def onboarding_path
-      decidim_verifications.onboarding_pending_authorizations_path
+      onboarding_manager.authorization_path || decidim_verifications.onboarding_pending_authorizations_path
     end
 
     def onboarding_manager

data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb

@@ -1,9 +1 @@
 <h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
-<% if hashtag.present? %>
-  <div class="menu-bar__secondary-dropdown__metadata">
-    <span>
-      <%= icon "twitter-x-line", class: "text-gray fill-current" %>
-      <%= link_to "##{hashtag}", twitter_hashtag_url(hashtag), target: "_blank", class: "text-secondary underline" %>
-    </span>
-  </div>
-<% end %>

data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb

@@ -2,8 +2,6 @@
 
 module Decidim
   class ParticipatorySpaceDropdownMetadataCell < Decidim::ViewModel
-    include Decidim::TwitterSearchHelper
-
     private
 
     def nav_items_method = nil
@@ -19,12 +17,6 @@ module Decidim
       decidim_escape_translated(model.try(:title) || model.try(:name) || "")
     end
 
-    def hashtag
-      return unless model.respond_to?(:hashtag)
-
-      @hashtag ||= decidim_html_escape(model.hashtag) if model.hashtag.present?
-    end
-
     def id
       return "#{model.id}-mobile" if options[:mobile]
 

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

@@ -1,7 +1,7 @@
 <div class="profile__details">
   <h1 class="h3">
     <%= presented_profile.name %>
-    <span class="sr-only"><%= tab_items.find { |tab_item| is_active_link?(tab_item[:path]) }&.dig(:text) %> (<%= presented_profile.name %>)</span>
+    <span class="sr-only"><%= user_tabs.find { |tab_item| is_active_link?(tab_item[:path]) }&.dig(:text) %> (<%= presented_profile.name %>)</span>
   </h1>
   <div class="profile__details-data">
     <% details_items.each do |detail| %>

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

@@ -1,4 +1,4 @@
-<% tab_items.each do |tab_item| %>
+<% user_tabs.each do |tab_item| %>
   <% active_link = is_active_link?(tab_item[:path]) %>
   <li class="profile__tab<%= " is-active" if active_link %>">
     <%= link_to tab_item[:path], title: tab_item[:text], class: "profile__tab-item", aria: { current: active_link ? "page" : nil } do %>

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

@@ -1,5 +1,4 @@
 <div class="profile__actions-main">
-  <%= dropdown_actions %>
   <%= profile_actions %>
 </div>
 

data/app/cells/decidim/profile_actions_cell.rb

@@ -8,17 +8,9 @@ module Decidim
     delegate :user_signed_in?, to: :controller
 
     ACTIONS_ITEMS = {
-      edit_profile: { icon: "pencil-line", path: :profile_edit_path },
-      create_user_group: { icon: "team-line", path: :profile_new_group_path },
-      resend_email_confirmation_instructions: { icon: "share-forward-line", path: :group_email_confirmation_path, options: { method: :post } },
-      edit_user_group: { icon: "team-line", path: :edit_group_path },
+      edit_profile: { icon: "pencil-line", path: :account_path },
       message: { icon: "mail-send-line", path: :new_conversation_path },
-      disabled_message: { icon: "mail-send-line", options: { html_options: { disabled: true, title: I18n.t("decidim.user_contact_disabled") } } },
-      manage_user_group_users: { icon: "user-settings-line", path: :profile_group_members_path },
-      manage_user_group_admins: { icon: "user-star-line", path: :profile_group_admins_path },
-      invite_user: { icon: "user-add-line", path: :group_invites_path },
-      join_user_group: { icon: "user-add-line", path: :group_join_requests_path, options: { method: :post } },
-      leave_user_group: { icon: "logout-box-r-line", path: :leave_group_path, options: { method: :delete, data: { confirm: I18n.t("decidim.groups.actions.are_you_sure") } } }
+      disabled_message: { icon: "mail-send-line", options: { html_options: { disabled: true, title: I18n.t("decidim.user_contact_disabled") } } }
     }.freeze
 
     private
@@ -30,62 +22,22 @@ module Decidim
       values[:options] = values.delete(:options) || {}
       return values if values.has_key?(:cell)
 
-      values[:path] = send(values[:path], profile_holder.nickname) if values[:path].present?
+      values[:path] = send(values[:path]) if values[:path].present?
       values[:text] = t(key, scope: translations_scope)
       values
     end
 
-    def profile_edit_path(nickname)
-      if own_profile?
-        account_path
-      elsif can_edit_user_group_profile?
-        edit_group_path(nickname)
-      end
-    end
-
-    def profile_new_group_path(_nickname)
-      new_group_path
-    end
-
-    def new_conversation_path(_nickname)
+    def new_conversation_path
       current_or_new_conversation_path_with(profile_holder)
     end
 
-    def can_edit_user_group_profile?
-      return false unless user_group?
-      return false unless user_groups_enabled?
-      return false unless current_user
-
-      Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
-    end
-
     def actions_keys
       @actions_keys ||= [].tap do |keys|
         keys << :edit_profile if own_profile?
-        keys << :create_user_group if own_profile? && user_groups_enabled?
         keys << message_key if can_contact_user?
-        keys << :join_user_group if can_join_user_group?
-        keys << :leave_user_group if can_leave_group?
       end
     end
 
-    def group_editor_actions_keys
-      @group_editor_actions_keys ||= if can_edit_user_group_profile?
-                                       [
-                                         :edit_user_group,
-                                         :manage_user_group_users,
-                                         :manage_user_group_admins,
-                                         :invite_user
-                                       ].tap do |keys|
-                                         keys.prepend(:resend_email_confirmation_instructions) if user_group_email_to_be_confirmed?
-                                         keys << :join_user_group if can_join_user_group?
-                                         keys << :leave_user_group if can_leave_group?
-                                       end
-                                     else
-                                       []
-                                     end
-    end
-
     def message_key
       return :message if current_or_new_conversation_path_with(presented_profile).present?
 
@@ -93,50 +45,12 @@ module Decidim
     end
 
     def profile_actions
-      actions = (actions_keys - group_editor_actions_keys).map { |key| action_item(key) }.compact
+      actions = actions_keys.map { |key| action_item(key) }.compact
       return if actions.blank?
 
       render locals: { actions: }
     end
 
-    def dropdown_actions
-      return if group_editor_actions_keys.blank?
-
-      actions = group_editor_actions_keys.map { |key| action_item(key) }.compact
-      return if actions.blank?
-
-      render locals: { actions: }
-    end
-
-    def user_group?
-      profile_holder.is_a?(Decidim::UserGroup)
-    end
-
-    def can_leave_group?
-      return false unless user_group?
-      return false unless current_user
-
-      Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
-    end
-
-    def can_join_user_group?
-      return false unless user_group?
-      return false unless current_user
-
-      !Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
-    end
-
-    def user_group_email_to_be_confirmed?
-      return false unless user_group?
-      return false unless current_user
-
-      !model.confirmed?
-    end
-
-    def group_member?
-      Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
-    end
-
     def can_contact_user?
       !current_user || (current_user && current_user != model && presented_profile.can_be_contacted?)
     end

data/app/cells/decidim/profile_cell.rb

@@ -8,17 +8,14 @@ module Decidim
     include Decidim::ViewHooksHelper
     include ActiveLinkTo
 
-    delegate :current_organization, :current_user, :user_groups_enabled?, to: :controller
+    delegate :current_organization, :current_user, to: :controller
     delegate :avatar_url, :nickname, :personal_url, :followers_count, :users_followings, :officialized_as, to: :presented_profile
 
     TABS_ITEMS = {
       activity: { icon: "bubble-chart-line", path: :profile_activity_path },
       badges: { icon: "award-line", path: :profile_badges_path },
       following: { icon: "eye-2-line", path: :profile_following_path },
-      followers: { icon: "group-line", path: :profile_followers_path },
-      groups: { icon: "team-line", path: :profile_groups_path },
-      members: { icon: "contacts-line", path: :profile_members_path },
-      conversations: { icon: "question-answer-line", path: :profile_conversations_path }
+      followers: { icon: "group-line", path: :profile_followers_path }
     }.freeze
 
     def show
@@ -39,8 +36,6 @@ module Decidim
     end
 
     def show_badge?
-      return if user_group?
-
       profile_holder.officialized?
     end
 
@@ -78,17 +73,12 @@ module Decidim
       current_user && current_user == profile_holder
     end
 
-    def manageable_group?
-      return false unless user_group?
-
-      current_user && current_user.manageable_user_groups.include?(profile_holder)
-    end
-
+    # i18n-tasks-use t("decidim.profiles.show.following")
+    # i18n-tasks-use t("decidim.profiles.show.followers")
     def tab_item(key)
       values = TABS_ITEMS[key].dup
       values[:path] = send(values[:path], nickname: profile_holder.nickname)
       values[:text] = t(key, scope: "decidim.profiles.show")
-      values.merge!(extra_data[key]) if extra_data.has_key?(key)
       values
     end
 
@@ -96,33 +86,8 @@ module Decidim
       items = [:activity].tap do |keys|
         keys << :badges if current_organization.badges_enabled?
         keys.append(:following, :followers)
-        keys << :groups if user_groups_enabled?
-      end
-      items.map { |key| tab_item(key) }
-    end
-
-    def group_tabs
-      items = [:members].tap do |keys|
-        keys.append(:badges, :followers)
-        keys << :conversations if manageable_group?
       end
       items.map { |key| tab_item(key) }
     end
-
-    def extra_data
-      @extra_data ||= {}.tap do |v|
-        if current_user && user_group? && (count = profile_holder.unread_messages_count_for(current_user)).positive?
-          v[:conversations] = { count: }
-        end
-      end
-    end
-
-    def tab_items
-      user_group? ? group_tabs : user_tabs
-    end
-
-    def user_group?
-      profile_holder.is_a?(Decidim::UserGroup)
-    end
   end
 end

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

@@ -0,0 +1,2 @@
+<%= icon(icon_name, class: icon_classes) if icon_name.present? %>
+<%= content_tag(:span, text, class: text_classes) if text.present? %>