decidim-comments 0.24.1 → 0.25.0.rc2

data/config/locales/pt.yml

@@ -57,7 +57,6 @@ pt:
             spam: Contém clickbait, publicidade, fraudes ou robots de scripts.
           title: Reportar conteúdo impróprio
         show_replies: Mostrar %{replies_count} respostas
-        single_comment_link_title: Obter hiperligação para um único comentário
       comment_order_selector:
         order:
           best_rated: Melhores avaliações

data/config/locales/ro-RO.yml

@@ -21,6 +21,10 @@ ro:
       comments:
         create:
           error: A apărut o problemă la crearea comentariului.
+        delete:
+          error: Comentariul nu a putut fi șters.
+        update:
+          error: A apărut o eroare la actualizarea comentariului.
       comments_count: Numărul de comentarii
       comments_title: Comentarii
       last_activity:
@@ -41,7 +45,13 @@ ro:
           user_group_id:
             label: Comentează ca
         opinion:
+          label: Opinia dumneavoastră despre acest subiect
+          negative: Negativ
+          negative_selected: Opinia ta despre acest subiect este negativă
           neutral: Neutral
+          neutral_selected: Opinia dumneavoastră despre acest subiect este neutră
+          positive: Pozitiv
+          positive_selected: Opinia dumneavoastră despre acest subiect este pozitivă
         remaining_characters: "%{count} caractere rămase"
         remaining_characters_1: "%{count} caracter rămas"
         title: Adaugă comentariul tău
@@ -49,7 +59,12 @@ ro:
         alignment:
           against: Împotriva
           in_favor: În favoarea
+        confirm_destroy: Sunteţi sigur că doriţi să ştergeţi acest comentariu?
+        delete: Șterge
+        deleted_at: Comentariu șters pe %{date}
         deleted_user: Participant șters
+        edit: Editează
+        edited: Editat
         hide_replies: Ascunde răspunsurile
         reply: Răspuns
         report:
@@ -64,7 +79,7 @@ ro:
             spam: Conține clickbait, publicitate, escrocherii sau roboți script.
           title: Raportează conținut nepotrivit
         show_replies: Arată %{replies_count} răspunsuri
-        single_comment_link_title: Obțineți link-ul către un singur comentariu
+        single_comment_link_title: Obţine linkul
       comment_order_selector:
         order:
           best_rated: Cele mai apreciate
@@ -75,6 +90,7 @@ ro:
       comment_thread:
         title: Conversație cu %{authorName}
       comments:
+        blocked_comments_for_unauthorized_user_warning: Trebuie să fiți verificat pentru a face comentarii în acest moment, dar le puteți citi pe cele anterioare.
         blocked_comments_for_user_warning: Nu poți comenta în acest moment, dar le poți citi pe cele anterioare.
         blocked_comments_warning: Comentariile sunt dezactivate în acest moment, dar le puteți citi pe cele anterioare.
         comment_details_title: Detalii comentariu
@@ -87,6 +103,14 @@ ro:
           other: "%{count} comentarii"
       down_vote_button:
         text: Nu sunt de acord cu acest comentariu
+      edit_comment_modal_form:
+        close: Închide
+        form:
+          body:
+            label: Comentariu
+            placeholder: Ce părere aveţi despre asta?
+          submit: Trimite
+        title: Editează comentariul tău
       up_vote_button:
         text: Sunt de acord cu acest comentariu
     events:

data/config/locales/sk.yml

@@ -59,7 +59,6 @@ sk:
             offensive: Obsahuje rasizmus, sexizmus, urážky, osobné útoky, vyhrážky alebo inú podobu nenávistného prejavu.
             spam: Obsahuje clickbait, reklamy, scam alebo je to skriptovací robot.
         show_replies: Zobraziť %{replies_count} odpovedí
-        single_comment_link_title: Odkaz na komentár
       comment_order_selector:
         order:
           best_rated: Najlepšie hodnotené

data/config/locales/sr-CS.yml

@@ -4,7 +4,6 @@ sr:
       comment:
         hide_replies: Sakrij odgovore
         show_replies: Prikaži %{replies_count} odgovora
-        single_comment_link_title: Nabavi vezu ka jednom komentaru
       comments:
         comment_details_title: Detalji o komentaru
         single_comment_warning: Možete videti ostale komentare <a href="%{url}">ovde</a>.

data/config/locales/sv.yml

@@ -19,6 +19,10 @@ sv:
       comments:
         create:
           error: Det gick inte att skapa kommentaren.
+        delete:
+          error: Kommentaren kunde inte tas bort.
+        update:
+          error: Det gick inte att uppdatera kommentaren.
       comments_count: Antal kommentarer
       comments_title: Kommentarer
       last_activity:
@@ -39,7 +43,13 @@ sv:
           user_group_id:
             label: Kommentera som
         opinion:
+          label: Din åsikt om detta ämne
+          negative: Negativ
+          negative_selected: Din åsikt om detta ämne är negativ
           neutral: Neutral
+          neutral_selected: Din åsikt om detta ämne är neutral
+          positive: Positiv
+          positive_selected: Din åsikt om detta ämne är positiv
         remaining_characters: "%{count} tecken kvar"
         remaining_characters_1: "%{count} tecken kvar"
         title: Lägg till din kommentar
@@ -47,7 +57,12 @@ sv:
         alignment:
           against: Mot
           in_favor: För
+        confirm_destroy: Är du säker på att du vill ta bort denna kommentar?
+        delete: Radera
+        deleted_at: Kommentar borttagen den %{date}
         deleted_user: Raderad deltagare
+        edit: Redigera
+        edited: Redigerad
         hide_replies: Göm svar
         reply: Svara
         report:
@@ -62,7 +77,7 @@ sv:
             spam: Innehåller clickbait, reklam, bedrägerier eller skriptrobotar.
           title: Rapportera olämpligt innehåll
         show_replies: Visa %{replies_count} svar
-        single_comment_link_title: Få länk till enstaka kommentar
+        single_comment_link_title: Hämta länk
       comment_order_selector:
         order:
           best_rated: Bästa betyg
@@ -73,6 +88,7 @@ sv:
       comment_thread:
         title: Samtal med %{authorName}
       comments:
+        blocked_comments_for_unauthorized_user_warning: Du behöver verifiera dig för att kunna kommentera just nu, men du kan läsa tidigare kommentarer.
         blocked_comments_for_user_warning: Du kan inte kommentera just nu, men du kan läsa tidigare kommentarer.
         blocked_comments_warning: Kommentarer är inaktiverade just nu, men du kan läsa de föregående.
         comment_details_title: Kommentarsdetaljer
@@ -84,6 +100,14 @@ sv:
           other: "%{count} kommentarer"
       down_vote_button:
         text: Jag håller inte med om denna kommentar
+      edit_comment_modal_form:
+        close: Stäng
+        form:
+          body:
+            label: Kommentar
+            placeholder: Vad tycker du om detta?
+          submit: Skicka
+        title: Redigera din kommentar
       up_vote_button:
         text: Jag instämmer i denna kommentar
     events:

data/config/locales/tr-TR.yml

@@ -62,7 +62,6 @@ tr:
             spam: Clickbait, reklam, dolandırıcılık veya script botları içerir.
           title: Uygunsuz içerik bildir
         show_replies: '%{replies_count} yanıtı göster'
-        single_comment_link_title: Tek yorumun bağlantısını al
       comment_order_selector:
         order:
           best_rated: En çok oy alan

data/config/locales/zh-CN.yml

@@ -56,7 +56,6 @@ zh-CN:
             spam: 包含点击、广告、骗子或脚本机器人。
           title: 报告不恰当的内容
         show_replies: 显示 %{replies_count} 个回复
-        single_comment_link_title: 获取单个评论的链接
       comment_order_selector:
         order:
           best_rated: 最佳评分

data/db/migrate/20200706123136_make_comments_handle_i18n.rb

@@ -21,7 +21,7 @@ class MakeCommentsHandleI18n < ActiveRecord::Migration[5.2]
     Organization.reset_column_information
 
     Comment.find_each do |comment|
