decidim-debates 0.29.3 → 0.30.0.rc1

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

@@ -7,6 +7,7 @@ module Decidim
     # debate.
     class Debate < Debates::ApplicationRecord
       include Decidim::HasComponent
+      include Decidim::Taxonomizable
       include Decidim::HasCategory
       include Decidim::Resourceable
       include Decidim::Followable
@@ -15,6 +16,7 @@ module Decidim
       include Decidim::ScopableResource
       include Decidim::Authorable
       include Decidim::Reportable
+      include Decidim::HasAttachments
       include Decidim::HasReference
       include Decidim::Traceable
       include Decidim::Loggable
@@ -26,6 +28,7 @@ module Decidim
       include Decidim::Endorsable
       include Decidim::Randomable
       include Decidim::FilterableResource
+      include Decidim::SoftDeletable
 
       belongs_to :last_comment_by, polymorphic: true, foreign_type: "last_comment_by_type", optional: true
       component_manifest_name "debates"
@@ -42,6 +45,7 @@ module Decidim
                         index_on_create: ->(debate) { debate.visible? },
                         index_on_update: ->(debate) { debate.visible? })
 
+      scope :updated_at_desc, -> { order(arel_table[:updated_at].desc) }
       scope :open, -> { where(closed_at: nil) }
       scope :closed, -> { where.not(closed_at: nil) }
       scope :authored_by, ->(author) { where(author:) }
@@ -74,6 +78,11 @@ module Decidim
         end_time
       end
 
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
+      end
+
       # Public: Overrides the `reported_attributes` Reportable concern method.
       def reported_attributes
         [:title, :description]
@@ -131,6 +140,16 @@ module Decidim
         self.class.name
       end
 
+      # Public: Checks whether the comments are displayed in a single-column layout.
+      def single_column_layout?
+        comments_layout == "single_column"
+      end
+
+      # Public: Checks whether the comments are displayed in a two-column layout.
+      def two_columns_layout?
+        comments_layout == "two_columns"
+      end
+
       # Public: Override Commentable concern method `users_to_notify_on_comment_created`
       def users_to_notify_on_comment_created
         return Decidim::User.where(id: followers).or(Decidim::User.where(id: component.participatory_space.admins)).distinct if official?
@@ -201,13 +220,21 @@ module Decidim
       ransacker_i18n_multi :search_text, [:title, :description]
 
       def self.ransackable_scopes(_auth_object = nil)
-        [:with_any_state, :with_any_origin, :with_any_category, :with_any_scope]
+        [:with_any_state, :with_any_origin, :with_any_taxonomies]
       end
 
       def self.ransack(params = {}, options = {})
         DebateSearch.new(self, params, options)
       end
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(search_text title description)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies)
+      end
+
       private
 
       def comments_blocked?

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

@@ -8,7 +8,7 @@ module Decidim
           # The public part needs to be implemented yet
           return permission_action if permission_action.scope != :admin
 
-          can_export_comments?
+          can_export_debates?
 
           return permission_action if permission_action.subject != :debate
 
@@ -17,8 +17,8 @@ module Decidim
             allow!
           when :update
             toggle_allow(debate && !debate.closed? && debate.official?)
-          when :delete, :close
-            toggle_allow(debate && debate.official?)
+          when :close
+            toggle_allow(debate&.official?)
           end
 
           permission_action
@@ -30,8 +30,8 @@ module Decidim
           @debate ||= context.fetch(:debate, nil)
         end
 
-        def can_export_comments?
-          allow! if permission_action.subject == :comments && permission_action.action == :export
+        def can_export_debates?
+          allow! if permission_action.subject == :debates && permission_action.action == :export
         end
       end
     end

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

@@ -32,7 +32,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "update"
+          when "create", "update", "soft_delete", "restore"
             "decidim.debates.admin_log.debate.#{action}"
           else
             super

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

@@ -28,7 +28,7 @@ module Decidim
       def title(links: false, all_locales: false, html_escape: false)
         return unless debate
 
-        super debate.title, links, html_escape, all_locales
+        super(debate.title, links, html_escape, all_locales)
       end
 
       def description(strip_tags: false, extras: true, links: false, all_locales: false)

data/app/queries/decidim/debates/metrics/debate_followers_metric_measure.rb

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

data/app/queries/decidim/debates/metrics/debate_participants_metric_measure.rb

@@ -12,13 +12,13 @@ module Decidim
 
         def calculate
           debates = Decidim::Debates::Debate.where(component: @resource).joins(:component)
-                                            .where("decidim_debates_debates.created_at <= ?", end_time)
+                                            .where(decidim_debates_debates: { created_at: ..end_time })
                                             .where(decidim_author_type: Decidim::UserBaseEntity.name)
                                             .where.not(author: nil)
 
           {
             cumulative_users: debates.pluck(:decidim_author_id),
-            quantity_users: debates.where("decidim_debates_debates.created_at >= ?", start_time).pluck(:decidim_author_id)
+            quantity_users: debates.where(decidim_debates_debates: { created_at: start_time.. }).pluck(:decidim_author_id)
           }
         end
       end

data/app/queries/decidim/debates/metrics/debates_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!
@@ -28,16 +28,16 @@ module Decidim
           return @query if @query
 
           @query = Decidim::Debates::Debate.where(component: visible_components_from_spaces(retrieve_participatory_spaces)).joins(:component)
-                                           .left_outer_joins(:category)
-          @query = @query.where("decidim_debates_debates.start_time <= ?", end_time)
-          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                           .left_outer_joins(:taxonomizations)
+          @query = @query.where(decidim_debates_debates: { start_time: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_debates_debates.start_time >= ?", start_time).count
+          @quantity ||= query.where(decidim_debates_debates: { start_time: start_time.. }).count
         end
       end
     end

data/app/serializers/decidim/debates/download_your_data_debate_serializer.rb

@@ -2,20 +2,13 @@
 
 module Decidim
   module Debates
-    class DownloadYourDataDebateSerializer < Decidim::Exporters::Serializer
-      # Serializes a Debate for download your data
+    class DownloadYourDataDebateSerializer < Decidim::Debates::DebateSerializer
+      # Serializes a Debate for download your data feature
+      #
+      # Remove the author information as it is the same of the user that
+      # requested the data
       def serialize
-        {
-          id: resource.id,
-          title: resource.title,
-          description: resource.description,
-          instructions: resource.instructions,
-          start_time: resource.start_time,
-          end_time: resource.end_time,
-          information_updates: resource.information_updates,
-          reference: resource.reference,
-          component: resource.component.name
-        }
+        super.except!(:author)
       end
     end
   end

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

@@ -0,0 +1,27 @@
+<% 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 %>

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

@@ -0,0 +1,25 @@
+<tr data-id="<%= debate.id %>">
+  <td>
+    <% 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>
+    <% if debate.start_time %>
+      <%= l debate.start_time, format: :long %>
+    <% end %>
+  </td>
+  <td>
+    <% if debate.end_time %>
+      <%= l debate.end_time, format: :long %>
+    <% end %>
+  </td>
+  <td>
+    <%= debate.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", ") %>
+  </td>
+  <td class="table-list__actions">
+    <%= render partial: "decidim/debates/admin/debates/actions", locals: { debate:, view: } %>
+  </td>
+</tr>

data/app/views/decidim/debates/admin/debates/_debates-thead.html.erb

@@ -0,0 +1,9 @@
+<thead>
+<tr>
+  <th><%= t("models.debate.fields.title", scope: "decidim.debates") %></th>
+  <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
+  <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
+  <th><%= t("models.debate.fields.taxonomies", scope: "decidim.debates") %></th>
+  <th><%= t("actions.title", scope: "decidim.debates") %></th>
+</tr>
+</thead>

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

@@ -34,19 +34,40 @@
         </div>
       </div>
 
-      <% if current_component.has_subscopes? %>
-        <div class="row column">
-          <%= scopes_select_field form, :scope_id, root: current_component.scope %>
-        </div>
+      <% 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 %>
 
       <div class="row column">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
+        <%= form.check_box :comments_enabled, label: t("enabled", scope: "decidim.comments.admin.shared.availability_fields") %>
       </div>
 
       <div class="row column">
-        <%= form.check_box :comments_enabled, label: t("enabled", scope: "decidim.comments.admin.shared.availability_fields") %>
+        <%= label_tag :comments_layout, t(".comments_visualization") %>
+        <span class="help-text"><%= t(".comments_warning") %></span>
+        <div>
+          <%= form.collection_radio_buttons(:comments_layout, [[t(".single_column"), "single_column"], [t(".two_columns"), "two_columns"]], :last, :first) do |builder|
+            builder.label(class: "form__wrapper-checkbox-label") { builder.radio_button + builder.text }
+          end %>
+        </div>
       </div>
+
+      <% if component_settings.attachments_allowed? %>
+        <div class="row column">
+          <%= form.attachment :documents,
+                              multiple: true,
+                              label: t("decidim.debates.admin.debates.form.add_attachments"),
+                              button_label: t("decidim.debates.admin.debates.form.add_attachments"),
+                              button_edit_label: t("decidim.debates.admin.debates.form.edit_attachments"),
+                              button_class: "button button__sm button__transparent-secondary",
+                              help_i18n_scope: "decidim.forms.file_help.file",
+                              help_text: t("decidim.debates.admin.debates.form.attachment_legend") %>
+        </div>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -3,69 +3,31 @@
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <%= export_dropdown if allowed_to? :export, :comments %>
+      <%= 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" %>
     </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th><%= t("models.debate.fields.title", scope: "decidim.debates") %></th>
-          <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
-          <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
-          <%= th_resource_scope_label %>
-          <th><%= t("actions.title", scope: "decidim.debates") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "debates-thead" %>
       <tbody>
-        <% debates.each do |debate| %>
-          <tr data-id="<%= debate.id %>">
-            <td>
-              <% 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>
-              <% if debate.start_time %>
-                <%= l debate.start_time, format: :long %>
-              <% end %>
-            </td>
-            <td>
-              <% if debate.end_time %>
-                <%= l debate.end_time, format: :long %>
-              <% end %>
-            </td>
-            <%= td_resource_scope_for(debate.scope) %>
-            <td class="table-list__actions">
-              <% 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? :delete, :debate, debate: debate %>
-                <%= icon_link_to "delete-bin-line", debate_path(debate), t("actions.destroy", scope: "decidim.debates"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.debates") } %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: "decidim/debates/admin/debates/debate-tr",
+                   collection: debates,
+                   as: :debate,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </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 %>
+        <%= 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">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_debate_info", scope: "decidim.debates")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>

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

@@ -0,0 +1,19 @@
+<% 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">
+    <table class="table-list">
+      <%= render partial: "debates-thead" %>
+      <tbody>
+        <%= render partial: "decidim/debates/admin/debates/debate-tr",
+                   collection: trashable_deleted_collection,
+                   as: :debate,
+                   locals: { view: :deleted } %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,33 @@
+
+<% if allowed_to?(:edit, :debate, debate: debate) %>
+  <li role="menuitem">
+    <%= link_to edit_debate_path(debate), class: "button button__sm button__text button__text-secondary" do %>
+      <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
+  <li role="menuitem">
+    <%= link_to resource_locator(debate).edit, class: "button button__sm button__text button__text-secondary" do %>
+      <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% end %>
+
+<% close_debate_action_text = (debate.closed? ? "decidim.debates.debates.show.edit_conclusions" : "decidim.debates.debates.show.close_debate" ) %>
+<% if allowed_to?(:close, :debate, debate: debate) %>
+  <li role="menuitem">
+    <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="button button__sm button__text button__text-secondary">
+      <span><%= t(close_debate_action_text) %></span>
+      <%= icon "lock-line" %>
+    </button>
+  </li>
+<% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
+  <li role="menuitem">
+    <%= link_to Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "button button__sm button__text button__text-secondary" do %>
+      <span><%= t(close_debate_action_text) %></span>
+      <%= icon "lock-line" %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -1,7 +1,7 @@
 <% if debates.empty? %>
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("debates_count", scope: "decidim.debates.debates.count", count: paginated_debates.total_count) %></h2>
+  <h2 class="h5 md:h3 decorator"><%= t("debates_count", scope: "decidim.debates.debates.count", count: paginated_debates.total_count) %></h2>
 
   <%= order_selector available_orders, i18n_scope: "decidim.debates.debates.orders" %>
 

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

@@ -2,15 +2,28 @@
   <%= form.text_field :title %>
   <%= text_editor_for_debate_description(form) %>
 
-  <% if current_component.has_subscopes? %>
-    <%= scopes_select_field form, :scope_id, root: current_component.scope %>
-  <% end %>
-
-  <% if current_participatory_space.categories&.any? %>
-    <%= form.categories_select :category_id, current_participatory_space.categories, include_blank: t(".select_a_category"), disable_parents: false %>
+  <% 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 @form.id.blank? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
     <%= form.select :user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] }, prompt: current_user.name %>
   <% end %>
+
+  <% if component_settings.attachments_allowed? %>
+    <div class="row column">
+      <%= form.attachment :documents,
+                          multiple: true,
+                          label: t("decidim.debates.admin.debates.form.add_attachments"),
+                          button_label: t("decidim.debates.admin.debates.form.add_attachments"),
+                          button_edit_label: t("decidim.debates.admin.debates.form.edit_attachments"),
+                          button_class: "button button__lg button__transparent-secondary w-full",
+                          help_i18n_scope: "decidim.forms.file_help.file",
+                          help_text: t("decidim.debates.admin.debates.form.attachment_legend") %>
+    </div>
+  <% end %>
 </div>

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

@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_participatory_space.short_description),
   title: t("decidim.components.pagination.page_title",
-           component_name:,
+           component_name: component_name,
            current_page: paginated_debates.current_page,
            total_pages: paginated_debates.total_pages ),
   url: debates_url,
@@ -11,7 +11,7 @@
   <h1 class="title-decorator"><%= component_name %></h1>
 
   <% if current_settings.creation_enabled? && current_component.participatory_space.can_participate?(current_user) %>
-    <%= action_authorized_link_to :create, new_debate_path, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_debate_path } do %>
+    <%= action_authorized_link_to :create, new_debate_path, permissions_holder: current_component, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_debate_path } do %>
       <span><%= t(".new_debate") %></span>
       <%= icon "add-fill" %>
     <% end %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("title", scope: "decidim.debates.debates.new")) %>
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left">