decidim-debates 0.23.1 → 0.24.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59d0b143b8d46e030fd720fabcf3e27fafea1c19f0e4ab7a417cbb062517e1c
-  data.tar.gz: 53a27a398be17df48964b7871b53b461ad5ac05595362168c3872c5c96110632
+  metadata.gz: eef8456a57908e0ab91a73f26a9410b1dce8b900e14225849180da578ad9fdbb
+  data.tar.gz: 7920104a80d0a00e513b7e68a34325328f945da302dc1b235d5817f78ac39c55
 SHA512:
-  metadata.gz: c345162f0acde3789244ba3980c25132d5344f094dbee765806779dcb5af3017851a4dc0b36e071c8a5430f6025d4133c8e84304c7231099c10c0bb7202d4dfb
-  data.tar.gz: 13a11f37931f0ccd6910cee0fd836270d375657ceebd2022c715aa1d1d4cd611ce4e80a12f57b0cb41d5284fe283f8ef5fcf94092279e7f8a0fdcda2d25fb676
+  metadata.gz: 32a010ee5066b25559e127dcc7845dbd24522ab3febe87290545b49bf9b957c90f110b1d6bcd1df1f4cfca9954a36fdd0c6ddc982e5b10f5db467b6d99568da1
+  data.tar.gz: b2c6f8cb588a2f0eaddbb7bff291590628465b0ca0147ba55bec4f50aeee575d0561fc3a706d4cce17c2dede9eb43d7e72f77f85a6274d7399731e28763ed74b

data/app/assets/config/admin/decidim_debates_manifest.js

@@ -0,0 +1 @@
+//= link decidim/debates/admin/debates.js

data/app/assets/javascripts/decidim/debates/admin/debates.js.es6

@@ -0,0 +1,25 @@
+((exports) => {
+  const { createFieldDependentInputs } = exports.DecidimAdmin;
+
+  const $debateType = $('[name="debate[finite]"');
+
+  createFieldDependentInputs({
+    controllerField: $debateType,
+    wrapperSelector: ".debate-fields",
+    dependentFieldsSelector: ".debate-fields--open",
+    dependentInputSelector: "input",
+    enablingCondition: () => {
+      return $("#debate_finite_false").is(":checked")
+    }
+  });
+
+  createFieldDependentInputs({
+    controllerField: $debateType,
+    wrapperSelector: ".debate-fields",
+    dependentFieldsSelector: ".debate-fields--finite",
+    dependentInputSelector: "input",
+    enablingCondition: () => {
+      return $("#debate_finite_true").is(":checked")
+    }
+  });
+})(window);

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

@@ -2,13 +2,21 @@
 
 module Decidim
   module Debates
-    # A cell to display when Debate has been created.
+    # A cell to display when actions happen on a debate.
     class DebateActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.debates.last_activity.new_debate_at_html",
-          link: participatory_space_link
-        )
+        case action
+        when "update"
+          I18n.t(
+            "decidim.debates.last_activity.debate_updated_at_html",
+            link: participatory_space_link
+          )
+        else
+          I18n.t(
+            "decidim.debates.last_activity.new_debate_at_html",
+            link: participatory_space_link
+          )
+        end
       end
 
       def resource_link_text

data/app/cells/decidim/debates/debate_m/open_date.erb

@@ -0,0 +1,7 @@
+<li class="card-data__item">
+  <div>
+    <strong>
+      <%= t("decidim.debates.debates.show.open") %>
+    </strong>
+  </div>
+</li>

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

@@ -52,7 +52,7 @@ module Decidim
       end
 
       def debate_date
-        return unless start_date && end_date
+        return render(:open_date) unless start_date && end_date
         return render(:multiple_dates) if spans_multiple_dates?
 
         render(:single_date)

data/app/cells/decidim/debates/reported_content/show.erb

@@ -0,0 +1,4 @@
+<blockquote>
+  <h5><%= render_value model.title %></h5>
+  <p><%= render_value model.description %></p>
+</blockquote>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cells renders a small preview of the `Debate` that is
+    # used in the moderations panel.
+    class ReportedContentCell < Decidim::ReportedContentCell
+      def show
+        render :show
+      end
+    end
+  end
+end

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

@@ -36,8 +36,9 @@ module Decidim
             description: parsed_description,
             information_updates: form.information_updates,
             instructions: form.instructions,