-      locale, org_id = User.where(id: comment.decidim_author_id).pluck(:locale, :decidim_organization_id).first
+      locale, org_id = User.where(id: comment.decidim_author_id).pick(:locale, :decidim_organization_id)
       locale = locale.presence || Organization.find(org_id).default_locale
 
       comment.new_body = {

data/db/migrate/20210402124534_add_participatory_process_to_comments.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddParticipatoryProcessToComments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_comments_comments, :decidim_participatory_space_type, :string
+    add_column :decidim_comments_comments, :decidim_participatory_space_id, :integer
+
+    add_index :decidim_comments_comments,
+              [:decidim_participatory_space_id, :decidim_participatory_space_type],
+              name: "index_decidim_comments_on_decidim_participatory_space"
+  end
+end

data/db/migrate/20210529095942_add_deleted_at_column_to_comments.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDeletedAtColumnToComments < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_comments_comments, :deleted_at, :datetime
+  end
+end

data/lib/decidim/comments/commentable.rb

@@ -52,13 +52,18 @@ module Decidim
           true
         end
 
+        # Public: Whether the object can have new comment votes or not.
+        def user_allowed_to_vote_comment?(_user)
+          true
+        end
+
         # Public: Updates the comments counter cache. We have to do it these
         # way in order to properly calculate the coutner with hidden
         # comments.
         #
         # rubocop:disable Rails/SkipsModelValidations
         def update_comments_count
-          comments_count = comments.not_hidden.count
+          comments_count = comments.not_hidden.not_deleted.count
           update_columns(comments_count: comments_count, updated_at: Time.current)
         end
         # rubocop:enable Rails/SkipsModelValidations

data/lib/decidim/comments/commentable_with_component.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Comments
+    # Commentable overriding some methods to include settings and
+    # authorizations given by a component the resource belongs to
+    module CommentableWithComponent
+      extend ActiveSupport::Concern
+      include Decidim::Comments::Commentable
+
+      included do
+        # Public: Overrides the `commentable?` Commentable concern method.
+        def commentable?
+          component.settings.comments_enabled?
+        end
+
+        # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+        def accepts_new_comments?
+          commentable? && !component.current_settings.comments_blocked
+        end
+
+        # Public: Whether the object can have new comments or not.
+        def user_allowed_to_comment?(user)
+          return unless can_participate?(user)
+
+          ActionAuthorizer.new(user, "comment", component, self).authorize.ok?
+        end
+      end
+    end
+  end
+end

data/lib/decidim/comments/engine.rb

@@ -4,11 +4,7 @@ require "rails"
 require "active_support/all"
 
 require "decidim/core"
-require "jquery-rails"
-require "sassc-rails"
-require "foundation-rails"
 require "foundation_rails_helper"
-require "autoprefixer-rails"
 
 require "decidim/comments/query_extensions"
 require "decidim/comments/mutation_extensions"
@@ -20,15 +16,11 @@ module Decidim
       isolate_namespace Decidim::Comments
 
       routes do
-        resources :comments, only: [:index, :create] do
+        resources :comments, except: [:new, :edit] do
           resources :votes, only: [:create]
         end
       end
 
-      initializer "decidim_comments.assets" do |app|
-        app.config.assets.precompile += %w(decidim_comments_manifest.js)
-      end
-
       initializer "decidim_comments.query_extensions" do
         Decidim::Api::QueryType.include QueryExtensions
       end

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

@@ -8,6 +8,7 @@ FactoryBot.define do
     commentable { build(:dummy_resource) }
     root_commentable { commentable }
     body { Decidim::Faker::Localized.paragraph }
+    participatory_space { commentable.try(:participatory_space) }
 
     after(:build) do |comment, evaluator|
       comment.body = if evaluator.body.is_a?(String)

data/lib/decidim/comments/version.rb

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

data/lib/decidim/comments.rb

@@ -12,6 +12,7 @@ module Decidim
   module Comments
     autoload :CommentsHelper, "decidim/comments/comments_helper"
     autoload :Commentable, "decidim/comments/commentable"
+    autoload :CommentableWithComponent, "decidim/comments/commentable_with_component"
     autoload :CommentSerializer, "decidim/comments/comment_serializer"
     autoload :CommentVoteSerializer, "decidim/comments/comment_vote_serializer"
     autoload :Export, "decidim/comments/export"

data/lib/tasks/decidim_comments.rake

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+namespace :decidim_comments do
+  desc "Adds participatory_process_id to comments if they are associated with a participatory process"
+  task update_participatory_process_in_comments: :environment do
+    Decidim::Comments::Comment.find_each do |c|
+      c.participatory_space = if c.root_commentable.is_a?(Decidim::Participable)
+                                c.root_commentable
+                              else
+                                c.commentable.try(:participatory_space)
+                              end
+      c.save(validate: false)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 0.25.0.rc2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -66,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0.rc2
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -99,14 +85,11 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/decidim_comments_manifest.js
 - app/assets/javascripts/decidim/comments/bundle.js.map
-- app/assets/javascripts/decidim/comments/comments.component.js.es6
-- app/assets/javascripts/decidim/comments/comments.component.test.js
-- app/assets/javascripts/decidim/comments/comments.js.erb
 - app/cells/decidim/comments/comment/actions.erb
 - app/cells/decidim/comments/comment/alignment_badge.erb
 - app/cells/decidim/comments/comment/author.erb
+- app/cells/decidim/comments/comment/deletion_data.erb
 - app/cells/decidim/comments/comment/show.erb
 - app/cells/decidim/comments/comment/utilities.erb
 - app/cells/decidim/comments/comment/votes.erb
@@ -129,7 +112,11 @@ files:
 - app/cells/decidim/comments/comments/single_comment_warning.erb
 - app/cells/decidim/comments/comments/user_comments_blocked_warning.erb
 - app/cells/decidim/comments/comments_cell.rb
+- app/cells/decidim/comments/edit_comment_modal_form/show.erb
+- app/cells/decidim/comments/edit_comment_modal_form_cell.rb
 - app/commands/decidim/comments/create_comment.rb
+- app/commands/decidim/comments/delete_comment.rb
+- app/commands/decidim/comments/update_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
 - app/controllers/decidim/comments/application_controller.rb
 - app/controllers/decidim/comments/comments_controller.rb
@@ -150,6 +137,10 @@ files:
 - app/models/decidim/comments/comment.rb
 - app/models/decidim/comments/comment_vote.rb
 - app/models/decidim/comments/seed.rb
+- app/packs/src/decidim/comments/comments.component.js
+- app/packs/src/decidim/comments/comments.component.test.js
+- app/packs/src/decidim/comments/comments.component_for_testing.js
+- app/packs/src/decidim/comments/comments.js
 - app/permissions/decidim/comments/permissions.rb
 - app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb
 - app/queries/decidim/comments/metrics/comments_metric_manage.rb
@@ -160,12 +151,19 @@ files:
 - app/services/decidim/comments/new_comment_notification_creator.rb
 - app/views/decidim/comments/comments/_comment.html.erb
 - app/views/decidim/comments/comments/_comments.html.erb
+- app/views/decidim/comments/comments/_delete.html.erb
+- app/views/decidim/comments/comments/_edited_comment.html.erb
 - app/views/decidim/comments/comments/create.js.erb
+- app/views/decidim/comments/comments/delete.js.erb
+- app/views/decidim/comments/comments/deletion_error.js.erb
 - app/views/decidim/comments/comments/error.js.erb
 - app/views/decidim/comments/comments/index.js.erb
 - app/views/decidim/comments/comments/reload.js.erb
+- app/views/decidim/comments/comments/update.js.erb
+- app/views/decidim/comments/comments/update_error.js.erb
 - app/views/decidim/comments/votes/create.js.erb
 - app/views/decidim/comments/votes/error.js.erb
+- config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -192,6 +190,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -202,10 +201,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -248,6 +247,8 @@ files:
 - db/migrate/20200320105911_index_foreign_keys_in_decidim_comments_comments.rb
 - db/migrate/20200706123136_make_comments_handle_i18n.rb
 - db/migrate/20200828101910_add_commentable_counter_cache_to_comments.rb
+- db/migrate/20210402124534_add_participatory_process_to_comments.rb
+- db/migrate/20210529095942_add_deleted_at_column_to_comments.rb
 - db/seeds.rb
 - lib/decidim/api/add_comment_type.rb
 - lib/decidim/api/comment_mutation_type.rb
@@ -262,6 +263,7 @@ files:
 - lib/decidim/comments/comment_serializer.rb
 - lib/decidim/comments/comment_vote_serializer.rb
 - lib/decidim/comments/commentable.rb
+- lib/decidim/comments/commentable_with_component.rb
 - lib/decidim/comments/comments_helper.rb
 - lib/decidim/comments/engine.rb
 - lib/decidim/comments/export.rb
@@ -274,6 +276,7 @@ files:
 - lib/decidim/comments/test/shared_examples/comment_voted_event.rb
 - lib/decidim/comments/test/shared_examples/create_comment_context.rb
 - lib/decidim/comments/version.rb
+- lib/tasks/decidim_comments.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -289,9 +292,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: