decidim-debates 0.27.6 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d324959892f8f61929da154f1ddb51fedee60365b68b4f5c492123b598ca9b3
-  data.tar.gz: 040c91987101384521f5c543d3a682affffd48e7c1458011fe927b7a6e571159
+  metadata.gz: fbbd97fad2e27ad5112a8fc5c9e87e8a43917e56345f0f0dfa08a78458c23ac9
+  data.tar.gz: e7f57d48e3331d15831289deae2655bb21abee8e069cc5fdfb0f3db9100b147a
 SHA512:
-  metadata.gz: 3d8099cb8ed0aaf6a0b5fd704fc16bec57e87d7cbb56660df6d765eab2b6690bf6574750ebb7521edc59635f1b87e640894a2889b3f4ed779448a94a1e681b00
-  data.tar.gz: f6f74beef5215430fddcef7a044f51e47815ac822fb31f310d956e03b0e8a5d5590353aaa3a500aa5aabdfa65e505f468b3ef1ecbdb50a06e40ede647065b95f
+  metadata.gz: af588e7c7dfa666a243493f50a6594f87c7d14225ae142c20d520c05747968dfc9aceecb241b458ca78f75afb2033d3556b67df44dcd00977c76881880d06af7
+  data.tar.gz: a0281466ecd1c7c00484840c4ba0ae6a97ed0827e7333359a131cda5b19bacc41dcd0ff77ab17b25c4b28060bfe71f86f206719ea15adc0492f73ae3084cbdfb

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

@@ -5,18 +5,7 @@ module Decidim
     # A cell to display when actions happen on a debate.
     class DebateActivityCell < ActivityCell
       def title
-        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
+        action == "update" ? I18n.t("decidim.debates.last_activity.debate_updated") : I18n.t("decidim.debates.last_activity.new_debate")
       end
 
       def resource_link_text

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cell renders metadata for an instance of a Meeting
+    class DebateCardMetadataCell < Decidim::CardMetadataCell
+      include Decidim::LayoutHelper
+      include ActionView::Helpers::DateHelper
+
+      alias debate model
+
+      delegate :type_of_meeting, :start_time, :end_time, :category, :withdrawn?, to: :debate
+
+      def initialize(*)
+        super
+
+        @items.prepend(*debate_items)
+      end
+
+      def category_item
+        return if category.blank?
+
+        {
+          text: category.translated_name,
+          icon: resource_type_icon_key("Decidim::Category")
+        }
+      end
+
+      def debate_items
+        [duration, comments_count_item, endorsements_count_item, category_item, coauthors_item]
+      end
+
+      def duration
+        text = format_date_range(debate.start_time, debate.end_time) || t("open", scope: "decidim.debates.debates.show")
+
+        {
+          text:,
+          icon: "time-line"
+        }
+      end
+    end
+  end
+end

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

@@ -15,7 +15,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/debates/debate_m"
+        case @options[:size]
+        when :s
+          "decidim/debates/debate_s"
+        else
+          "decidim/debates/debate_l"
+        end
       end
     end
   end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Debates
+    # This cell renders the List (:l) debate card
+    # for a given instance of a Debate
+    class DebateLCell < Decidim::CardLCell
+      include Decidim::SanitizeHelper
+      delegate :component_settings, to: :controller
+
+      alias debate model
+
+      def has_description?
+        true
+      end
+
+      def author_presenter
+        if model.official?
+          Decidim::Core::OfficialAuthorPresenter.new
+        else
+          model.normalized_author.presenter
+        end
+      end
+
+      def title
+        presenter.title(html_escape: true)
+      end
+
+      def description
+        attribute = model.try(:short_description) || model.try(:body) || model.description
+        text = translated_attribute(attribute)
+
+        decidim_sanitize(html_truncate(text, length: 240))
+      end
+
+      private
+
+      def presenter
+        present(model)
+      end
+
+      def metadata_cell
+        "decidim/debates/debate_card_metadata"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Debates
+    # This cell renders the Search (:s) debate card
+    # for a given instance of a Debate
+    class DebateSCell < Decidim::CardSCell
+      private
+
+      def title
+        present(model).title(html_escape: true)
+      end
+
+      def metadata_cell
+        "decidim/debates/debate_card_metadata"
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid, together with the debate.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -14,7 +14,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the debate.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -15,12 +15,11 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        transaction do
+        with_events(with_transaction: true) do
           create_debate
-          send_notification_to_author_followers
-          send_notification_to_space_followers
         end
-
+        send_notification_to_author_followers
+        send_notification_to_space_followers
         follow_debate
         broadcast(:ok, debate)
       end
@@ -29,6 +28,16 @@ module Decidim
 
       attr_reader :debate, :form
 
+      def event_arguments
+        {
+          resource: debate,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def create_debate
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite

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

@@ -14,14 +14,17 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the debate.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
         return broadcast(:invalid) unless form.debate.editable_by?(form.current_user)
 
-        update_debate
+        with_events(with_transaction: true) do
+          update_debate
+        end
+
         broadcast(:ok, @debate)
       end
 
@@ -29,6 +32,16 @@ module Decidim
 
       attr_reader :form
 
+      def event_arguments
+        {
+          resource: @debate,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def update_debate
         @debate = Decidim.traceability.update!(
           @form.debate,

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

@@ -8,13 +8,13 @@ module Decidim
         helper_method :debate
 
         def edit
-          enforce_permission_to :close, :debate, debate: debate
+          enforce_permission_to(:close, :debate, debate:)
 
           @form = form(Admin::CloseDebateForm).from_model(debate)
         end
 
         def update
-          enforce_permission_to :close, :debate, debate: debate
+          enforce_permission_to(:close, :debate, debate:)
 
           @form = form(Admin::CloseDebateForm).from_params(params)
 

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

@@ -22,7 +22,7 @@ module Decidim
         def create
           enforce_permission_to :create, :debate
 
-          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component: current_component)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component:)
 
           CreateDebate.call(@form) do
             on(:ok) do
@@ -38,15 +38,15 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :debate, debate: debate
+          enforce_permission_to(:update, :debate, debate:)
 
           @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate)
         end
 
         def update
-          enforce_permission_to :update, :debate, debate: debate
+          enforce_permission_to(:update, :debate, debate:)
 
-          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component: current_component)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component:)
 
           UpdateDebate.call(@form, debate) do
             on(:ok) do
@@ -62,7 +62,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :debate, debate: debate
+          enforce_permission_to(:delete, :debate, debate:)
 
           debate.destroy!
 

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

@@ -6,7 +6,6 @@ module Decidim
     class DebatesController < Decidim::Debates::ApplicationController
       helper Decidim::ApplicationHelper
       helper Decidim::Messaging::ConversationHelper
-      helper Decidim::WidgetUrlsHelper
       include FormFactory
       include FilterResource
       include Paginable
@@ -44,13 +43,13 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :edit, :debate, debate: debate
+        enforce_permission_to(:edit, :debate, debate:)
 
         @form = form(DebateForm).from_model(debate)
       end
 
       def update
-        enforce_permission_to :edit, :debate, debate: debate
+        enforce_permission_to(:edit, :debate, debate:)
 
         @form = form(DebateForm).from_params(params)
 
@@ -68,7 +67,7 @@ module Decidim
       end
 
       def close
-        enforce_permission_to :close, :debate, debate: debate
+        enforce_permission_to(:close, :debate, debate:)
 
         @form = form(CloseDebateForm).from_params(params)
 
@@ -114,10 +113,10 @@ module Decidim
       def default_filter_params
         {
           search_text_cont: "",
-          with_any_origin: %w(official participants user_group),
-          activity: "all",
-          with_any_category: default_filter_category_params,
-          with_any_scope: default_filter_scope_params,
+          with_any_origin: nil,
+          activity: %w(all),
+          with_any_category: nil,
+          with_any_scope: nil,
           with_any_state: %w(open closed)
         }
       end

data/app/events/decidim/debates/close_debate_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Debates

data/app/events/decidim/debates/create_debate_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Debates
@@ -12,12 +12,26 @@ module Decidim
     class CreateDebateEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent
 
+      i18n_attributes :space_title, :space_path
+
       def resource_text
         translated_attribute(resource.description)
       end
 
       private
 
+      def space
+        @space ||= resource.participatory_space
+      end
+
+      def space_path
+        Decidim::ResourceLocatorPresenter.new(space).path
+      end
+
+      def space_title
+        space.title.is_a?(Hash) ? space.title[I18n.locale.to_s] : space.title
+      end
+
       def i18n_scope
         @i18n_scope ||= if extra[:type].to_s == "user"
                           "decidim.events.debates.create_debate_event.user_followers"

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

@@ -22,7 +22,7 @@ module Decidim
         end
 
         def debate
-          @debate ||= Debate.find_by(id: id)
+          @debate ||= Debate.find_by(id:)
         end
 
         private

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

@@ -20,13 +20,13 @@ module Decidim
         super
 
         # Debates can be translated in different languages from the admin but
-        # the public form doesn't allow it. When a user closes a debate the
+        # the public form does not allow it. When a user closes a debate the
         # user locale is taken as the text locale.
         self.conclusions = debate.conclusions&.values&.first
       end
 
       def debate
-        @debate ||= Debate.find_by(id: id)
+        @debate ||= Debate.find_by(id:)
       end
 
       private

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

@@ -22,7 +22,7 @@ module Decidim
       def map_model(debate)
         super
         # Debates can be translated in different languages from the admin but
-        # the public form doesn't allow it. When a user creates a debate the
+        # the public form does not allow it. When a user creates a debate the
         # user locale is taken as the text locale.
         self.title = debate.title.values.first
         self.description = debate.description.values.first
@@ -53,7 +53,7 @@ module Decidim
       end
 
       def debate
-        @debate ||= Debate.find_by(id: id)
+        @debate ||= Debate.find_by(id:)
       end
 
       private

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

