decidim-debates 0.23.2 → 0.24.0

data/config/locales/sv.yml

@@ -187,10 +187,16 @@ sv:
           email_subject: Debatter är nu tillgängliga i %{participatory_space_title}
           notification_title: Nu kan du starta <a href="%{resource_path}">nya debatter</a> i <a href="%{participatory_space_url}">%{participatory_space_title}</a>
         debate_closed:
-          email_intro: 'Debatten "%{resource_title}" stängdes. Du kan läsa slutsatserna från dess sida:'
-          email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa det på föregående länk.
-          email_subject: Debatten "%{resource_title}" stängdes
-          notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> stängdes.
+          affected_user:
+            email_intro: 'Debatten "%{resource_title}" stängdes. Du kan läsa slutsatserna från dess sida:'
+            email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa det på föregående länk.
+            email_subject: Debatten "%{resource_title}" stängdes
+            notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> stängdes.
+          follower:
+            email_intro: 'Debatten "%{resource_title}" stängdes. Du kan läsa slutsatserna från dess sida:'
+            email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa det på föregående länk.
+            email_subject: Debatten "%{resource_title}" stängdes
+            notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> stängdes.
     gamification:
       badges:
         commented_debates:

data/config/locales/tr-TR.yml

@@ -65,6 +65,10 @@ tr:
           edit:
             title: Tartışmayı düzenle
             update: Tartışmayı güncelle
+          form:
+            debate_type: Tartışma türü
+            finite: Sonlu (Başlangıç ​​ve bitiş saatleri ile)
+            open: Açık (Başlangıç ​​veya bitiş zamanı yok)
           index:
             title: Tartışmalar
           new:
@@ -73,6 +77,8 @@ tr:
           update:
             invalid: Bu tartışmayı güncellerken bir sorun oluştu.
             success: Tartışma başarıyla güncellendi.
+        exports:
+          comments: Yorumlar
         models:
           debate:
             name: Tartışma
@@ -152,6 +158,7 @@ tr:
           groups_count: Gruplar
           last_comment_by: Son yorum
           no_comments_yet: Henüz yorum yok
+          open: Açık tartışma
           participants_count: Katılımcılar
         update:
           invalid: Bu tartışmayı güncellerken bir sorun oluştu.
@@ -200,10 +207,16 @@ tr:
           email_subject: Tartışmalar artık %{participatory_space_title} içinde mevcut
           notification_title: Artık <a href="%{participatory_space_url}">%{participatory_space_title} </a> ’de <a href="%{resource_path}"> yeni tartışmalar </a> başlatabilirsiniz
         debate_closed:
-          email_intro: '"%{resource_title}" tartışması kapatıldı. Sonuçları sayfasından okuyabilirsiniz:'
-          email_outro: Bu bildirimi, "%{resource_title}" tartışmasını takip ettiğiniz için aldınız. Önceki bağlantıdan takibini bırakabilirsiniz.
-          email_subject: '"%{resource_title}" tartışması kapatıldı'
-          notification_title: <a href="%{resource_path}">%{resource_title} </a> tartışması kapatıldı.
+          affected_user:
+            email_intro: '"%{resource_title}" tartışması kapatıldı. Sonuçları sayfasından okuyabilirsiniz:'
+            email_outro: Bu bildirimi, "%{resource_title}" tartışmasını takip ettiğiniz için aldınız. Önceki bağlantıdan takibini bırakabilirsiniz.
+            email_subject: '"%{resource_title}" tartışması kapatıldı'
+            notification_title: <a href="%{resource_path}">%{resource_title} </a> tartışması kapatıldı.
+          follower:
+            email_intro: '"%{resource_title}" tartışması kapatıldı. Sonuçları sayfasından okuyabilirsiniz:'
+            email_outro: Bu bildirimi, "%{resource_title}" tartışmasını takip ettiğiniz için aldınız. Önceki bağlantıdan takibini bırakabilirsiniz.
+            email_subject: '"%{resource_title}" tartışması kapatıldı'
+            notification_title: <a href="%{resource_path}">%{resource_title} </a> tartışması kapatıldı.
     gamification:
       badges:
         commented_debates:

data/config/locales/zh-CN.yml

@@ -195,10 +195,16 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
           email_subject: 在 %{participatory_space_title} 中可以使用的辩论
         debate_closed:
