decidim-debates 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24fbba714f457bcd604e951fbe044ac5545a63838050922e103ddc63a74d6ee
-  data.tar.gz: d39eea631c017fbee2e8fcf6a8597f6e63bab65c62a7b9db0b5bebad7ea41a3b
+  metadata.gz: 967f139c27f1e4c684f439cdb3bfad76159b6bf08bb78f9d71ac775bda7e1cf4
+  data.tar.gz: 4acd40bffd8654d6acde8802f76da818ffbbffdca7eb6bb14985e1e5de104548
 SHA512:
-  metadata.gz: a286ecfabcdffbf30c72b9436883d32b6a7060bf8fbfca5b739aab11dd96e83677a13d4a51883b8053decb1b9951e594c60178bd7182c6460dacea4b34bf989d
-  data.tar.gz: bfc093c8e4a09e32b9d2a5124acfb39ebd33b90d325bd9c7860ca61da2f579719dab9ebc287d2d62a5c0c7f66eb2a82db090a5f11cc5fe39a52ce8cadef5af66
+  metadata.gz: d6dfd083edcad26a2766e9457e5150df312afcdc04476a6eec1b8daa3d4571850cc8992c81da28087788a6bfd644257701f09da1db582eca771d146d39ba50c1
+  data.tar.gz: 873bdd3aa7b18458e59491838daf46b6a74dc80c91ecfcd467b3effa747fc667b87702455a5594ab9b26c2e3241f2d02a82d9c0729cdef3cbefd4001511a78f0

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

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def title
-        presenter.title(html_escape: true)
+        presenter.title
       end
 
       def body

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

@@ -4,7 +4,7 @@ module Decidim
   module Debates
     module Admin
       # A command with all the business logic when an admin closes a debate.
-      class CloseDebate < Rectify::Command
+      class CloseDebate < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Debate from the admin
       # panel.
-      class CreateDebate < Rectify::Command
+      class CreateDebate < Decidim::Command
         def initialize(form)
           @form = form
         end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Debate from the admin
       # panel.
-      class UpdateDebate < Rectify::Command
+      class UpdateDebate < Decidim::Command
         # Initializes a UpdateDebate Command.
         #
         # form - The form from which to get the data.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class CloseDebate < Rectify::Command
+    class CloseDebate < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Debates
     # This command is executed when the user creates a Debate from the public
     # views.
-    class CreateDebate < Rectify::Command
+    class CreateDebate < Decidim::Command
       def initialize(form)
         @form = form
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class UpdateDebate < Rectify::Command
+    class UpdateDebate < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

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

@@ -17,7 +17,6 @@ module Decidim
           enforce_permission_to :close, :debate, debate: debate
 
           @form = form(Admin::CloseDebateForm).from_params(params)
-          @form.debate = debate
 
           CloseDebate.call(@form) do
             on(:ok) do |_debate|

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

@@ -53,7 +53,6 @@ module Decidim
         enforce_permission_to :edit, :debate, debate: debate
 
         @form = form(DebateForm).from_params(params)
-        @form.debate = debate
 
         UpdateDebate.call(@form) do
           on(:ok) do |debate|
@@ -72,7 +71,6 @@ module Decidim
         enforce_permission_to :close, :debate, debate: debate
 
         @form = form(CloseDebateForm).from_params(params)
-        @form.debate = debate
 
         CloseDebate.call(@form) do
           on(:ok) do |debate|
@@ -98,7 +96,7 @@ module Decidim
       end
 
       def debates
-        @debates ||= reorder(search.results)
+        @debates ||= reorder(search.result)
       end
 
       def debate
@@ -109,26 +107,18 @@ module Decidim
         @close_debate_form ||= form(CloseDebateForm).from_model(debate)
       end
 
-      def search_klass
-        DebateSearch
-      end
-
-      def default_search_params
-        {
-          page: params[:page],
-          per_page: 12
-        }
+      def search_collection
+        Debate.where(component: current_component).not_hidden
       end
 
       def default_filter_params
         {
-          search_text: "",
-          origin: %w(official citizens user_group),
+          search_text_cont: "",
+          with_any_origin: %w(official participants user_group),
           activity: "all",
-          category_id: default_filter_category_params,
-          scope_id: default_filter_scope_params,
-          status: "all",
-          state: %w(open closed)
+          with_any_category: default_filter_category_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_state: %w(open closed)
         }
       end
     end

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

@@ -24,11 +24,11 @@ module Decidim
         def reorder(debates)
           case order
           when "recent"
-            debates.order("created_at DESC")
+            debates.order(created_at: :desc)
           when "commented"
-            debates.order("comments_count DESC")
+            debates.order(comments_count: :desc)
           when "updated"
-            debates.order("updated_at DESC")
+            debates.order(updated_at: :desc)
           when "random"
             debates.order_randomly(random_seed)
           else

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

@@ -14,8 +14,6 @@ module Decidim
           validates translated_attribute, length: { minimum: 10, maximum: 10_000 }, if: ->(record) { record.default_locale?(locale) }
         end
 
-        attribute :debate, Debate
-
         validates :debate, presence: true
         validate :user_can_close_debate
 
@@ -23,6 +21,10 @@ module Decidim
           debate&.closed_at || Time.current
         end
 
+        def debate
+          @debate ||= Debate.find_by(id: id)
+        end
+
         private
 
         def user_can_close_debate

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

@@ -29,7 +29,6 @@ module Decidim
         validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
 
         def map_model(model)
-          self.finite = model.start_time.present? && model.end_time.present?
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
           presenter = DebatePresenter.new(model)
 
@@ -47,14 +46,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def scope_id
-          @scope_id || scope&.id
+          super || scope&.id
         end
 
         private

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

@@ -7,7 +7,6 @@ module Decidim
       mimic :debate
 
       attribute :conclusions, Decidim::Attributes::CleanString
-      attribute :debate, Debate
 
       validates :debate, presence: true
       validates :conclusions, presence: true, length: { minimum: 10, maximum: 10_000 }
@@ -19,7 +18,6 @@ module Decidim
 
       def map_model(debate)
         super
-        self.debate = debate
 
         # 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
@@ -27,6 +25,10 @@ module Decidim
         self.conclusions = debate.conclusions&.values&.first
       end
 
+      def debate
+        @debate ||= Debate.find_by(id: id)
+      end
+
       private
 
       def user_can_close_debate

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

@@ -11,7 +11,6 @@ module Decidim
       attribute :category_id, Integer
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
-      attribute :debate, Debate
 
       validates :title, presence: true
       validates :description, presence: true
@@ -22,8 +21,6 @@ module Decidim
 
       def map_model(debate)
         super
-        self.debate = debate
-
         # 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
         # user locale is taken as the text locale.
@@ -45,14 +42,18 @@ module Decidim
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+        @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the debate
       def scope_id
-        @scope_id || scope&.id
+        super || scope&.id
+      end
+
+      def debate
+        @debate ||= Debate.find_by(id: id)
       end
 
       private

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

@@ -15,23 +15,14 @@ module Decidim
       # If the debate is official or the rich text editor is enabled on the
       # frontend, the debate description is considered as safe content.
       def safe_content?
-        rich_text_editor_in_public_views? || safe_content_admin?
-      end
-
-      # For admin entered content, the debate body can contain certain extra
-      # tags, such as iframes.
-      def safe_content_admin?
-        debate&.official?
+        debate&.official? || rich_text_editor_in_public_views?
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_debate_description(debate)
-        sanitized = render_sanitized_content(debate, :description)
-        if safe_content?
-          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
-        else
-          Decidim::ContentProcessor.render(sanitized, "div")
-        end
+        description = present(debate).description(strip_tags: !safe_content?, links: true)
+
+        safe_content? ? decidim_sanitize_editor(description) : simple_format(description)
       end
 
       # Returns :text_area or :editor based on current_component settings.
@@ -44,7 +35,7 @@ module Decidim
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.debates.debates.filters.official"))
-        origin_values << TreePoint.new("citizens", t("decidim.debates.debates.filters.citizens"))
+        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?
 
         TreeNode.new(TreePoint.new("", t("decidim.debates.debates.filters.all")), origin_values)

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

@@ -18,13 +18,14 @@ module Decidim
       include Decidim::HasReference
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
       include Decidim::Endorsable
       include Decidim::Randomable
+      include Decidim::FilterableResource
 
       belongs_to :last_comment_by, polymorphic: true, foreign_type: "last_comment_by_type", optional: true
       component_manifest_name "debates"
@@ -53,6 +54,7 @@ module Decidim
           }
         )
       }
+      scope_search_multi :with_any_state, [:open, :closed]
 
       def self.log_presenter_class_for(_log)
         Decidim::Debates::AdminLog::DebatePresenter
@@ -141,7 +143,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Debates::DataPortabilityDebateSerializer
+        Decidim::Debates::DownloadYourDataDebateSerializer
       end
 
       def self.newsletter_participant_ids(component)
@@ -193,6 +195,18 @@ module Decidim
       end
       # rubocop:enable Rails/SkipsModelValidations
 
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      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]
+      end
+
+      def self.ransack(params = {}, options = {})
+        DebateSearch.new(self, params, options)
+      end
+
       private
 
       def comments_blocked?

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

@@ -8,7 +8,6 @@ module Decidim
     class DebatePresenter < Decidim::ResourcePresenter
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
-      include Decidim::SanitizeHelper
       include ActionView::Helpers::DateHelper
 
       def debate
@@ -31,10 +30,16 @@ module Decidim
         super debate.title, links, html_escape, all_locales
       end
 
-      def description(strip_tags: false, extras: true, links: false, all_locales: false)
+      def description(strip_tags: false, links: false, all_locales: false)
         return unless debate
 
-        content_handle_locale(debate.description, all_locales, extras, links, strip_tags)
+        handle_locales(debate.description, all_locales) do |content|
+          content = strip_tags(content) if strip_tags
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          content = renderer.render(links: links).html_safe
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
+          content
+        end
       end
 
       def last_comment_at

data/app/serializers/decidim/debates/{data_portability_debate_serializer.rb → download_your_data_debate_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Debates
-    class DataPortabilityDebateSerializer < Decidim::Exporters::Serializer
-      # Serializes a Debate for data portability
+    class DownloadYourDataDebateSerializer < Decidim::Exporters::Serializer
+      # Serializes a Debate for download your data
       def serialize
         {
           id: resource.id,

data/app/services/decidim/debates/debate_search.rb

@@ -2,35 +2,24 @@
 
 module Decidim
   module Debates
-    # This class handles search and filtering of debates. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the debates.
+    # This service scopes the debate searches with parameters that cannot be
+    # passed from the user interface.
     class DebateSearch < ResourceSearch
-      text_search_fields :title, :description
+      attr_reader :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the debates from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of debates to return per page.
-      def initialize(options = {})
-        super(Debate.not_hidden, options)
-      end
+      def build(params)
+        @activity = params[:activity]
 
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "commented"
-          query.commented_by(user)
-        when "my_debates"
-          query.authored_by(user)
-        else # Assume 'all'
-          query
+        if params[:activity] && user
+          case params[:activity]
+          when "commented"
+            add_scope(:commented_by, user)
+          when "my_debates"
+            add_scope(:authored_by, user)
+          end
         end
-      end
 
-      # Handle the state filter
-      def search_state
-        apply_scopes(%w(open closed), state)
+        super
       end
     end
   end

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_debate" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_debate" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="debates">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,17 +14,17 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
+  <%= form.check_boxes_tree :with_any_state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
   <% end %>
 
   <% if current_participatory_space.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "debates" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "debates" %>
   <% end %>
 
-  <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "debates" %>
+  <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "debates" %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "debates" %>

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

@@ -108,12 +108,12 @@ edit_link(
 
       <% if translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
-          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if translated_attribute(debate.information_updates).present? %>
         <div class="callout success">
-          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
         </div>
       <% end %>
 

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -84,14 +85,13 @@ ar:
         debate:
           participate: مشاركة
         filters:
-          activity: نشاطي
           all: الكل
           category: الفئة
           category_prompt: اختر تصنيف
-          citizens: المواطنين
           my_debates: مناقشاتي
           official: الرسمية
           origin: الأصل
+          participants: المشاركون
           search: بحث
           user_groups: الفِرَق
         filters_small_view:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
@@ -8,8 +9,6 @@ bg:
   decidim:
     debates:
       debates:
-        filters:
-          user_groups: Групи
         show:
           groups_count: Групи
           last_comment_by: Последно коментиран от

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -10,7 +11,6 @@ ca:
         end_time: Data de finalització
         information_updates: Actualitzacions d'informació
         instructions: Instruccions per participar
-        scope_id: Àmbit
         start_time: Data d'inici
         title: Títol
         user_group_id: Crea un debat com
@@ -48,7 +48,7 @@ ca:
     debates:
       actions:
         close: Tanca
-        confirm_destroy: Segur?
+        confirm_destroy: N'estàs segura?
         destroy: Suprimeix
         edit: Edita
         new: Nou %{name}
@@ -118,11 +118,11 @@ ca:
           all: Tots
           category: Categoria
           category_prompt: Selecciona una categoria
-          citizens: Ciutadania
           commented: Comentat
           my_debates: Els meus debats
           official: Oficial
           origin: Origen
+          participants: Participants
           scope: Àmbit
           search: Cerca
           state: Estat

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -10,7 +11,6 @@ cs:
         end_time: Končí v
         information_updates: Aktualizace informací
         instructions: Pokyny k účasti
-        scope_id: Oblast působnosti
         start_time: Začíná v
         title: Titul
         user_group_id: Vytvořte debatu jako
@@ -122,11 +122,11 @@ cs:
           all: Vše
           category: Kategorie
           category_prompt: Vyberte kategorii
-          citizens: Občané
           commented: Okomentováno
           my_debates: Moje rozpravy
           official: Oficiální
           origin: Původ
+          participants: Účastníci
           scope: Oblast působnosti
           search: Hledat
           state: Stav
@@ -164,7 +164,7 @@ cs:
           groups_count: Skupiny
           last_comment_by: Poslední komentář od
           no_comments_yet: Zatím žádné komentáře
-          open: Otevřená diskuse
+          open: Otevřít diskusi
           participants_count: Účastníci
         update:
           invalid: Při aktualizaci rozpravy došlo k chybě.

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da: