decidim-comments 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c6e52bf2d6fb82ec3a0ef63c1a19166171b0f36b11c50348147eb83df09e2a
-  data.tar.gz: e1830e662a9498d68f8104382506b74b47a59124ffdf2519fc3de6a4b58753ea
+  metadata.gz: 3d694f5d314d6415388541f689f72405dacfae3bb21943ce499b7ac4548dbee3
+  data.tar.gz: 4a25dae5aa24bdeaaa86076af801a5210c0dcdace52ef9e4e177be0f17502736
 SHA512:
-  metadata.gz: 1d9c728231a9257cd5d2d61757df644fe9297c72c3ecdf6d5a34387ae212876ee2596b1946100ffaaafdd7662ec82bc4aefab408ceca6be36a537995756409ca
-  data.tar.gz: f874636ccc380e12d2f844c0e4b15a02e60e5f2416ffd20bdaa215965dcea80dc460ecdc3c5cf4aedae8afa93d32f92bf983a6d3e335637507921dd261ad1aa0
+  metadata.gz: 84fa5683fe04af6fac1f6d5f808e924905eec1a1acaf8e68171b67822c67ee55f913e2476eefb8e6a04730ce77e09ecc166129c71ee865683df34a37c281e72c
+  data.tar.gz: 6a489cd703c56038f592b22342794add4b02ad7fc3e502fd1caa4bdf0382357104f098c7f5a1b9efe32d7d798b444c8d1a27f74e256cac37dd77d5b39ba486ef

data/app/models/decidim/comments/comment.rb

@@ -56,8 +56,6 @@ module Decidim
       validate :body_length
       validate :commentable_can_have_comments
 
-      delegate :organization, to: :commentable
-
       scope :not_deleted, -> { where(deleted_at: nil) }
 
       translatable_fields :body
@@ -81,6 +79,10 @@ module Decidim
         where(alignment: -1)
       end
 
+      def organization
+        commentable&.organization || participatory_space&.organization
+      end
+
       def visible?
         participatory_space.try(:visible?) && component.try(:published?)
       end
@@ -131,6 +133,8 @@ module Decidim
 
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
+        return unless root_commentable
+
         url_params = { anchor: "comment_#{id}" }
 
         if root_commentable.respond_to?(:polymorphic_resource_url)

data/app/packs/src/decidim/comments/comments.component.js

@@ -43,7 +43,10 @@ export default class CommentsComponent {
       this.mounted = true;
       this._initializeComments(this.$element);
       if (!this.singleComment) {
-        this._fetchComments();
+        $(".add-comment textarea", this.$element).prop("disabled", true);
+        this._fetchComments(() => {
+          $(".add-comment textarea", this.$element).prop("disabled", false);
+        });
       }
 
       $(".order-by__dropdown .is-submenu-item a", this.$element).on("click.decidim-comments", () => this._onInitOrder());
@@ -215,10 +218,11 @@ export default class CommentsComponent {
    * Sends an ajax request based on current
    * params to get comments for the component
    * @private
+   * @param {Function} successCallback A callback that is called after a
+   *   successful fetch
    * @returns {Void} - Returns nothing
    */
-  _fetchComments() {
-    $(".add-comment textarea", this.$element).prop("disabled", true);
+  _fetchComments(successCallback = null) {
     Rails.ajax({
       url: this.commentsUrl,
       type: "GET",
@@ -231,7 +235,9 @@ export default class CommentsComponent {
         ...(this.lastCommentId && { "after": this.lastCommentId })
       }),
       success: () => {
-        $(".add-comment textarea", this.$element).prop("disabled", false);
+        if (successCallback) {
+          successCallback();
+        }
         this._pollComments();
       }
     });

data/app/packs/src/decidim/comments/comments.component.test.js

@@ -418,6 +418,21 @@ describe("CommentsComponent", () => {
     expect(window.setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 1000);
   });
 
+  it("does not disable the textarea when polling comments normally", () => {
+    Rails.ajax.mockImplementationOnce((options) => options.success());
+
+    subject.mountComponent();
+
+    // Delay the success call 2s after the polling has happened to test that
+    // the textarea is still enabled when the polling is happening.
+    Rails.ajax.mockImplementationOnce((options) => {
+      setTimeout(options.success(), 2000);
+    });
+    jest.advanceTimersByTime(1500);
+
+    expect($(`${selector} .add-comment textarea`).prop("disabled")).toBeFalsy();
+  });
+
   describe("when mounted", () => {
     beforeEach(() => {
       spyOnAddComment("on");

data/config/locales/gn-PY.yml

@@ -0,0 +1 @@
+gn:

data/config/locales/lo-LA.yml

@@ -0,0 +1 @@
+lo:

data/config/locales/ro-RO.yml

@@ -4,6 +4,7 @@ ro:
     models:
       decidim/comments/comment_by_followed_user_event: Comentariu
       decidim/comments/comment_created_event: Comentează
+      decidim/comments/comment_upvoted_event: Comentariu votat
       decidim/comments/reply_created_event: Răspuns la comentariu
       decidim/comments/user_group_mentioned_event: Menționează
       decidim/comments/user_mentioned_event: Menționează
@@ -73,6 +74,7 @@ ro:
         edit: Editează
         edited: Editat
         hide_replies: Ascunde răspunsurile
+        moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:
           action: Raportează

data/lib/decidim/comments/markdown.rb

@@ -50,6 +50,18 @@ module Decidim
 
         "<p>#{text}</p>"
       end
+
+      # Prevents underscores to be replaced with <em> tags in comments, such as
+      # https://github.com/org/module_with_underscores or within words such as
+      # "Look for comment_maximum_length in the code". The `no_intra_emphasis`
+      # option for Redcarpet does not apparently work for this renderer.
+      #
+      # Related issues:
+      # https://github.com/vmg/redcarpet/issues/402
+      # https://github.com/vmg/redcarpet/issues/427
+      def emphasis(text)
+        "_#{text}_"
+      end
     end
   end
 end

data/lib/decidim/comments/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-11-15 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.27.0
+        version: 0.27.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -197,6 +197,7 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -209,6 +210,7 @@ files:
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
+- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml