decidim-debates 0.23.5 → 0.24.2

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.5"
+      "0.24.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.24.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-07 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.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -81,28 +81,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 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

data/app/types/decidim/debates/debate_type.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    DebateType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::CategorizableInterface },
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::AuthorableInterface }
-      ]
-
-      name "Debate"
-      description "A debate"
-
-      field :id, !types.ID, "The internal ID for this debate"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this debate"
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this debate"
-      field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate"
-      field :startTime, Decidim::Core::DateTimeType, "The start time for this debate", property: :start_time
-      field :endTime, Decidim::Core::DateTimeType, "The end time for this debate", property: :end_time
-      field :image, types.String, "The image of this debate"
-      field :createdAt, Decidim::Core::DateTimeType, "When this debate was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this debate was updated", property: :updated_at
-      field :informationUpdates, Decidim::Core::TranslatedFieldType, "The information updates for this debate", property: :information_updates
-      field :reference, types.String, "The reference for this debate"
-    end
-  end
-end

data/app/types/decidim/debates/debates_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    DebatesType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Debates"
-      description "A debates component of a participatory space."
-
-      connection :debates, DebateType.connection_type do
-        resolve ->(component, _args, _ctx) {
-          DebatesTypeHelper.base_scope(component).includes(:component)
-        }
-      end
-
-      field(:debate, DebateType) do
-        argument :id, !types.ID
-
-        resolve ->(component, args, _ctx) {
-          DebatesTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
-    end
-
-    module DebatesTypeHelper
-      def self.base_scope(component)
-        Debate.where(component: component)
-      end
-    end
-  end
-end