decidim-proposals 0.29.1 → 0.30.0.rc1

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -13,9 +13,9 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = quantity[key] || 0
-            category_id, space_type, space_id = key
+            taxonomy_id, space_type, space_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           organization: @organization, decidim_category_id: category_id,
+                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
             record.save!
@@ -31,16 +31,16 @@ module Decidim
             manifest.participatory_spaces.call(@organization)
           end
           @query = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).joins(:component)
-                                               .left_outer_joins(:category)
-          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).not_withdrawn.not_hidden
-          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                               .left_outer_joins(:taxonomizations)
+          @query = @query.where(decidim_proposals_proposals: { published_at: ..end_time }).not_withdrawn.not_hidden
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_proposals_proposals.published_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_proposals_proposals: { published_at: start_time.. }).count
         end
       end
     end

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -13,9 +13,9 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = quantity[key] || 0
-            category_id, space_type, space_id, proposal_id = key
+            taxonomy_id, space_type, space_id, proposal_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           organization: @organization, decidim_category_id: category_id,
+                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
@@ -33,10 +33,10 @@ module Decidim
           end
           proposal_ids = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).not_withdrawn.not_hidden.pluck(:id)
           @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
-                                                   .left_outer_joins(proposal: :category)
+                                                   .left_outer_joins(proposal: :taxonomizations)
                                                    .where(proposal: proposal_ids)
-          @query = @query.where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
-          @query = @query.group("decidim_categorizations.id",
+          @query = @query.where(decidim_proposals_proposal_votes: { created_at: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id,
                                 :decidim_proposal_id)
@@ -44,7 +44,7 @@ module Decidim
         end
 
         def quantity
-          @quantity ||= query.where("decidim_proposals_proposal_votes.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_proposals_proposal_votes: { created_at: start_time.. }).count
         end
       end
     end

data/app/services/decidim/proposals/collaborative_draft_diff_renderer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CollaborativeDraftDiffRenderer < DiffRenderer
+      private
+
+      def attribute_types
+        {
+          title: :string,
+          body: :string,
+          decidim_category_id: :category,
+          decidim_scope_id: :scope,
+          address: :string,
+          latitude: :string,
+          longitude: :string,
+          decidim_proposals_proposal_state_id: :string
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/diff_renderer.rb

@@ -21,8 +21,10 @@ module Decidim
 
       # Parses the values before parsing the changeset.
       def parse_changeset(attribute, values, type, diff)
+        return parse_i18n_changeset(attribute, values, type, diff) if [:i18n, :i18n_html].include?(type)
         return parse_scope_changeset(attribute, values, type, diff) if type == :scope
         return parse_state_changeset(attribute, values, type, diff) if type == :state
+        return parse_user_group_changeset(attribute, values, type, diff) if type == :user_group
 
         values = parse_values(attribute, values)
         old_value = values[0]

data/app/services/decidim/proposals/proposal_builder.rb

@@ -74,7 +74,7 @@ module Decidim
           "proposal_notes_count",
           "proposal_votes_count"
         ).merge(
-          "category" => original_proposal.category
+          "taxonomies" => original_proposal.taxonomies
         ).merge(
           extra_attributes
         )
@@ -117,7 +117,7 @@ module Decidim
           if attachment.file.attached?
             new_attachment.file = attachment.file.blob
           else
-            new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file).url(host: original_proposal.organization.host)
+            new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file).url
           end
 
           new_attachment.save!

data/app/views/decidim/proposals/admin/proposal_notes/_form.html.erb

@@ -1,7 +1,7 @@
-<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form form-defaults new_proposal_note" }) do |f| %>
+<%= decidim_form_for(@notes_form, url: form_path, html: { class: "form form-defaults new_proposal_note flex flex-col mt-4" }) do |f| %>
   <div class="form__wrapper">
-    <%= f.text_area :body, rows: 4, label: t(".note"), class: "rounded border border-text-gray-2 mt-2" %>
+    <%= f.text_area :body, rows: 4, label: t(".note"), class: "js-mentions" %>
   </div>
 
-  <%= f.submit t(".submit"), class: "button button__sm button__secondary" %>
+  <%= f.submit t(".submit"), class: "button button__sm button__secondary ml-auto" %>
 <% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_note.html.erb

@@ -0,0 +1,28 @@
+<% reply_id = "note#{proposal_note.id}-reply" %>
+
+<div class="comment">
+  <div class="comment__header">
+    <%= cell "decidim/author", present(proposal_note.author), from: proposal_note, context_actions: [:date], tooltip: false, show_icons: false %>
+  </div>
+
+  <div class="comment__content">
+    <%= simple_format proposal_note.formatted_body %>
+  </div>
+
+  <div class="comment-actions">
+    <button class="button button__sm button__text-secondary" data-controls="panel-<%= reply_id %>" id="panel-<%= reply_id %>-trigger">
+      <%= icon "chat-1-line" %>
+      <span class="font-normal"><%= t("decidim.components.comment.reply") %></span>
+      <%= icon "close-circle-line" %>
+      <span class="font-normal"><%= t("decidim.components.comment.cancel_reply") %></span>
+    </button>
+  </div>
+
+  <div class="mt-6 space-y-2">
+    <%= render partial: "decidim/proposals/admin/proposal_notes/proposal_note_reply", collection: proposal_note.replies %>
+  </div>
+
+  <div id="panel-<%= reply_id %>" class="add-comment" data-additional-reply>
+    <%= render partial: "decidim/proposals/admin/proposal_notes/form", locals: { form_path: reply_proposal_proposal_note_path(proposal, proposal_note, @notes_form) } %>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_note_reply.html.erb

@@ -0,0 +1,9 @@
+<div class="comment-reply">
+  <div class="comment__header">
+    <%= cell "decidim/author", present(proposal_note_reply.author), from: proposal_note_reply, context_actions: [:date], tooltip: false, show_icons: false %>
+  </div>
+
+  <div class="comment__content">
+    <%= simple_format proposal_note_reply.formatted_body %>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -1,37 +1,13 @@
 <div class="component__show_notes" data-component="accordion" id="accordion-notes">
-  <button class="card-divider-button" data-controls="panel-notes" type="button">
+  <button type="button" class="card-divider-button" data-controls="panel-notes">
     <%= icon "arrow-right-s-line" %>
     <h2 class="card-title">
       <%= t("title", scope: "decidim.proposals.admin.proposal_notes") %>
     </h2>
   </button>
+
   <div id="panel-notes">
-    <div class="component__show_notes-grid">
-      <% proposal.notes.each do |note| %>
-        <div class="comment">
-          <div class="comment__header">
-            <div>
-              <div>
-                <div class="author">
-                  <strong><span class="author__name"><%= note.author.name %></span></strong>
-                  <span><%= l note.created_at, format: :decidim_short %></span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="comment__content">
-            <%= simple_format note.body %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-    <div class="card add-comment">
-      <div class="card-divider">
-        <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
-      </div>
-      <div class="card-section">
-        <%= render "decidim/proposals/admin/proposal_notes/form" %>
-      </div>
-    </div>
+    <%= render partial: "decidim/proposals/admin/proposal_notes/proposal_note", collection: proposal.notes.not_reply %>
+    <%= render partial: "decidim/proposals/admin/proposal_notes/form", locals: { form_path: proposal_proposal_notes_path(proposal, @notes_form) } %>
   </div>
 </div>

data/app/views/decidim/proposals/admin/proposal_states/_form.html.erb

@@ -52,7 +52,7 @@
           </strong>
         </div>
 
-        <div class="flash flex-col " style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color}; border-color: #{form.object.text_color} / var(--tw-border-opacity);" %>" data-announcement-preview>
+        <div class="flash flex-col" style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color}; border-color: #{form.object.text_color} / var(--tw-border-opacity);" %>" data-announcement-preview>
           <div class="flash__title">
             <%= decidim_escape_translated(form.object.announcement_title).presence || t(".preview") %>
           </div>

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

@@ -0,0 +1,21 @@
+<% if view == :deleted %>
+  <%= icon_link_to "refresh-line", restore_proposal_path(proposal), t("actions.restore", scope: "decidim.admin"), method: :patch, class: "action-icon--restore" %>
+  <% else %>
+  <% if allowed_to? :edit, :proposal, proposal: proposal %>
+    <%= icon_link_to "pencil-line", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <%= icon_with_link_to_proposal(proposal) %>
+
+  <%= icon_link_to "eye-line", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <%= resource_permissions_link(proposal) %>
+
+  <% if allowed_to?(:soft_delete, :proposal, trashable_deleted_resource: proposal) %>
+    <%= icon_link_to "delete-bin-line", soft_delete_proposal_path(proposal), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_proposal", scope: "decidim.proposals.admin") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -30,8 +30,9 @@
   <% end %>
 </div>
 
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>
+<% if templates_available? %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/apply_answer_template", locals: { templates: find_templates_for_select(current_component) } %>
+<% end %>

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

@@ -47,32 +47,25 @@
           <%= form.geocoding_field :address %>
         </div>
       <% end %>
-      <% if @form.categories&.any? %>
-        <div class="row column">
-          <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
-        </div>
-      <% end %>
-      <% if current_component.has_subscopes? %>
-        <div class="row column">
-          <%= scopes_select_field form, :scope_id, root: current_component.scope %>
-        </div>
-      <% end %>
-      <% if component_settings.attachments_allowed? %>
-        <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+
+      <% if @form.taxonomy_filters&.any? %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
       <% end %>
+
       <% if component_settings.attachments_allowed? %>
         <div class="row column">
-          <legend><%= t(".attachment_legend") %></legend>
-          <%= form.fields_for :attachment, @form.attachment do |form| %>
-            <%= form.text_field :title %>
-            <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
-            <% if params[:id].present? %>
-              <% if proposal.documents.present? %>
-                <%= form.hidden_field :id, value: proposal.documents.first.id %>
-                <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
-              <% end %>
-            <% end %>
-          <% end %>
+          <%= form.attachment :documents,
+                              multiple: true,
+                              label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_edit_label: t("decidim.proposals.proposals.edit.edit_attachments"),
+                              button_class: "button button__lg button__transparent-secondary w-full",
+                              help_i18n_scope: "decidim.forms.file_help.file",
+                              help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
         </div>
       <% end %>
     </div>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -1,4 +1,6 @@
-<tr data-id="<%= proposal.id %>" <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
+<tr data-id="<%= proposal.id %>"
+    data-allow-answer="<%= allowed_to?(:create, :proposal_answer, proposal:) && !proposal.emendation? %>"
+    <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
   <td>
     <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
   </td>
@@ -6,24 +8,16 @@
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
       <%= link_to present(proposal).title(html_escape: true), proposal_path(proposal) %><br>
     <% else %>
-      <%= present(proposal).title(html_escape: true) %><br>
+      <span class="text-md">
+        <%= present(proposal).title(html_escape: true) %><br>
+      </span>
     <% end %>
-    <div class="flex items-center gap-x-1 mt-2">
-      <% if proposal.category %>
-        <%= icon "price-tag-3-line", class: "fill-gray w-4 h-4" %>
-        <%= translated_attribute proposal.category.name %>
-      <% end %>
-      <div class="flex items-center gap-x-1">
-        <%= icon "scan-line", class: "fill-gray w-4 h-4" %>
-        <span>
-          <% if proposal.scope %>
-             <%= translated_attribute proposal.scope.name %>
-          <% else %>
-             <%= t("decidim.scopes.global") %>
-          <% end %>
-        </span>
+    <% proposal.taxonomies.each do |taxonomy| %>
+      <div class="flex items-center gap-x-1 mt-1 text-xs">
+        <%= icon "price-tag-3-line", class: "fill-gray w-3 h-3" %>
+        <%= translated_attribute taxonomy.name %>
       </div>
-    </div>
+    <% end %>
   </td>
   <td class="table-list__date">
     <%= l proposal.published_at, format: :decidim_short %>
@@ -67,16 +61,6 @@
   </td>
 
   <td class="table-list__actions">
-    <% if allowed_to? :edit, :proposal, proposal: proposal %>
-      <%= icon_link_to "pencil-line", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
-    <% else %>
-      <span class="action-space icon"></span>
-    <% end %>
-
-    <%= icon_with_link_to_proposal(proposal) %>
-
-    <%= icon_link_to "eye-line", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-    <%= resource_permissions_link(proposal) %>
+    <%= render partial: "decidim/proposals/admin/proposals/actions", locals: { proposal:, view: } %>
   </td>
 </tr>

data/app/views/decidim/proposals/admin/proposals/_proposals-thead.html.erb

@@ -0,0 +1,45 @@
+<thead>
+<tr>
+  <th>
+    <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
+  </th>
+  <th class="!text-left">
+    <%= sort_link(query, :translated_title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+  </th>
+  <th>
+    <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
+  </th>
+
+  <% unless current_settings.publish_answers_immediately? %>
+    <th>
+      <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <% if current_settings.votes_enabled? %>
+    <th>
+      <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
+    <th>
+      <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <th>
+    <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+  </th>
+
+  <th>
+    <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+  </th>
+
+  <th>
+    <%= t("models.proposal.fields.state", scope: "decidim.proposals") %>
+  </th>
+
+  <th><%= t("actions.title", scope: "decidim.proposals") %></th>
+</tr>
+</thead>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_apply_answer_template.html.erb

@@ -0,0 +1,22 @@
+<div id="js-apply-answer-template-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_multiple_answers_proposals_path, method: :post, id: "js-form-apply-answer-template", class: "form form-defaults flex items-center gap-x-2") do %>
+    <div class="hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+    <%= hidden_field_tag :template_id %>
+
+    <%= bulk_templates_select(
+          current_component,
+          templates.present? ?
+            t("apply_answer_template", scope: "decidim.proposals.admin.proposals.index") :
+            t("no_templates_available", scope: "decidim.proposals.admin.proposals.index"),
+          id: "template_id_select"
+        ) %>
+
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.update"), id: "js-submit-apply-answer-template", class: "button button__sm button__secondary small button--simple float-left") %>
+
+    <button id="js-cancel-apply-answer-template" class="button button__sm button__secondary button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+  <% end %>
+</div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -10,23 +10,20 @@
 
   <div
     id="js-bulk-actions-dropdown"
-    class="dropdown-pane"
+    class="dropdown-pane dropdown-pane--buttons"
     data-position="bottom"
     data-alignment="right"
     data-dropdown="dropdown"
     data-auto-focus="false"
     data-events="resize">
     <ul>
-      <li>
-        <button type="button" data-action="recategorize-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.change_category") %>
-        </button>
-      </li>
-      <li>
-        <button type="button" data-action="scope-change-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.change_scope") %>
-        </button>
-      </li>
+      <% if current_component_taxonomy_filters&.any? %>
+        <li>
+          <button type="button" data-action="taxonomy-change-proposals">
+            <%= t("decidim.proposals.admin.proposals.index.change_taxonomies") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="merge-proposals">
           <%= t("decidim.proposals.admin.proposals.index.merge") %>
@@ -49,6 +46,13 @@
           </button>
         </li>
       <% end %>
+      <% if templates_available? %>
+        <li>
+          <button type="button" data-action="apply-answer-template">
+            <%= t("decidim.proposals.admin.proposals.index.apply_answer_template") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="publish-answers">
           <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_taxonomy_change.html.erb

@@ -0,0 +1,23 @@
+<div id="js-taxonomy-change-proposals-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(update_taxonomies_proposals_path, method: :post, id: "js-form-taxonomy-change-proposals", class: "form form-defaults w-full") do %>
+    <div class="hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+
+    <% current_component_taxonomy_filters.each do |filter| %>
+        <div class="row column">
+        <label class="w-full font-semibold block mb-4" for="taxonomies_for_filter_<%= filter.id %>">
+            <%= decidim_sanitize_translated(filter.name) %>
+            <%= select_tag "taxonomies[]", options_for_select(taxonomy_items_options_for_filter(filter)), include_blank: I18n.t("decidim.taxonomies.prompt"), class: "w-full mt-2", id: "taxonomies_for_filter_#{filter.id}" %>
+        </label>
+        </div>
+    <% end %>
+
+    <div class="flex justify-end gap-x-4 mt-4">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.change_taxonomies"), id: "js-submit-taxonomy-change-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
+      <button class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    </div>
+  <% end %>
+</div>

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

@@ -13,64 +13,33 @@
       </div>
     </h1>
 
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/taxonomy_change" %>
     <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
     <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
   </div>
   <%= admin_filter_selector(filter_prefix_key) %>
   <div class="table-scroll mt-8">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th>
-            <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
-          </th>
-          <th class="!text-left">
-            <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
-          </th>
-          <th>
-            <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
-          </th>
-
-          <% unless current_settings.publish_answers_immediately? %>
-            <th>
-              <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <% if current_settings.votes_enabled? %>
-            <th>
-              <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
-            <th>
-              <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <th>
-            <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
-          </th>
-
-          <th>
-            <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
-          </th>
-
-          <th>
-            <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
-          </th>
-
-          <th><%= t("actions.title", scope: "decidim.proposals") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "proposals-thead" %>
       <tbody>
-        <% proposals.each do |proposal| %>
-          <%= render partial: "proposal-tr", locals: { proposal: } %>
-        <% end %>
+        <%= render partial: "decidim/proposals/admin/proposals/proposal-tr",
+                   collection: proposals,
+                   as: :proposal,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+  <% if allowed_to? :manage_trash, :proposal, participatory_space: current_participatory_space %>
+    <div class="card mt-4">
+      <%= link_to manage_trash_proposals_path, class: "flex items-center underline text-secondary" do %>
+        <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
+        <%= t("actions.view_deleted_proposals", scope: "decidim.proposals.admin") %>
+        <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_proposals_info", scope: "decidim.proposals.admin")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 
 <%= decidim_paginate proposals %>

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

@@ -0,0 +1,18 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header item_show__header--with-action-options">
+    <h1 class="item_show__header-title"><%= t(".title") %></h1>
+  </div>
+  <%= admin_filter_selector(filter_prefix_key) %>
+    <div class="table-scroll mt-8">
+      <table class="table-list">
+        <%= render partial: "proposals-thead" %>
+        <tbody>
+          <%= render partial: "decidim/proposals/admin/proposals/proposal-tr",
+                     collection: trashable_deleted_collection,
+                     as: :proposal,
+                     locals: { view: :deleted } %>
+        </tbody>
+      </table>
+    </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -2,7 +2,7 @@ $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), lo
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")
-    .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id) }) %>");
+    .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id), view: :index }) %>");
 <% end %>
 
 $(".js-check-all").prop('checked', false);