@@ -11,6 +11,7 @@ module Decidim
       include Decidim::EndorsableHelper
       include Decidim::FollowableHelper
       include Decidim::CheckBoxesTreeHelper
+      include Decidim::DateRangeHelper
 
       # If the debate is official or the rich text editor is enabled on the
       # frontend, the debate description is considered as safe content.
@@ -42,35 +43,59 @@ module Decidim
       # Returns a TreeNode to be used in the list filters to filter debates by
       # its origin.
       def filter_origin_values
-        origin_values = []
-        origin_values << TreePoint.new("official", t("decidim.debates.debates.filters.official"))
-        origin_values << TreePoint.new("participants", t("decidim.debates.debates.filters.participants"))
-        origin_values << TreePoint.new("user_group", t("decidim.debates.debates.filters.user_groups")) if current_organization.user_groups_enabled?
+        origin_keys = %w(official participants)
+        origin_keys << "user_group" if current_organization.user_groups_enabled?
 
-        TreeNode.new(TreePoint.new("", t("decidim.debates.debates.filters.all")), origin_values)
+        origin_values = origin_keys.map { |key| [key, t(key, scope: "decidim.debates.debates.filters")] }
+        origin_values.prepend(["", all_filter_text])
+
+        filter_tree_from_array(origin_values)
       end
 
       # Options to filter Debates by activity.
       def activity_filter_values
-        base = [
-          ["all", t("decidim.debates.debates.filters.all")],
-          ["my_debates", t("decidim.debates.debates.filters.my_debates")]
-        ]
-        base += [["commented", t("decidim.debates.debates.filters.commented")]]
-        base
+        %w(all my_debates commented).map { |k| [k, t(k, scope: "decidim.debates.debates.filters")] }
       end
 
       # Returns a TreeNode to be used in the list filters to filter debates by
       # its state.
       def filter_debates_state_values
-        Decidim::CheckBoxesTreeHelper::TreeNode.new(
-          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("decidim.debates.debates.filters.all")),
-          [
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("open", t("decidim.debates.debates.filters.state_values.open")),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("closed", t("decidim.debates.debates.filters.state_values.closed"))
-          ]
+        %w(open closed).map { |k| [k, t(k, scope: "decidim.debates.debates.filters.state_values")] }.prepend(
+          ["all", all_filter_text]
         )
       end
+
+      def all_filter_text
+        t("all", scope: "decidim.debates.debates.filters")
+      end
+
+      def filter_sections
+        @filter_sections ||= begin
+          items = [{
+            method: :with_any_state,
+            collection: filter_debates_state_values,
+            label_scope: "decidim.meetings.meetings.filters",
+            id: "date",
+            type: :radio_buttons
+          }]
+          if current_component.has_subscopes?
+            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope")
+          end
+          if current_participatory_space.categories.any?
+            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.debates.debates.filters", id: "category")
+          end
+          items.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.debates.debates.filters", id: "origin")
+          items.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.debates.debates.filters", id: "activity") if current_user
+
+          items.reject { |item| item[:collection].blank? }
+        end
+      end
+
+      def search_variable = :search_text_cont
+
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.debates.name")
+      end
     end
   end
 end

data/app/jobs/decidim/debates/hide_all_created_by_author_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class HideAllCreatedByAuthorJob < ::Decidim::HideAllCreatedByAuthorJob
+      protected
+
+      def base_query
+        Decidim::Debates::Debate.not_hidden.where(author:)
+      end
+    end
+  end
+end

data/app/jobs/decidim/debates/settings_change_job.rb

@@ -19,8 +19,8 @@ module Decidim
         return unless event && event_class
 
         Decidim::EventsManager.publish(
-          event: event,
-          event_class: event_class,
+          event:,
+          event_class:,
           resource: component,
           followers: component.participatory_space.followers
         )

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

@@ -44,7 +44,7 @@ module Decidim
 
       scope :open, -> { where(closed_at: nil) }
       scope :closed, -> { where.not(closed_at: nil) }
-      scope :authored_by, ->(author) { where(author: author) }
+      scope :authored_by, ->(author) { where(author:) }
       scope :commented_by, lambda { |author|
         joins(:comments).where(
           decidim_comments_comments:
@@ -147,12 +147,12 @@ module Decidim
       end
 
       def self.newsletter_participant_ids(component)
-        authors_ids = Decidim::Debates::Debate.where(component: component)
+        authors_ids = Decidim::Debates::Debate.where(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))
+        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(Decidim::Debates::Debate.where(component:))
         (authors_ids + commentators_ids).flatten.compact.uniq
       end
 
@@ -189,7 +189,7 @@ module Decidim
           last_comment_at: last_comment&.created_at,
           last_comment_by_id: last_comment&.decidim_user_group_id || last_comment&.decidim_author_id,
           last_comment_by_type: last_comment&.decidim_author_type,
-          comments_count: comments_count,
+          comments_count:,
           updated_at: Time.current
         )
       end

data/app/packs/entrypoints/decidim_debates.js

@@ -0,0 +1,2 @@
+// Images
+require.context("../images", true)