decidim-debates 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0e660cade68d4879a2306a45d4c92e1ecde26ce395d9204c458edfbe6b2eb3
-  data.tar.gz: b38cedcac769d7784d6e4c5377db06295e127809ca415bd5b352fc23740414f3
+  metadata.gz: 4c9f8e30d7afe437d9c28ed29d5463d37ceface72085d419c2bed216844de31c
+  data.tar.gz: 3d859fb0772f667b6e97452975f47f7c48b2b65dad47aef6e5a3d3ceb115e723
 SHA512:
-  metadata.gz: 2c25930cb2f056dbb1cd563040c5301d6eda3482fa601d31b93e9e59b55099b38d7c4bf404bd6fd216a79aa8a40cfcf87defd185a1e000743e9ff3a776c4bc1c
-  data.tar.gz: fea710a65d7b9abf6bbfbfb28f08f5b13c1dc93d993a97746f86abfaa078773d53f50e3a630685053cfc3273e959bac1bdf577c791cf059f09e0e794e97406f3
+  metadata.gz: e8d3efe88814c1aadfba5577fe7782e9182655dabc9ff21820618655c74550b4be101d5f66a8c832aec96d8a9d4c24c44c4181c5bc8241bad5380bf20698cd9e
+  data.tar.gz: 866ae0b62ca79ce2b3d83a3d79373b7465a17ab6585d2ba93ead57258232596fccd849cf907dcd448082fa99008522b6f02ccf75efbc30c4cedd96323c4584b8

data/app/cells/decidim/debates/debate_card_metadata_cell.rb

@@ -18,17 +18,48 @@ module Decidim
       end
 
       def debate_items
-        [duration, comments_count_item, endorsements_count_item] + taxonomy_items + [coauthors_item]
+        [label, duration, comments_count_item, likes_count_item] + taxonomy_items + [coauthors_item]
       end
 
       def duration
-        text = format_date_range(debate.start_time, debate.end_time) || t("open", scope: "decidim.debates.debates.show")
+        text = format_date_range(debate.start_time, debate.end_time)
+        return if text.blank?
 
         {
           text:,
           icon: "time-line"
         }
       end
+
+      # i18n-tasks-use t("decidim.debates.debates.show.ongoing")
+      # i18n-tasks-use t("decidim.debates.debates.show.not_started")
+      def label
+        {
+          text: content_tag("span", t(label_string, scope: "decidim.debates.debates.show"), class: "#{label_class} label")
+        }
+      end
+
+      def label_string
+        case debate.state
+        when :ongoing
+          "ongoing"
+        when :not_started
+          "not_started"
+        else
+          "closed"
+        end
+      end
+
+      def label_class
+        case debate.state
+        when :ongoing
+          "success"
+        when :not_started
+          "warning"
+        else
+          "alert"
+        end
+      end
     end
   end
 end

data/app/cells/decidim/debates/debate_l_cell.rb

@@ -20,7 +20,7 @@ module Decidim
         if model.official?
           Decidim::Core::OfficialAuthorPresenter.new
         else
-          model.normalized_author.presenter
+          model.author.presenter
         end
       end
 

data/app/commands/decidim/debates/admin/create_debate.rb

@@ -34,8 +34,8 @@ module Decidim
         def extra_params = { visibility: "all" }
 
         def attributes
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: form.current_organization).rewrite
           super.merge({
                         author: form.current_organization,
                         title: parsed_title,

data/app/commands/decidim/debates/admin/update_debate.rb

@@ -30,8 +30,8 @@ module Decidim
         private
 
         def attributes
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: form.current_organization).rewrite
 
           attrs = {
             title: parsed_title,

data/app/commands/decidim/debates/create_debate.rb

@@ -57,12 +57,11 @@ module Decidim
       end
 
       def attributes
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: form.current_organization).rewrite
 
         super.merge({
                       author: form.current_user,
-                      decidim_user_group_id: form.user_group_id,
                       title: { I18n.locale => parsed_title },
                       description: { I18n.locale => parsed_description },
                       component: form.current_component

data/app/commands/decidim/debates/update_debate.rb

@@ -46,8 +46,8 @@ module Decidim
       def extra_params = { visibility: "public-only" }
 
       def attributes
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: form.current_organization).rewrite
         super.merge({
                       title: { I18n.locale => parsed_title },
                       description: { I18n.locale => parsed_description }

data/app/controllers/decidim/debates/admin/debate_closes_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/debates/admin/debates_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -57,7 +57,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/debates/debates_controller.rb

@@ -35,7 +35,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -63,7 +63,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end
@@ -116,9 +116,9 @@ module Decidim
         {
           search_text_cont: "",
           with_any_origin: nil,
-          activity: %w(all),
+          activity: "all",
           with_any_taxonomies: nil,
-          with_any_state: %w(open closed)
+          with_any_state: "all"
         }
       end
 

data/app/forms/decidim/debates/debate_form.rb

@@ -11,7 +11,6 @@ module Decidim
 
       attribute :title, String
       attribute :description, String
-      attribute :user_group_id, Integer
       attribute :attachment, AttachmentForm
 
       attachments_attribute :documents
@@ -27,7 +26,6 @@ module Decidim
         # user locale is taken as the text locale.
         self.title = debate.title.values.first
         self.description = debate.description.values.first
-        self.user_group_id = debate.decidim_user_group_id
         self.documents = debate.attachments
       end
 

data/app/helpers/decidim/debates/application_helper.rb

@@ -8,7 +8,7 @@ module Decidim
       include PaginateHelper
       include Decidim::Comments::CommentsHelper
       include Decidim::RichTextEditorHelper
-      include Decidim::EndorsableHelper
+      include Decidim::LikeableHelper
       include Decidim::FollowableHelper
       include Decidim::CheckBoxesTreeHelper
       include Decidim::DateRangeHelper
@@ -44,7 +44,6 @@ module Decidim
       # its origin.
       def filter_origin_values
         origin_keys = %w(official participants)
-        origin_keys << "user_group" if current_organization.user_groups_enabled?
 
         origin_values = origin_keys.map { |key| [key, t(key, scope: "decidim.debates.debates.filters")] }
         origin_values.prepend(["", all_filter_text])
@@ -60,7 +59,7 @@ module Decidim
       # Returns a TreeNode to be used in the list filters to filter debates by
       # its state.
       def filter_debates_state_values
-        %w(open closed).map { |k| [k, t(k, scope: "decidim.debates.debates.filters.state_values")] }.prepend(
+        %w(ongoing closed).map { |k| [k, t(k, scope: "decidim.debates.debates.filters.state_values")] }.prepend(
           ["all", all_filter_text]
         )
       end
@@ -74,7 +73,7 @@ module Decidim
           items = [{
             method: :with_any_state,
             collection: filter_debates_state_values,
-            label: t("decidim.meetings.meetings.filters.date"),
+            label: t("decidim.debates.debates.filters.state"),
             id: "date",
             type: :radio_buttons
           }]

data/app/models/decidim/debates/debate.rb

@@ -25,7 +25,7 @@ module Decidim
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
-      include Decidim::Endorsable
+      include Decidim::Likeable
       include Decidim::Randomable
       include Decidim::FilterableResource
       include Decidim::SoftDeletable
@@ -47,7 +47,8 @@ module Decidim
 
       scope :updated_at_desc, -> { order(arel_table[:updated_at].desc) }
       scope :open, -> { where(closed_at: nil) }
-      scope :closed, -> { where.not(closed_at: nil) }
+      scope :closed, -> { where.not(closed_at: nil).or(where(end_time: ..Time.current)) }
+      scope :ongoing, -> { open.where(start_time: ..Time.current, end_time: Time.current..).or(open.where(start_time: nil, end_time: nil)) }
       scope :authored_by, ->(author) { where(author:) }
       scope :commented_by, lambda { |author|
         joins(:comments).where(
@@ -58,7 +59,7 @@ module Decidim
           }
         )
       }
-      scope_search_multi :with_any_state, [:open, :closed]
+      scope_search_multi :with_any_state, [:ongoing, :closed]
 
       # Returns the presenter for this debate, to be used in the views.
       # Required by ResourceRenderer.
@@ -98,23 +99,44 @@ module Decidim
         start_time.present? && end_time.present?
       end
 
-      # Public: Checks whether the debate is an AMA-styled one and is open.
+      # Public: Checks whether the debate is an AMA-styled one and is ongoing.
       #
       # Returns a boolean.
-      def open_ama?
+      def ongoing_ama?
         ama? && Time.current.between?(start_time, end_time)
       end
 
-      # Public: Checks if the debate is open or not.
+      # Public: Checks if the debate is ongoing or not.
       #
       # Returns a boolean.
-      def open?
-        (ama? && open_ama?) || !ama?
+      def ongoing?
+        (ama? && ongoing_ama?) || !ama?
+      end
+
+      def not_started?
+        start_time.present? && start_time > Time.current
+      end
+
+      # Note that a debate can be finished even if it is not closed (meaning it has no conclusions).
+      def finished?
+        end_time.present? && end_time < Time.current
+      end
+
+      def state
+        if closed?
+          :closed
+        elsif ongoing?
+          :ongoing
+        elsif not_started?
+          :not_started
+        else
+          :finished
+        end
       end
 
       # Public: Overrides the `accepts_new_comments?` CommentableWithComponent concern method.
       def accepts_new_comments?
-        return false unless open?
+        return false unless ongoing?
         return false if closed?
 
         commentable? && !comments_blocked? && comments_allowed?
@@ -202,7 +224,7 @@ module Decidim
 
         update_columns(
           last_comment_at: last_comment&.created_at,
-          last_comment_by_id: last_comment&.decidim_user_group_id || last_comment&.decidim_author_id,
+          last_comment_by_id: last_comment&.decidim_author_id,
           last_comment_by_type: last_comment&.decidim_author_type,
           comments_count:,
           updated_at: Time.current

data/app/packs/src/decidim/debates/admin/debates.js

@@ -1,7 +1,7 @@
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
-$(() => {
-  const $debateType = $('[name="debate[finite]"');
+document.addEventListener("turbo:load", () => {
+  const $debateType = $('[name="debate[finite]"]');
 
   createFieldDependentInputs({
     controllerField: $debateType,

data/app/permissions/decidim/debates/permissions.rb

@@ -19,8 +19,8 @@ module Decidim
           allow!
         when :edit
           can_edit_debate?
-        when :endorse
-          can_endorse_debate?
+        when :like
+          can_like_debate?
         when :close
           can_close_debate?
         end
@@ -47,7 +47,7 @@ module Decidim
         disallow!
       end
 
-      def can_endorse_debate?
+      def can_like_debate?
         return disallow! if debate.closed?
 
         allow!

data/app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb

@@ -10,7 +10,7 @@ module Decidim
           def present
             return unless value
 
-            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.decidim_escape_translated(value))
+            renderer = Decidim::ContentRenderers::BlobRenderer.new(h.decidim_escape_translated(value))
             renderer.render(links: false).html_safe
           end
         end

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -18,23 +18,21 @@ module Decidim
       def author
         @author ||= if official?
                       Decidim::Debates::OfficialAuthorPresenter.new
-                    elsif user_group
-                      Decidim::UserGroupPresenter.new(user_group)
                     else
                       Decidim::UserPresenter.new(super)
                     end
       end
 
-      def title(links: false, all_locales: false, html_escape: false)
+      def title(html_escape: false, all_locales: false)
         return unless debate
 
-        super(debate.title, links, html_escape, all_locales)
+        super(debate.title, html_escape, all_locales)
       end
 
-      def description(strip_tags: false, extras: true, links: false, all_locales: false)
+      def description(links: false, strip_tags: false, all_locales: false)
         return unless debate
 
-        content_handle_locale(debate.description, all_locales, extras, links, strip_tags)
+        content_handle_locale(debate.description, all_locales, links, strip_tags)
       end
 
       def last_comment_at
@@ -49,20 +47,14 @@ module Decidim
 
       def participants_count
         comments_authors.count do |author|
-          author.is_a?(Decidim::User)
-        end
-      end
-
-      def groups_count
-        comments_authors.count do |author|
-          author.is_a?(Decidim::UserGroup)
+          author.is_a?(Decidim::User) && !author.group?
         end
       end
 
       private
 
       def comments_authors
-        @comments_authors ||= debate.comments.includes(:author, :user_group).map(&:normalized_author).uniq
+        @comments_authors ||= debate.comments.includes(:author).map(&:author).uniq
       end
     end
   end

data/app/views/decidim/debates/admin/debate_closes/edit.html.erb

@@ -12,7 +12,7 @@
 
           <div class="card-section">
             <div class="row column">
-              <%= f.translated :editor, :conclusions, autofocus: true, rows: 15 %>
+              <%= f.translated :editor, :conclusions, autofocus: true, rows: 15, data: { controller: "character-counter" } %>
             </div>
           </div>
         </div>

data/app/views/decidim/debates/admin/debates/_actions.html.erb

@@ -1,27 +1,71 @@
-<% if view == :deleted %>
-  <% if allowed_to? :restore, :debate, trashable_deleted_resource: debate %>
-    <%= icon_link_to "refresh-line", url_for(action: :restore, id: debate, controller: "debates"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
-  <% end %>
-<% else %>
-  <% if allowed_to? :update, :debate, debate: debate %>
-    <%= icon_link_to "pencil-line", edit_debate_path(debate), t("actions.edit", scope: "decidim.debates"), class: "action-icon--edit" %>
-  <% else %>
-    <span class="action-space icon"></span>
-  <% end %>
-
-  <% if allowed_to? :close, :debate, debate: debate %>
-    <%= icon_link_to "lock-line" , edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), t("actions.close", scope: "decidim.debates"), class: "action-icon--close" %>
-  <% else %>
-    <span class="action-space icon"></span>
-  <% end %>
-
-  <%= icon_link_to "eye-line", resource_locator(debate).path, t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-  <%= resource_permissions_link(debate) %>
-
-  <% if allowed_to? :soft_delete, :debate, trashable_deleted_resource: debate %>
-    <%= icon_link_to "delete-bin-line", soft_delete_debate_path(debate), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_debate", scope: "decidim.debates") } %>
-  <% else %>
-    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
-  <% end %>
-<% end %>
+<button type="button" data-controller="dropdown" data-target="actions-post-<%= debate.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: debate.title) %>">
+  <%= icon "more-fill", class: "text-secondary" %>
+</button>
+
+<div class="inline-block relative">
+  <ul id="actions-post-<%= debate.id %>" class="dropdown dropdown__action" aria-hidden="true">
+    <% if view == :deleted %>
+      <% if allowed_to? :restore, :debate, trashable_deleted_resource: debate %>
+        <li class="dropdown__item">
+          <%= link_to url_for(action: :restore, id: debate, controller: "debates"), method: :patch, class: "dropdown__button" do %>
+            <%= icon "refresh-line" %>
+            <%= t("decidim.admin.actions.restore") %>
+          <% end %>
+        </li>
+      <% end %>
+    <% else %>
+      <% if allowed_to? :update, :debate, debate: debate %>
+        <li class="dropdown__item">
+          <%= link_to edit_debate_path(debate), class: "dropdown__button" do %>
+            <%= icon "pencil-line" %>
+            <%= t("actions.edit", scope: "decidim.debates") %>
+          <% end %>
+        </li>
+      <% end %>
+
+      <% if allowed_to? :close, :debate, debate: debate %>
+        <li class="dropdown__item">
+          <%= link_to edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "dropdown__button" do %>
+            <%= icon "lock-line" %>
+            <%= t("actions.close", scope: "decidim.debates") %>
+          <% end %>
+        </li>
+
+        <hr>
+      <% end %>
+
+      <li class="dropdown__item">
+        <%= link_to resource_locator(debate).path, target: :blank, data: { "external-link": false }, class: "dropdown__button" do %>
+          <%= icon "eye-line" %>
+          <%= t("actions.preview", scope: "decidim.admin") %>
+        <% end %>
+      </li>
+
+      <hr>
+
+      <li class="dropdown__item">
+        <%= dropdown_resource_permissions_link(debate) %>
+      </li>
+
+      <hr>
+
+      <li class="dropdown__item">
+        <% if allowed_to? :soft_delete, :debate, trashable_deleted_resource: debate %>
+          <%= link_to soft_delete_debate_path(debate), method: :patch, data: { confirm: t("actions.confirm_delete_debate", scope: "decidim.debates") }, class: "dropdown__button" do %>
+            <%= icon "delete-bin-line" %>
+            <%= t("actions.soft_delete", scope: "decidim.admin") %>
+          <% end %>
+        <% else %>
+          <div class="dropdown__button-disabled">
+            <%= with_tooltip t("tooltips.deleted_debates_info", scope: "decidim.admin") do %>
+              <%= icon "delete-bin-line", class: "text-gray" %>
+              <span>
+                <%= t("actions.soft_delete", scope: "decidim.admin") %>
+              </span>
+            <% end %>
+          </div>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/decidim/debates/admin/debates/_debate-tr.html.erb

@@ -1,25 +1,25 @@
 <tr data-id="<%= debate.id %>">
-  <td>
+  <td data-label="<%= t("models.debate.fields.title", scope: "decidim.debates") %>">
     <% if allowed_to? :update, :debate, debate: debate %>
       <%= link_to present(debate).title(html_escape: true), edit_debate_path(debate) %>
     <% else %>
       <%= present(debate).title(html_escape: true) %><br>
     <% end %>
   </td>
-  <td>
+  <td data-label="<%= t("models.debate.fields.start_time", scope: "decidim.debates") %>">
     <% if debate.start_time %>
       <%= l debate.start_time, format: :long %>
     <% end %>
   </td>
-  <td>
+  <td data-label="<%= t("models.debate.fields.end_time", scope: "decidim.debates") %>">
     <% if debate.end_time %>
       <%= l debate.end_time, format: :long %>
     <% end %>
   </td>
-  <td>
+  <td data-label="<%= t("models.debate.fields.taxonomies", scope: "decidim.debates") %>">
     <%= debate.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", ") %>
   </td>
-  <td class="table-list__actions">
+  <td class="table-list__actions" data-label="<%= t("actions.title", scope: "decidim.debates") %>">
     <%= render partial: "decidim/debates/admin/debates/actions", locals: { debate:, view: } %>
   </td>
 </tr>

data/app/views/decidim/debates/admin/debates/_form.html.erb

@@ -2,11 +2,11 @@
   <div class="card pt-4">
     <div class="card-section debate-fields">
        <div class="row column">
-        <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
 
        <div class="row column">
-        <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
+        <%= form.translated :editor, :description, resource_mentionable: true, aria: { label: :description } %>
       </div>
 
       <div class="row column">

data/app/views/decidim/debates/admin/debates/index.html.erb

@@ -1,14 +1,17 @@
 <% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <%= export_dropdown if allowed_to? :export, :debates %>
-      <%= link_to t("actions.new", scope: "decidim.debates"), new_debate_path, class: "button button__sm button__secondary" if allowed_to? :create, :debate %>
-      <%= render partial: "decidim/admin/components/resource_action" %>
+      <div class="flex align-middle gap-x-4 ml-auto">
+        <%= export_dropdown if allowed_to? :export, :debates %>
+        <%= link_to t("actions.new", scope: "decidim.debates"), new_debate_path, class: "button button__sm button__secondary" if allowed_to? :create, :debate %>
+        <%= render partial: "decidim/admin/components/resource_action" %>
+      </div>
     </h1>
   </div>
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <%= render partial: "debates-thead" %>
       <tbody>
@@ -21,7 +24,7 @@
   </div>
   <% if allowed_to? :manage_trash, :debate, participatory_space: current_participatory_space %>
     <div class="card mt-4">
-      <%= link_to manage_trash_debates_path, class: "flex items-center underline text-secondary" do %>
+      <%= link_to manage_trash_debates_path, class: "flex items-center  text-secondary" do %>
         <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
         <%= t("actions.view_deleted_debates", scope: "decidim.debates") %>
         <span class="ml-2">

data/app/views/decidim/debates/admin/debates/manage_trash.html.erb

@@ -1,11 +1,12 @@
 <% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
     </h1>
   </div>
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <%= render partial: "debates-thead" %>
       <tbody>

data/app/views/decidim/debates/debates/_close_debate_modal.html.erb

@@ -8,7 +8,7 @@
       <div class="my-8" id="dialog-desc-close-debate">
         <p><%= t("description", scope: "decidim.debates.debates.close_debate_modal") %></p>
         <div class="form__wrapper">
-          <%= f.text_area :conclusions, rows: 10 %>
+          <%= f.text_area :conclusions, rows: 10, data: { controller: "character-counter" } %>
         </div>
       </div>
     </div>