decidim-debates 0.28.6 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a060d6fd145a276a8b0919dfb15c745a107a76aab46d53a0c5a052445bc9be
-  data.tar.gz: 8840a4c0f79d976a41b3bae420faeb42de0b074daec28061777dcb0f96a7a34d
+  metadata.gz: 9c682db594758ac0c952f730441f2045d97cc3a554f8a0697fcc3df4aa093f9f
+  data.tar.gz: a65c9d155fe1f94b1f0bde4e1911f08ec05a37e9bb7da4ef903a6e0fcb67045c
 SHA512:
-  metadata.gz: 5a5dab0df77082191fe4e3a98d094c0f254f83077326fece1cafdf6775049ff510024004c62f57d9e5ff72f3d4a3e1ec8bc6df2978388e33fb465f79aebe6e06
-  data.tar.gz: 4292bd8f946a02d7467ee269bb2c55bd15347e7353a0c322e3c00a22df80ace2da734d861800bf3fdb89ae1dec789525549f360ba772dca71eddacfc522da096
+  metadata.gz: cc001f2b6a6ca4f3176db1f6f3ae2d71976945659ae5e13e09dcde996858f54c350f755d0adddf618a16e0f3b781040f5072deb387377e6699626c4ab4c2f571
+  data.tar.gz: 6ae0b994eb7f795b329e6c91cf2423a90c8e12e6548d61bb7d3a0656c12d0a93923eeec9bdc22eaf0b94993867e5942035419c43e9faf089718e26f94fb8dda3

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

@@ -4,49 +4,14 @@ module Decidim
   module Debates
     module Admin
       # A command with all the business logic when an admin closes a debate.
-      class CloseDebate < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form         - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid, together with the debate.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          close_debate
-          broadcast(:ok, debate)
-        end
-
+      class CloseDebate < Decidim::Debates::CloseDebate
         private
 
-        attr_reader :form
-
-        def close_debate
-          @debate = Decidim.traceability.perform_action!(
-            :close,
-            form.debate,
-            form.current_user
-          ) do
-            form.debate.update!(
-              conclusions: form.conclusions,
-              closed_at: form.closed_at
-            )
-          end
-
-          Decidim::EventsManager.publish(
-            event: "decidim.events.debates.debate_closed",
-            event_class: Decidim::Debates::CloseDebateEvent,
-            resource: debate,
-            followers: debate.followers
-          )
+        def attributes
+          {
+            conclusions: form.conclusions,
+            closed_at: form.closed_at
+          }
         end
       end
     end

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

@@ -5,59 +5,33 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Debate from the admin
       # panel.
-      class CreateDebate < Decidim::Command
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the debate if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      class CreateDebate < Decidim::Commands::CreateResource
+        fetch_form_attributes :category, :component, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
 
-          transaction do
-            create_debate
-            send_notification_to_space_followers
-          end
-          broadcast(:ok)
-        end
+        protected
 
-        private
+        def resource_class = Decidim::Debates::Debate
 
-        attr_reader :debate, :form
+        def extra_params = { visibility: "all" }
 
-        def create_debate
+        def attributes
           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
-          params = {
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            information_updates: form.information_updates,
-            instructions: form.instructions,
-            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,
-            comments_enabled: form.comments_enabled
-          }
-
-          @debate = Decidim.traceability.create!(
-            Debate,
-            form.current_user,
-            params,
-            visibility: "all"
-          )
+          super.merge({
+                        author: form.current_organization,
+                        title: parsed_title,
+                        description: parsed_description,
+                        end_time: (form.end_time if form.finite),
+                        start_time: (form.start_time if form.finite)
+                      })
         end
 
-        def send_notification_to_space_followers
+        def run_after_hooks
           Decidim::EventsManager.publish(
             event: "decidim.events.debates.debate_created",
             event_class: Decidim::Debates::CreateDebateEvent,
-            resource: debate,
-            followers: form.current_component.participatory_space.followers,
+            resource:,
+            followers: form.component.participatory_space.followers,
             extra: {
               type: "participatory_space"
             }

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

@@ -5,47 +5,19 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Debate from the admin
       # panel.
-      class UpdateDebate < Decidim::Command
-        # Initializes a UpdateDebate Command.
-        #
-        # form - The form from which to get the data.
-        # debate - The current instance of the page to be updated.
-        def initialize(form, debate)
-          @form = form
-          @debate = debate
-        end
-
-        # Updates the debate if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_debate
-          broadcast(:ok)
-        end
+      class UpdateDebate < Decidim::Commands::UpdateResource
+        fetch_form_attributes :category, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
 
         private
 
-        attr_reader :debate, :form
-
-        def update_debate
+        def attributes
           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
 
-          Decidim.traceability.update!(
-            debate,
-            form.current_user,
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            information_updates: form.information_updates,
-            instructions: form.instructions,
-            end_time: form.end_time,
-            start_time: form.start_time,
-            scope: form.scope,
-            comments_enabled: form.comments_enabled
-          )
+          super.merge({
+                        title: parsed_title,
+                        description: parsed_description
+                      })
         end
       end
     end

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

@@ -4,33 +4,30 @@ module Decidim
   module Debates
     # This command is executed when the user creates a Debate from the public
     # views.
-    class CreateDebate < Decidim::Command
-      def initialize(form)
-        @form = form
-      end
+    class CreateDebate < Decidim::Commands::CreateResource
+      fetch_form_attributes :category, :scope
+
+      private
 
-      # Creates the debate if valid.
-      #
-      # Broadcasts :ok if successful, :invalid otherwise.
-      def call
-        return broadcast(:invalid) if form.invalid?
+      def resource_class = Decidim::Debates::Debate
 
+      def extra_params = { visibility: "public-only" }
+
+      def create_resource
         with_events(with_transaction: true) do
-          create_debate
+          super
         end
+      end
+
+      def run_after_hooks
         send_notification_to_author_followers
         send_notification_to_space_followers
         follow_debate
-        broadcast(:ok, debate)
       end
 
-      private
-
-      attr_reader :debate, :form
-
       def event_arguments
         {
-          resource: debate,
+          resource:,
           extra: {
             event_author: form.current_user,
             locale:
@@ -38,37 +35,25 @@ module Decidim
         }
       end
 
-      def create_debate
+      def attributes
         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
-        params = {
-          author: form.current_user,
-          decidim_user_group_id: form.user_group_id,
-          category: form.category,
-          title: {
-            I18n.locale => parsed_title
-          },
-          description: {
-            I18n.locale => parsed_description
-          },
-          scope: form.scope,
-          component: form.current_component
-        }
 
-        @debate = Decidim.traceability.create!(
-          Debate,
-          form.current_user,
-          params,
-          visibility: "public-only"
-        )
+        super.merge({
+                      author: form.current_user,
+                      decidim_user_group_id: form.user_group_id,
+                      title: { I18n.locale => parsed_title },
+                      description: { I18n.locale => parsed_description },
+                      component: form.current_component
+                    })
       end
 
       def send_notification_to_author_followers
         Decidim::EventsManager.publish(
           event: "decidim.events.debates.debate_created",
           event_class: Decidim::Debates::CreateDebateEvent,
-          resource: debate,
-          followers: debate.author.followers,
+          resource:,
+          followers: resource.author.followers,
           extra: {
             type: "user"
           }
@@ -79,8 +64,8 @@ module Decidim
         Decidim::EventsManager.publish(
           event: "decidim.events.debates.debate_created",
           event_class: Decidim::Debates::CreateDebateEvent,
-          resource: debate,
-          followers: debate.participatory_space.followers,
+          resource:,
+          followers: resource.participatory_space.followers,
           extra: {
             type: "participatory_space"
           }
@@ -89,9 +74,9 @@ module Decidim
 
       def follow_debate
         follow_form = Decidim::FollowForm
-                      .from_params(followable_gid: debate.to_signed_global_id.to_s)
-                      .with_context(current_user: debate.author)
-        Decidim::CreateFollow.call(follow_form, debate.author)
+                      .from_params(followable_gid: resource.to_signed_global_id.to_s)
+                      .with_context(current_user: resource.author)
+        Decidim::CreateFollow.call(follow_form)
       end
     end
   end

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

@@ -3,38 +3,20 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class UpdateDebate < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # form         - A form object with the params.
-      def initialize(form)
-        @form = form
-      end
+    class UpdateDebate < Decidim::Commands::UpdateResource
+      fetch_form_attributes :category, :scope
 
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid, together with the debate.
-      # - :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)
+      private
 
+      def update_resource
         with_events(with_transaction: true) do
-          update_debate
+          super
         end
-
-        broadcast(:ok, @debate)
       end
 
-      private
-
-      attr_reader :form
-
       def event_arguments
         {
-          resource: @debate,
+          resource:,
           extra: {
             event_author: form.current_user,
             locale:
@@ -42,28 +24,16 @@ module Decidim
         }
       end
 
-      def update_debate
-        @debate = Decidim.traceability.update!(
-          @form.debate,
-          @form.current_user,
-          attributes,
-          visibility: "public-only"
-        )
-      end
+      def extra_params = { visibility: "public-only" }
 
       def attributes
         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
-        {
-          category: form.category,
-          title: {
-            I18n.locale => parsed_title
-          },
-          description: {
-            I18n.locale => parsed_description
-          },
-          scope: form.scope
-        }
+
+        super.merge({
+                      title: { I18n.locale => parsed_title },
+                      description: { I18n.locale => parsed_description }
+                    })
       end
     end
   end

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

@@ -54,7 +54,7 @@ module Decidim
 
         @form = form(DebateForm).from_params(params)
 
-        UpdateDebate.call(@form) do
+        UpdateDebate.call(@form, debate) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.update.success", scope: "decidim.debates")
             redirect_to Decidim::ResourceLocatorPresenter.new(debate).path

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

@@ -9,7 +9,7 @@ module Decidim
       include Decidim::ResourceVersionsConcern
 
       def versioned_resource
-        @versioned_resource ||= present(Debate.where(component: current_component).not_hidden.find(params[:debate_id]))
+        @versioned_resource ||= present(Debate.where(component: current_component).find(params[:debate_id]))
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Decidim
     #
     # "user" - The event is being sent to the followers of the debate
     #          author
-    # "participatory_space" - The event is being sento to the followers
+    # "participatory_space" - The event is being sent to the followers
     #                         of the event's participatory space.
     class CreateDebateEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent

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

@@ -9,7 +9,7 @@ module Decidim
 
         mimic :debate
 
-        translatable_attribute :conclusions, Decidim::Attributes::RichText 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

@@ -8,9 +8,9 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :description, Decidim::Attributes::RichText
-        translatable_attribute :instructions, Decidim::Attributes::RichText
-        translatable_attribute :information_updates, Decidim::Attributes::RichText
+        translatable_attribute :description, String
+        translatable_attribute :instructions, String
+        translatable_attribute :information_updates, String
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_category_id, Integer
@@ -43,7 +43,7 @@ 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.
+        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
         #
         # Returns a Decidim::Scope
         def scope

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

@@ -74,6 +74,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]
@@ -81,7 +86,7 @@ module Decidim
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
       def reported_searchable_content_extras
-        [normalized_author.name]
+        [author_name]
       end
 
       # Public: Calculates whether the current debate is an AMA-styled one or not.

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

@@ -13,8 +13,6 @@ module Decidim
         case permission_action.action
         when :create
           toggle_allow(can_create_debate?)
-        when :read
-          toggle_allow(!debate.hidden?)
         when :report
           allow!
         when :edit

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

@@ -1,11 +1,11 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section debate-fields">
-       <div class="row column hashtags__container">
+       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
 
-       <div class="row column hashtags__container">
+       <div class="row column">
         <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
       </div>
 

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

@@ -16,7 +16,7 @@
           <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 class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
+          <th><%= t("actions.title", scope: "decidim.debates") %></th>
         </tr>
       </thead>
       <tbody>

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/index.html.erb

@@ -1,12 +1,3 @@
-<% add_decidim_meta_tags(
-  description: translated_attribute(current_participatory_space.short_description),
-  title: t("decidim.components.pagination.page_title",
-           component_name:,
-           current_page: paginated_debates.current_page,
-           total_pages: paginated_debates.total_pages ),
-  url: debates_url,
-  resource: current_component) %>
-
 <% content_for :aside do %>
   <h1 class="title-decorator"><%= component_name %></h1>
 

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">

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

@@ -30,7 +30,7 @@ edit_link(
     <div class="layout-author">
       <%= cell "decidim/author", debate_presenter.author, skip_profile_link: true %>
       <% if debate.closed? %>
-        <span class="success label proposal-status">
+        <span class="success label">
           <%= t("debate_closed", scope: "decidim.debates.debates.show") %>
         </span>
       <% end %>

data/config/locales/ar.yml

@@ -88,7 +88,6 @@ ar:
           origin: الأصل
           participants: المشاركون
           search: بحث
-          user_group: الفِرَق
         form:
           select_a_category: الرجاء تحديد الفئة
         index:
@@ -96,8 +95,8 @@ ar:
         new:
           back: الى الخلف
           create: إنشاء
+          title: نقاش جديد
         show:
-          edit_debate: تحرير النقاش
           groups_count: الفِرَق
           participants_count: المشاركون
       models:

data/config/locales/bg.yml

@@ -80,6 +80,8 @@ bg:
           update:
             invalid: Възникна проблем при актуализирането на този дебат.
             success: Дебатът беше актуализиран успешно.
+        exports:
+          comments: Коментари
       admin_log:
         debate:
           close: "%{user_name} затвори дебата %{resource_name} в пространството %{space_name}"
@@ -132,6 +134,7 @@ bg:
         new:
           back: Назад
           create: Създаване
+          title: Нов дебат
         orders:
           commented: Най-коментирани
           label: Подреждане на дебатите по

data/config/locales/ca.yml

@@ -134,7 +134,7 @@ ca:
         new:
           back: Torna
           create: Crear
-          title: Crear un debat
+          title: Nou debat
         orders:
           commented: Més comentats
           label: Ordenar debats per

data/config/locales/cs.yml

@@ -23,10 +23,10 @@ cs:
   activerecord:
     models:
       decidim/debates/debate:
-        one: Debata
+        one: Rozprava
         few: Debaty
-        many: Debat
-        other: Debat
+        many: Debaty
+        other: Debaty
   decidim:
     components:
       debates:
@@ -121,7 +121,7 @@ cs:
           category: Kategorie
           category_prompt: Vyberte kategorii
           commented: Okomentováno
-          my_debates: Moje debaty
+          my_debates: Moje rozpravy
           official: Oficiální
           origin: Původ
           participants: Účastníci
@@ -138,10 +138,10 @@ cs:
         new:
           back: Zpět
           create: Vytvořit
-          title: Vytvořit novou debatu
+          title: Nová debata
         orders:
           commented: Nejvíce komentované
-          label: Řazení debat podle
+          label: Řazení rozprav podle
           random: Náhodné pořadí
           recent: Nejnovější
           updated: Naposledy aktualizované
@@ -155,7 +155,7 @@ cs:
           open: Otevřená diskuse
           participants_count: Účastníci
         update:
-          invalid: Při aktualizaci debaty došlo k chybě.
+          invalid: Při aktualizaci rozpravy došlo k chybě.
           success: Debata byla úspěšně aktualizována.
       last_activity:
         debate_updated: 'Debata aktualizována:'