-            end_time: form.end_time,
-            start_time: form.start_time,
+            end_time: (form.end_time if form.finite),
+            start_time: (form.start_time if form.finite),
+            scope: form.scope,
             component: form.current_component,
             author: form.current_organization
           }

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

@@ -42,7 +42,8 @@ module Decidim
             information_updates: form.information_updates,
             instructions: form.instructions,
             end_time: form.end_time,
-            start_time: form.start_time
+            start_time: form.start_time,
+            scope: form.scope
           )
         end
       end

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

@@ -42,6 +42,7 @@ module Decidim
           description: {
             I18n.locale => parsed_description
           },
+          scope: form.scope,
           component: form.current_component
         }
 

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

@@ -48,7 +48,8 @@ module Decidim
           },
           description: {
             I18n.locale => parsed_description
-          }
+          },
+          scope: form.scope
         }
       end
     end

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

@@ -13,7 +13,7 @@ module Decidim
       include Flaggable
       include Decidim::Debates::Orderable
 
-      helper_method :debates, :debate, :form_presenter, :paginated_debates, :report_form, :close_debate_form
+      helper_method :debates, :debate, :form_presenter, :paginated_debates, :close_debate_form
 
       def new
         enforce_permission_to :create, :debate
@@ -105,10 +105,6 @@ module Decidim
         @debate ||= debates.find_by(id: params[:id])
       end
 
-      def report_form
-        @report_form ||= form(Decidim::ReportForm).from_params(reason: "spam")
-      end
-
       def close_debate_form
         @close_debate_form ||= form(CloseDebateForm).from_model(debate)
       end

data/app/forms/decidim/debates/admin/close_debate_form.rb

@@ -9,7 +9,7 @@ module Decidim
 
         mimic :debate
 
-        translatable_attribute :conclusions, String do |translated_attribute, locale|
+        translatable_attribute :conclusions, Decidim::Attributes::CleanString do |translated_attribute, locale|
           validates translated_attribute, presence: true, if: ->(record) { record.default_locale?(locale) }
           validates translated_attribute, length: { minimum: 10, maximum: 10_000 }, if: ->(record) { record.default_locale?(locale) }
         end

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

@@ -14,14 +14,18 @@ module Decidim
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_category_id, Integer
+        attribute :finite, Boolean, default: true
+        attribute :scope_id, Integer
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :instructions, translatable_presence: true
-        validates :start_time, presence: { if: ->(object) { object.end_time.present? } }, date: { before: :end_time, allow_blank: true }
-        validates :end_time, presence: { if: ->(object) { object.start_time.present? } }, date: { after: :start_time, allow_blank: true }
+        validates :start_time, presence: { if: :validate_start_time? }, date: { before: :end_time, allow_blank: true, if: :validate_start_time? }
+        validates :end_time, presence: { if: :validate_end_time? }, date: { after: :start_time, allow_blank: true, if: :validate_end_time? }
 
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
+        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+        validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
 
         def map_model(model)
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
@@ -36,6 +40,30 @@ module Decidim
 
           @category ||= current_component.categories.find_by(id: decidim_category_id)
         end
+
+        # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
+        #
+        # Returns a Decidim::Scope
+        def scope
+          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the meeting
+        def scope_id
+          @scope_id || scope&.id
+        end
+
+        private
+
+        def validate_end_time?
+          finite && start_time.present?
+        end
+
+        def validate_start_time?
+          end_time.present?
+        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Decidim
     class CloseDebateForm < Decidim::Form
       mimic :debate
 
-      attribute :conclusions, String
+      attribute :conclusions, Decidim::Attributes::CleanString
       attribute :debate, Debate
 
       validates :debate, presence: true

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

@@ -9,6 +9,7 @@ module Decidim
       attribute :title, String
       attribute :description, String
       attribute :category_id, Integer
+      attribute :scope_id, Integer
       attribute :user_group_id, Integer
       attribute :debate, Debate
 
@@ -17,6 +18,8 @@ module Decidim
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validate :editable_by_user
 
+      validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
+
       def map_model(debate)
         super
         self.debate = debate
@@ -38,6 +41,20 @@ module Decidim
         @category ||= current_component.categories.find_by(id: category_id)
       end
 
+      # Finds the Scope from the given scope_id, uses component scope if missing.
+      #
+      # Returns a Decidim::Scope
+      def scope
+        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+      end
+
+      # Scope identifier
+      #
+      # Returns the scope identifier related to the debate
+      def scope_id
+        @scope_id || scope&.id
+      end
+
       private
 
       def editable_by_user

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

@@ -25,7 +25,7 @@ module Decidim
       include Decidim::Endorsable
       include Decidim::Randomable
 
-      belongs_to :last_comment_by, polymorphic: true, foreign_key: "last_comment_by_id", foreign_type: "last_comment_by_type", optional: true
+      belongs_to :last_comment_by, polymorphic: true, foreign_type: "last_comment_by_type", optional: true
       component_manifest_name "debates"
 
       validates :title, presence: true
@@ -62,6 +62,16 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:title, :description]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [normalized_author.name]
+      end
+
       # Public: Calculates whether the current debate is an AMA-styled one or not.
       # AMA-styled debates are those that have a start and end time set, and comments
       # are only open during that timelapse. AMA stands for Ask Me Anything, a type
@@ -131,10 +141,13 @@ module Decidim
       end
 
       def self.newsletter_participant_ids(component)
-        Decidim::Debates::Debate.where(component: component).joins(:component)
-                                .where(decidim_author_type: Decidim::UserBaseEntity.name)
-                                .where.not(author: nil)
-                                .pluck(:decidim_author_id).flatten.compact.uniq
+        authors_ids = Decidim::Debates::Debate.where(component: component)
+                                              .where(decidim_author_type: Decidim::UserBaseEntity.name)
+                                              .where.not(author: nil)
+                                              .group(:decidim_author_id)
+                                              .pluck(:decidim_author_id).flatten.compact
+        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(Decidim::Debates::Debate.where(component: component))
+        (authors_ids + commentators_ids).flatten.compact.uniq
       end
 
       # Checks whether the user can edit the debate.

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

@@ -7,10 +7,13 @@ module Decidim
         def permissions
           # The public part needs to be implemented yet
           return permission_action if permission_action.scope != :admin
+
+          can_export_comments?
+
           return permission_action if permission_action.subject != :debate
 
           case permission_action.action
-          when :create, :read
+          when :create, :read, :export
             allow!
           when :update
             toggle_allow(debate && !debate.closed? && debate.official?)
@@ -26,6 +29,10 @@ module Decidim
         def debate
           @debate ||= context.fetch(:debate, nil)
         end
+
+        def can_export_comments?
+          allow! if permission_action.subject == :comments && permission_action.action == :export
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
 
-  <div class="card-section">
+  <div class="card-section debate-fields">
      <div class="row column hashtags__container">
       <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </div>
@@ -20,7 +20,12 @@
       <%= form.translated :editor, :information_updates %>
     </div>
 
-    <div class="row">
+    <div class="row column">
+      <%= label_tag :debate_type, t(".debate_type") %>
+      <%= form.collection_radio_buttons(:finite, [[t(".finite"), true], [t(".open"), false]], :last, :first) %>
+    </div>
+
+    <div class="row debate-fields--finite">
       <div class="column xlarge-6">
         <%= form.datetime_field :start_time %>
       </div>
@@ -29,8 +34,16 @@
       </div>
     </div>
 
+    <% if current_component.has_subscopes? %>
+      <div class="row column">
+        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
+      </div>
+    <% end %>
+
     <div class="row column">
       <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/debates/admin/debates" %>

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

@@ -2,8 +2,10 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".title") %>
-
-      <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--title" if allowed_to? :create, :debate %>
+      <div class="button--title">
+        <%= export_dropdown if allowed_to? :export, :comments %>
+        <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--simple" if allowed_to? :create, :debate %>
+      </div>
     </h2>
   </div>
 
@@ -39,14 +41,20 @@
               <td class="table-list__actions">
                 <% if allowed_to? :update, :debate, debate: debate %>
                   <%= icon_link_to "pencil", 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-locked", 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 %>
 
                 <% if allowed_to? :delete, :debate, debate: debate %>
                   <%= icon_link_to "circle-x", 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>

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

@@ -16,7 +16,7 @@
 
   <%= form.check_boxes_tree :state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
 
-  <% if current_participatory_space.has_subscopes? %>
+  <% if current_component.has_subscopes? %>
     <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
   <% end %>
 

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

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>