decidim-comments 0.14.4 → 0.15.0

data/config/locales/hu.yml

@@ -16,6 +16,8 @@ hu:
   decidim:
     comments:
       comments: Megjegyzések
+      last_activity:
+        new_comment_at_html: "<span>Új megjegyzés: %{link}</span>"
       votes:
         create:
           error: Hiba történt a megjegyzésre való szavazáskor.
@@ -87,6 +89,10 @@ hu:
           email_outro: Ezt az értesítést azért kaptad, mert korábban megemlítettek a(z) "%{resource_title}" témában.
           email_subject: Megemlítettek a(z) %{resource_title} témában
           notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> megemlített itt: <a href="%{resource_path}">%{resource_title}</a>'
+    metrics:
+      comments:
+        object: Hozzászólások
+        title: Hozzászólások
   errors:
     messages:
       cannot_have_comments: nem tudsz megjegyzéseket tenni

data/config/locales/it.yml

@@ -16,6 +16,8 @@ it:
   decidim:
     comments:
       comments: Commenti
+      last_activity:
+        new_comment_at_html: "<span>Nuovo commento al %{link}</span>"
       votes:
         create:
           error: Ci sono stati errori durante la votazione del commento.
@@ -87,6 +89,10 @@ it:
           email_outro: Hai ricevuto questa notifica perché sei stato citato in %{resource_title}.
           email_subject: Sei stato menzionato in %{resource_title}
           notification_title: Sei stato citato in <a href="%{resource_path}">%{resource_title}</a> di <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: Commenti
+        title: Commenti
   errors:
     messages:
       cannot_have_comments: non si possono fare commenti

data/config/locales/nl.yml

@@ -16,6 +16,8 @@ nl:
   decidim:
     comments:
       comments: Comments
+      last_activity:
+        new_comment_at_html: "<span>Nieuwe opmerking op %{link}</span>"
       votes:
         create:
           error: Er zijn fouten geweest bij het stemmen van de reactie.
@@ -87,6 +89,10 @@ nl:
           email_outro: Je hebt deze melding ontvangen omdat je bent getagd in %{resource_title}.
           email_subject: Je bent getagd in %{resource_title}
           notification_title: Je bent getagd in <a href="%{resource_path}">%{resource_title}</a> door <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: opmerkingen
+        title: Comments
   errors:
     messages:
       cannot_have_comments: Kan geen reacties hebben

data/config/locales/pl.yml

@@ -20,6 +20,8 @@ pl:
   decidim:
     comments:
       comments: Komentarze
+      last_activity:
+        new_comment_at_html: "<span>Nowy komentarz na %{link}</span>"
       votes:
         create:
           error: Podczas głosowania komentarza wystąpiły błędy.
@@ -91,6 +93,10 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ wspomniano o nim w %{resource_title}.
           email_subject: Wspomnieliś cie w %{resource_title}
           notification_title: Wspomniałeś w <a href="%{resource_path}">%{resource_title}</a> przez <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: komentarze
+        title: Komentarze
   errors:
     messages:
       cannot_have_comments: Nie może mieć komentarzy

data/config/locales/pt-BR.yml

@@ -16,6 +16,8 @@ pt-BR:
   decidim:
     comments:
       comments: Comentários
+      last_activity:
+        new_comment_at_html: "<span>Novo comentário em %{link}</span>"
       votes:
         create:
           error: Houve erros ao votar o comentário.
@@ -87,6 +89,10 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque você foi mencionado em %{resource_title}.
           email_subject: Você foi mencionado em %{resource_title}
           notification_title: Você foi mencionado em <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: comentários
+        title: Comentários
   errors:
     messages:
       cannot_have_comments: não pode ter comentários

data/config/locales/pt.yml

@@ -16,6 +16,8 @@ pt:
   decidim:
     comments:
       comments: Comentários
+      last_activity:
+        new_comment_at_html: "<span>Novo comentário em %{link}</span>"
       votes:
         create:
           error: Houve erros ao votar o comentário.
@@ -87,6 +89,10 @@ pt:
           email_outro: Você recebeu esta notificação porque você foi mencionado em %{resource_title}.
           email_subject: Você foi mencionado em %{resource_title}
           notification_title: Você foi mencionado em <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: comentários
+        title: Comentários
   errors:
     messages:
       cannot_have_comments: não pode ter comentários

data/config/locales/sv.yml

@@ -16,6 +16,8 @@ sv:
   decidim:
     comments:
       comments: Kommentarer
+      last_activity:
+        new_comment_at_html: "<span>Ny kommentar på %{link}</span>"
       votes:
         create:
           error: Det har blivit fel när du röstar om kommentaren.
@@ -87,6 +89,10 @@ sv:
           email_outro: Du har fått denna notis eftersom du har nämnts i %{resource_title}.
           email_subject: Du har nämnts i %{resource_title}
           notification_title: Du har nämnts i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        object: kommentarer
+        title: kommentarer
   errors:
     messages:
       cannot_have_comments: kan inte ha kommentarer

data/db/migrate/20181003080320_fix_user_groups_ids_in_comments.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class FixUserGroupsIdsInComments < ActiveRecord::Migration[5.2]
+  # rubocop:disable Rails/SkipsModelValidations
+  def change
+    Decidim::UserGroup.find_each do |group|
+      old_id = group.extended_data["old_user_group_id"]
+      next unless old_id
+
+      Decidim::Comments::Comment
+        .where(decidim_user_group_id: old_id)
+        .update_all(decidim_user_group_id: group.id)
+    end
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+end

data/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class MakeAuthorsPolymorphicForComments < ActiveRecord::Migration[5.2]
+  class Comment < ApplicationRecord
+    self.table_name = :decidim_comments_comments
+  end
+  def change
+    add_column :decidim_comments_comments, :decidim_author_type, :string
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_comments_comments
+          SET decidim_author_type = 'Decidim::UserBaseEntity'
+        SQL
+      end
+    end
+
+    add_index :decidim_comments_comments,
+              [:decidim_author_id, :decidim_author_type],
+              name: "index_decidim_comments_comments_on_decidim_author"
+
+    change_column_null :decidim_comments_comments, :decidim_author_id, false
+    change_column_null :decidim_comments_comments, :decidim_author_type, false
+    Comment.reset_column_information
+  end
+end

data/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class MakeAuthorPolymorphicForCommentVotes < ActiveRecord::Migration[5.2]
+  class CommentVote < ApplicationRecord
+    self.table_name = :decidim_comments_comment_votes
+  end
+  def change
+    add_column :decidim_comments_comment_votes, :decidim_author_type, :string
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_comments_comment_votes
+          SET decidim_author_type = 'Decidim::UserBaseEntity'
+        SQL
+      end
+    end
+
+    add_index :decidim_comments_comment_votes,
+              [:decidim_author_id, :decidim_author_type],
+              name: "index_decidim_comments_comment_votes_on_decidim_author"
+
+    change_column_null :decidim_comments_comment_votes, :decidim_author_id, false
+    change_column_null :decidim_comments_comment_votes, :decidim_author_type, false
+    CommentVote.reset_column_information
+  end
+end

data/lib/decidim/comments/engine.rb

@@ -42,6 +42,15 @@ module Decidim
           end
         end
       end
+
+      initializer "decidim_comments.register_metrics" do
+        Decidim.metrics_registry.register(
+          :comments,
+          "Decidim::Comments::Metrics::CommentsMetricManage",
+          Decidim::MetricRegistry::NOT_HIGHLIGHTED,
+          6
+        )
+      end
     end
   end
 end

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

@@ -8,6 +8,19 @@ FactoryBot.define do
     commentable { build(:dummy_resource) }
     root_commentable { commentable }
     body { Faker::Lorem.paragraph }
+
+    trait :comment_on_comment do
+      author { build(:user, organization: root_commentable.organization) }
+      commentable do
+        build(
+          :comment,
+          author: author,
+          root_commentable: root_commentable,
+          commentable: root_commentable
+        )
+      end
+      root_commentable { build(:dummy_resource) }
+    end
   end
 
   factory :comment_vote, class: "Decidim::Comments::CommentVote" do

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -83,6 +83,7 @@ files:
 - app/assets/javascripts/decidim/comments/bundle.js
 - app/assets/javascripts/decidim/comments/bundle.js.map
 - app/assets/javascripts/decidim/comments/comments.js.erb
+- app/cells/decidim/comments/comment_activity_cell.rb
 - app/commands/decidim/comments/create_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
 - app/events/decidim/comments/comment_by_followed_user_event.rb
@@ -137,6 +138,7 @@ files:
 - app/models/decidim/comments/comment.rb
 - app/models/decidim/comments/comment_vote.rb
 - app/models/decidim/comments/seed.rb
+- app/queries/decidim/comments/metrics/comments_metric_manage.rb
 - app/queries/decidim/comments/sorted_comments.rb
 - app/resolvers/decidim/comments/vote_comment_resolver.rb
 - app/services/decidim/comments/comment_creation.rb
@@ -170,6 +172,9 @@ files:
 - db/migrate/20170504085413_add_root_commentable_to_comments.rb
 - db/migrate/20170510091348_update_root_commentable_for_comments.rb
 - db/migrate/20170510091409_set_root_commentable_null_constraints.rb
+- db/migrate/20181003080320_fix_user_groups_ids_in_comments.rb
+- db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
+- db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
 - db/seeds.rb
 - lib/decidim/comments.rb
 - lib/decidim/comments/admin.rb
@@ -209,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim comments module