decidim-meetings 0.29.1 → 0.30.0.rc1

data/app/queries/decidim/meetings/metrics/meeting_followers_metric_measure.rb

@@ -14,10 +14,10 @@ module Decidim
           meetings = Decidim::Meetings::Meeting.where(component: @resource).joins(:component)
 
           meetings_followers = Decidim::Follow.where(followable: meetings).joins(:user)
-                                              .where("decidim_follows.created_at <= ?", end_time)
+                                              .where(decidim_follows: { created_at: ..end_time })
           cumulative_users = meetings_followers.pluck(:decidim_user_id)
 
-          meetings_followers = meetings_followers.where("decidim_follows.created_at >= ?", start_time)
+          meetings_followers = meetings_followers.where(decidim_follows: { created_at: start_time.. })
           quantity_users = meetings_followers.pluck(:decidim_user_id)
 
           {

data/app/queries/decidim/meetings/metrics/meetings_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).public_spaces
           end
           @query = Decidim::Meetings::Meeting.where(component: visible_components_from_spaces(spaces)).joins(:component)
-                                             .left_outer_joins(:category).visible
-          @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
-          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                             .left_outer_joins(:taxonomizations).visible
+          @query = @query.where(decidim_meetings_meetings: { created_at: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_meetings_meetings.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_meetings_meetings: { created_at: start_time.. }).count
         end
       end
     end

data/app/serializers/decidim/meetings/base_download_your_data_serializer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class BaseDownloadYourDataSerializer < Decidim::Exporters::Serializer
+      # This is the Base class for Invite and Registrations models for the download your data feature
+      def serialize
+        {
+          id: resource.id,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          meeting: {
+            title: resource.meeting.title,
+            url: Decidim::ResourceLocatorPresenter.new(resource.meeting).url,
+            description: resource.meeting.description,
+            start_time: resource.meeting.start_time,
+            end_time: resource.meeting.end_time,
+            address: resource.meeting.address,
+            location: resource.meeting.location,
+            location_hints: resource.meeting.location_hints,
+            reference: resource.meeting.reference,
+            attendees_count: resource.meeting.attendees_count,
+            attending_organizations: resource.meeting.attending_organizations,
+            closed_at: resource.meeting.closed_at,
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
+          }
+        }
+      end
+    end
+  end
+end

data/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb

@@ -2,34 +2,14 @@
 
 module Decidim
   module Meetings
-    class DownloadYourDataInviteSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataInviteSerializer < BaseDownloadYourDataSerializer
       # Serializes an invite for download your data
       def serialize
-        {
-          id: resource.id,
-          sent_at: resource.sent_at,
-          accepted_at: resource.accepted_at,
-          rejected_at: resource.rejected_at,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
-          meeting: {
-            title: resource.meeting.title,
-            description: resource.meeting.description,
-            start_time: resource.meeting.start_time,
-            end_time: resource.meeting.end_time,
-            address: resource.meeting.address,
-            location: resource.meeting.location,
-            location_hints: resource.meeting.location_hints,
-            reference: resource.meeting.reference,
-            attendees_count: resource.meeting.attendees_count,
-            attending_organizations: resource.meeting.attending_organizations,
-            closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report,
-            published_at: resource.meeting.published_at
-          }
-        }
+        super.merge({
+                      sent_at: resource.sent_at,
+                      accepted_at: resource.accepted_at,
+                      rejected_at: resource.rejected_at
+                    })
       end
     end
   end

data/app/serializers/decidim/meetings/download_your_data_meeting_serializer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class DownloadYourDataMeetingSerializer < Decidim::Meetings::MeetingSerializer
+      # Serializes a Meeting for download your data feature
+      #
+      # Remove the author information as it is the same of the user that
+      # requested the data
+      def serialize
+        super.except!(:author)
+      end
+    end
+  end
+end

data/app/serializers/decidim/meetings/download_your_data_registration_serializer.rb

@@ -2,32 +2,14 @@
 
 module Decidim
   module Meetings
-    class DownloadYourDataRegistrationSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataRegistrationSerializer < BaseDownloadYourDataSerializer
       # Serializes a registration for download your data
       def serialize
-        {
-          id: resource.id,
-          code: resource.code,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
-          meeting: {
-            title: resource.meeting.title,
-            description: resource.meeting.description,
-            start_time: resource.meeting.start_time,
-            end_time: resource.meeting.end_time,
-            address: resource.meeting.address,
-            location: resource.meeting.location,
-            location_hints: resource.meeting.location_hints,
-            reference: resource.meeting.reference,
-            attendees_count: resource.meeting.attendees_count,
-            attending_organizations: resource.meeting.attending_organizations,
-            closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report,
-            published_at: resource.meeting.published_at
-          }
-        }
+        super.merge({
+                      code: resource.code,
+                      validated_at: resource.validated_at,
+                      public_participation: resource.public_participation
+                    })
       end
     end
   end

data/app/views/decidim/meetings/admin/meetings/_component.html.erb

@@ -0,0 +1,15 @@
+<tr>
+  <td class="title">
+    <span class="js-component-title text-md">
+      <%= link_to component.hierarchy_title, main_component_path(component) if component %>
+    </span>
+    <%= hidden_field_tag "meeting[component_ids][]", component&.id %>
+  </td>
+  <td>
+    <%= with_tooltip(t(".unlink"), class: :top) do %>
+      <button type="button" class="js-remove-component cursor text-secondary text-md font-semibold">
+        <%= icon "unlink" %>
+      </button>
+    <% end %>
+  </td>
+</tr>

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

@@ -59,17 +59,14 @@
           <%= form.datetime_field :end_time %>
         </div>
       </div>
-      <div class="row">
-        <% if current_component.has_subscopes? %>
-          <div class="columns">
-            <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
+
+      <% 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 %>
-
-        <div class="columns">
-          <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
-        </div>
-      </div>
+      <% end %>
 
       <div class="row column">
         <%= form.select :registration_type,
@@ -95,6 +92,7 @@
     </div>
   </div>
   <%= render "decidim/meetings/admin/meetings/services", form: , id: tabs_id_for_service(blank_service) %>
+  <%= render "decidim/meetings/admin/meetings/linked_spaces", form: %>
 </div>
 
 <%= append_javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meetings/_linked_spaces.html.erb

@@ -0,0 +1,53 @@
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+
+<div class="card" data-component="accordion" id="accordion-linked-spaces">
+  <div class="card-divider">
+    <button class="card-divider-button" data-open="false" data-controls="panel-linked-spaces" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="linked-spaces"><%= t(".title") %></h2>
+    </button>
+  </div>
+
+  <div id="panel-linked-spaces" class="px-4">
+    <% if form.object.private_non_transparent_space? %>
+      <%= cell("decidim/announcement", t(".private_space_warning"), callout_class: "warning") %>
+    <% else %>
+      <%= cell("decidim/announcement", t(".private_meeting_warning"), callout_class: "warning js-private-warning hidden") %>
+
+      <div>
+        <label>
+          <%= t(".link_a_space") %>
+        </label>
+        <div>
+          <select id="add_component_select" name="add_component_select" placeholder="<%= t(".select") %>" class="w-full mt-2">
+            <option value=""><%= t(".select") %></option>
+            <%= find_meeting_components_for_select.map do |option| %>
+              <option value="<%= option[1] %>"><%= option[0] %></option>
+            <% end %>
+          </select>
+          <button class="button button__sm button__secondary add-service mt-2 js-add-component mb-8" type="button">
+            <%= t(".assign") %>
+          </button>
+        </div>
+      </div>
+    <% end %>
+
+    <template id="meeting_component_template">
+      <%= render "decidim/meetings/admin/meetings/component", component: nil %>
+    </template>
+
+    <table class="table-list w-full js-components <%= form.object.components.empty? && "hidden" %>">
+      <thead>
+        <tr>
+          <th><%= t(".table.component") %></th>
+          <th><%= t(".table.actions") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% form.object.components.each do |component| %>
+          <%= render "decidim/meetings/admin/meetings/component", component: %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb

@@ -0,0 +1,42 @@
+<% is_linked = meeting.decidim_component_id != current_component.id %>
+
+<tr data-id="<%= meeting.id %>">
+  <td>
+    <%= meeting.id %><br>
+  </td>
+  <td class="!text-left">
+    <% if allowed_to? :update, :meeting, meeting: meeting %>
+      <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %>
+    <% else %>
+      <%= present(meeting).title(html_escape: true) %><br>
+    <% end %>
+  </td>
+  <td>
+    <% if meeting.start_time %>
+      <%= l meeting.start_time, format: :long %>
+    <% end %>
+  </td>
+  <td>
+    <% if meeting.end_time %>
+      <%= l meeting.end_time, format: :long %>
+    <% end %>
+  </td>
+  <td>
+    <%= humanize_boolean meeting.closed? %>
+  </td>
+  <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
+    <td>
+      <%= static_map_link(meeting, {}, { class: "static-map__admin" }) unless meeting.online? %>
+    </td>
+  <% end %>
+  <td>
+    <%= present(meeting).taxonomy_names.join(", ") %>
+  </td>
+  <td class="table-list__actions">
+    <% if is_linked %>
+      <%= t("index.linked_meeting_warning_html", href: edit_meeting_path(meeting), name: present(meeting).space_title, scope: "decidim.meetings.admin.meetings") %>
+    <% else %>
+      <%= render partial: "decidim/meetings/admin/meetings/meeting_actions", locals: { meeting:, view: } %>
+    <% end %>
+  </td>
+</tr>

data/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb

@@ -0,0 +1,70 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :meeting, trashable_deleted_resource: meeting %>
+    <%= icon_link_to "refresh-line", url_for(action: :restore, id: meeting, controller: "meetings"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <%= icon_link_to "pencil-line", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :copy, :meeting, meeting: meeting %>
+    <%= icon_link_to "file-copy-line", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <%= icon_link_to "folder-line", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <%= icon_link_to "attachment-line", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <% if meeting.registration_disabled? %>
+      <%= icon "group-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.registrations", scope: "decidim.meetings") %>
+    <% else %>
+      <%= icon_link_to "group-line", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
+    <% end %>
+  <% end %>
+
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <%= icon_link_to "calendar-line", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
+    <%= icon_link_to "list-check", edit_meeting_poll_path(meeting), t("actions.manage_poll", scope: "decidim.meetings"), class: "action-icon--manage-poll-questionnaire" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :close, :meeting, meeting: meeting %>
+    <%= icon_link_to "lock-line", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :update, :meeting, meeting: meeting %>
+    <% if meeting.published? %>
+      <%= icon_link_to "close-circle-line", unpublish_meeting_path(meeting), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish", data: { confirm: t("actions.unpublish", scope: "decidim.admin") } %>
+    <% else %>
+      <%= icon_link_to "check-line", publish_meeting_path(meeting), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
+    <% end %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <%= icon_link_to "eye-line", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <%= resource_permissions_link(meeting) %>
+
+  <% if allowed_to? :soft_delete, :meeting, trashable_deleted_resource: meeting %>
+    <%= icon_link_to "delete-bin-line", soft_delete_meeting_path(meeting), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_meeting", scope: "decidim.meetings") } %>
+  <% 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/meetings/admin/meetings/_meetings-thead.html.erb

@@ -0,0 +1,26 @@
+<thead>
+<tr>
+  <th>
+    <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
+  </th>
+  <th class="!text-left">
+    <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
+  </th>
+  <th>
+    <%= sort_link(query, :start_time, t("models.meeting.fields.start_time", scope: "decidim.meetings"), default_order: :desc ) %>
+  </th>
+  <th>
+    <%= sort_link(query, :end_time, t("models.meeting.fields.end_time", scope: "decidim.meetings"), default_order: :desc ) %>
+  </th>
+  <th>
+    <%= sort_link(query, :closed, t("models.meeting.fields.closed", scope: "decidim.meetings"), default_order: :desc ) %>
+  </th>
+  <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
+    <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
+  <% end %>
+  <th>
+    <%= sort_link(query, :scope_name, t("models.meeting.fields.taxonomies", scope: "decidim.meetings") ) %>
+  </th>
+  <th><%= t("actions.title", scope: "decidim.meetings") %></th>
+</tr>
+</thead>

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

@@ -12,152 +12,26 @@
   <%= admin_filter_selector(:meetings) %>
   <div class="table-scroll">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th>
-            <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
-          </th>
-          <th class="!text-left">
-            <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
-          </th>
-          <th>
-            <%= sort_link(query, :start_time, t("models.meeting.fields.start_time", scope: "decidim.meetings"), default_order: :desc ) %>
-          </th>
-          <th>
-            <%= sort_link(query, :end_time, t("models.meeting.fields.end_time", scope: "decidim.meetings"), default_order: :desc ) %>
-          </th>
-          <th>
-            <%= sort_link(query, :closed, t("models.meeting.fields.closed", scope: "decidim.meetings"), default_order: :desc ) %>
-          </th>
-          <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
-            <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
-          <% end %>
-          <% if resource_with_scopes_enabled? %>
-            <th>
-              <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-          <th><%= t("actions.title", scope: "decidim.meetings") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "meetings-thead" %>
       <tbody>
-        <% meetings.each do |meeting| %>
-          <tr data-id="<%= meeting.id %>">
-            <td>
-              <%= meeting.id %><br>
-            </td>
-            <td class="!text-left">
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %>
-              <% else %>
-                <%= present(meeting).title(html_escape: true) %><br>
-              <% end %>
-            </td>
-            <td>
-              <% if meeting.start_time %>
-                <%= l meeting.start_time, format: :long %>
-              <% end %>
-            </td>
-            <td>
-              <% if meeting.end_time %>
-                <%= l meeting.end_time, format: :long %>
-              <% end %>
-            </td>
-            <td>
-              <%= humanize_boolean meeting.closed? %>
-            </td>
-            <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
-              <td>
-                <%= static_map_link(meeting, {}, { class: "static-map__admin" }) unless meeting.online? %>
-              </td>
-            <% end %>
-            <%= td_resource_scope_for(meeting.scope) %>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <%= icon_link_to "pencil-line", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :copy, :meeting, meeting: meeting %>
-                <%= icon_link_to "file-copy-line", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <%= icon_link_to "folder-line", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <%= icon_link_to "attachment-line", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <% if meeting.registration_disabled? %>
-                  <%= icon "group-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.registrations", scope: "decidim.meetings") %>
-                <% else %>
-                  <%= icon_link_to "group-line", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
-                <% end %>
-              <% end %>
-
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <%= icon_link_to "calendar-line", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
-                <%= icon_link_to "list-check", edit_meeting_poll_path(meeting), t("actions.manage_poll", scope: "decidim.meetings"), class: "action-icon--manage-poll-questionnaire" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :close, :meeting, meeting: meeting %>
-                <%= icon_link_to "lock-line" , edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :update, :meeting, meeting: meeting %>
-                <% if meeting.published? %>
-                  <%= icon_link_to "close-circle-line", unpublish_meeting_path(meeting), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish", data: { confirm: t("actions.unpublish", scope: "decidim.admin") } %>
-                <% else %>
-                  <%= icon_link_to "check-line", publish_meeting_path(meeting), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
-                <% end %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <%= icon_link_to "eye-line", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-              <%= resource_permissions_link(meeting) %>
-
-              <% if allowed_to? :destroy, :meeting, meeting: meeting %>
-                <% if present(meeting).authored_proposals.empty? %>
-                  <%= icon_link_to "delete-bin-line", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
-                <% else %>
-                  <%=
-                    content_tag(:button,
-                                :class => ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
-                                "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
-                                "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
-                      content_tag(:span,
-                                  data: { tooltip: true, disable_hover: false, click_open: false },
-                                  title: t("actions.destroy", scope: "decidim.meetings")) do
-                        icon("delete-bin-line")
-                      end
-                    end
-                  %>
-                <% end %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: "decidim/meetings/admin/meetings/meeting-tr",
+                   collection: meetings,
+                   as: :meeting,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+  <% if allowed_to? :manage_trash, :meeting, participatory_space: current_participatory_space %>
+    <div class="card mt-4">
+      <%= link_to manage_trash_meetings_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_meetings", scope: "decidim.meetings") %>
+        <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_meetings_info", scope: "decidim.meetings")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 
 <%= decidim_paginate meetings %>

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

@@ -0,0 +1,23 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+    </h1>
+  </div>
+
+  <%= admin_filter_selector(:meetings) %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <%= render partial: "meetings-thead" %>
+      <tbody>
+        <%= render partial: "decidim/meetings/admin/meetings/meeting-tr",
+                   collection: trashable_deleted_collection,
+                   as: :meeting,
+                   locals: { view: :deleted } %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<%= decidim_paginate trashable_deleted_collection %>