-          email_intro: '"%{resource_title}"辩论已经关闭。您可以从其页面阅读结论：'
-          email_outro: 您收到此通知是因为您正在关注"%{resource_title}"的辩论。您可以从上一个链接取消跟进。
-          email_subject: '"%{resource_title}"辩论已关闭'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> 辩论已经结束。
+          affected_user:
+            email_intro: '"%{resource_title}"辩论已经关闭。您可以从其页面阅读结论：'
+            email_outro: 您收到此通知是因为您正在关注"%{resource_title}"的辩论。您可以从上一个链接取消跟进。
+            email_subject: '"%{resource_title}"辩论已关闭'
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> 辩论已经结束。
+          follower:
+            email_intro: '"%{resource_title}"辩论已经关闭。您可以从其页面阅读结论：'
+            email_outro: 您收到此通知是因为您正在关注"%{resource_title}"的辩论。您可以从上一个链接取消跟进。
+            email_subject: '"%{resource_title}"辩论已关闭'
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> 辩论已经结束。
     gamification:
       badges:
         commented_debates:

data/db/migrate/20200930145546_add_scope_to_debates_debate.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddScopeToDebatesDebate < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :decidim_debates_debates, :decidim_scope, foreign_key: true, index: true
+  end
+end

data/db/migrate/20201126112752_archive_debates.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class ArchiveDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :archived_at, :datetime
+    add_index :decidim_debates_debates, :archived_at
+  end
+end

data/db/migrate/20210125101735_revert_archive_debates.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RevertArchiveDebates < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :decidim_debates_debates, :archived_at
+    remove_column :decidim_debates_debates, :archived_at
+  end
+end

data/db/migrate/20210310120652_add_followable_counter_cache_to_debates.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Debates::Debate.reset_column_information
+        Decidim::Debates::Debate.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/api/debate_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DebateType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AuthorableInterface
+      implements Decidim::Core::ScopableInterface
+
+      description "A debate"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this debate", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this debate", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this debate", null: true
+      field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate", null: true
+      field :start_time, Decidim::Core::DateTimeType, "The start time for this debate", null: true
+      field :end_time, Decidim::Core::DateTimeType, "The end time for this debate", null: true
+      field :image, GraphQL::Types::String, "The image of this debate", null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this debate was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this debate was updated", null: true
+      field :information_updates, Decidim::Core::TranslatedFieldType, "The information updates for this debate", null: true
+      field :reference, GraphQL::Types::String, "The reference for this debate", null: true
+    end
+  end
+end

data/lib/decidim/api/debates_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DebatesType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Debates"
+      description "A debates component of a participatory space."
+
+      field :debates, Decidim::Debates::DebateType.connection_type, null: true, connection: true
+
+      def debates
+        Debate.where(component: object).includes(:component)
+      end
+
+      field :debate, Decidim::Debates::DebateType, null: true do
+        argument :id, GraphQL::Types::ID, required: true
+      end
+
+      def debate(**args)
+        Debate.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

data/lib/decidim/debates.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/debates/admin"
+require "decidim/debates/api"
 require "decidim/debates/engine"
 require "decidim/debates/admin_engine"
 require "decidim/debates/component"

data/lib/decidim/debates/admin_engine.rb

@@ -21,6 +21,10 @@ module Decidim
       def load_seed
         nil
       end
+
+      initializer "decidim_debates.admin_assets" do |app|
+        app.config.assets.precompile += %w(admin/decidim_debates_manifest.js)
+      end
     end
   end
 end

data/lib/decidim/debates/api.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    autoload :DebateType, "decidim/api/debate_type"
+    autoload :DebatesType, "decidim/api/debates_type"
+  end
+end

data/lib/decidim/debates/component.rb

@@ -50,12 +50,23 @@ Decidim.register_component(:debates) do |component|
   component.register_resource(:debate) do |resource|
     resource.model_class_name = "Decidim::Debates::Debate"
     resource.card = "decidim/debates/debate"
+    resource.reported_content_cell = "decidim/debates/reported_content"
     resource.searchable = true
     resource.actions = %w(create endorse)
   end
 
   component.actions = %w(create endorse)
 
+  component.exports :comments do |exports|
+    exports.collection do |component_instance|
+      Decidim::Comments::Export.comments_for_resource(
+        Decidim::Debates::Debate, component_instance
+      )
+    end
+
+    exports.serializer Decidim::Comments::CommentSerializer
+  end
+
   component.seeds do |participatory_space|
     admin_user = Decidim::User.find_by(
       organization: participatory_space.organization,
@@ -83,19 +94,20 @@ Decidim.register_component(:debates) do |component|
       Decidim::Component.create!(params)
     end
 
-    3.times do
+    5.times do |x|
+      finite = x != 2
       params = {
         component: component,
         category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
-        start_time: 3.weeks.from_now,
-        end_time: 3.weeks.from_now + 4.hours,
+        start_time: (3.weeks.from_now if finite),
+        end_time: (3.weeks.from_now + 4.hours if finite),
         author: component.organization
       }
 
@@ -111,7 +123,7 @@ Decidim.register_component(:debates) do |component|
 
     closed_debate = Decidim::Debates::Debate.last
     closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
+      Decidim::Faker::Localized.paragraph(sentence_count: 3)
     end
     closed_debate.closed_at = Time.current
     closed_debate.save!
@@ -119,12 +131,12 @@ Decidim.register_component(:debates) do |component|
     params = {
       component: component,
       category: participatory_space.categories.sample,
-      title: Decidim::Faker::Localized.sentence(2),
+      title: Decidim::Faker::Localized.sentence(word_count: 2),
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
+        Decidim::Faker::Localized.paragraph(sentence_count: 3)
       end,
       instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
+        Decidim::Faker::Localized.paragraph(sentence_count: 3)
       end,
       author: user
     }

data/lib/decidim/debates/test/factories.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def generate_localized_debate_title
-  Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> " + generate(:title) }
+  Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
 end
 
 FactoryBot.define do

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.23.2"
+      "0.24.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.24.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -81,28 +81,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.2
+        version: 0.24.0
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -115,17 +115,22 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/config/admin/decidim_debates_manifest.js
 - app/assets/config/decidim_debates_manifest.js
 - app/assets/images/decidim/debates/icon.svg
 - app/assets/images/decidim/gamification/badges/commented_debates.svg
+- app/assets/javascripts/decidim/debates/admin/debates.js.es6
 - app/cells/decidim/debates/debate_activity_cell.rb
 - app/cells/decidim/debates/debate_cell.rb
 - app/cells/decidim/debates/debate_m/data.erb
 - app/cells/decidim/debates/debate_m/footer.erb
 - app/cells/decidim/debates/debate_m/multiple_dates.erb
+- app/cells/decidim/debates/debate_m/open_date.erb
 - app/cells/decidim/debates/debate_m/single_date.erb
 - app/cells/decidim/debates/debate_m/tags.erb
 - app/cells/decidim/debates/debate_m_cell.rb
+- app/cells/decidim/debates/reported_content/show.erb
+- app/cells/decidim/debates/reported_content_cell.rb
 - app/commands/decidim/debates/admin/close_debate.rb
 - app/commands/decidim/debates/admin/create_debate.rb
 - app/commands/decidim/debates/admin/update_debate.rb
@@ -167,8 +172,6 @@ files:
 - app/serializers/decidim/debates/data_portability_debate_serializer.rb
 - app/services/decidim/debates/debate_search.rb
 - app/services/decidim/debates/diff_renderer.rb
-- app/types/decidim/debates/debate_type.rb
-- app/types/decidim/debates/debates_type.rb
 - app/views/decidim/debates/admin/debate_closes/edit.html.erb
 - app/views/decidim/debates/admin/debates/_form.html.erb
 - app/views/decidim/debates/admin/debates/edit.html.erb
@@ -271,9 +274,16 @@ files:
 - db/migrate/20200716143929_add_endorsable_to_debates.rb
 - db/migrate/20200827154116_add_commentable_counter_cache_to_debates.rb
 - db/migrate/20200902133452_add_cached_comment_metadata_to_debates.rb
+- db/migrate/20200930145546_add_scope_to_debates_debate.rb
+- db/migrate/20201126112752_archive_debates.rb
+- db/migrate/20210125101735_revert_archive_debates.rb
+- db/migrate/20210310120652_add_followable_counter_cache_to_debates.rb
+- lib/decidim/api/debate_type.rb
+- lib/decidim/api/debates_type.rb
 - lib/decidim/debates.rb
 - lib/decidim/debates/admin.rb
 - lib/decidim/debates/admin_engine.rb
+- lib/decidim/debates/api.rb
 - lib/decidim/debates/component.rb
 - lib/decidim/debates/engine.rb
 - lib/decidim/debates/test/factories.rb
@@ -290,14 +300,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim debates module