decidim-comments 0.25.0.rc2 → 0.25.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e368d7c967fbbadf3d8b8b1ccb568c0d013f67167eef0007772758f9e1b1a4
-  data.tar.gz: 8235ff94668c55ec576442a620851e70a60753e3475fa904b3f91e1394f40c02
+  metadata.gz: 5025c82564955ebb8952a49e8e301256ef9c4465fbf8f52e5b2489124674cff4
+  data.tar.gz: 66a5ab9d8c0af6e7120e02a0220fa8777b9e0bbe6d5c862ac420c729194cedee
 SHA512:
-  metadata.gz: fd688c1e740ef402ed0013475369601f19dc7242856315ac4993829300ded40df137a85ff307467171cc389974b0103f3167204d4c0c2abd7fce41e8ecd17001
-  data.tar.gz: bd0be8a17ad9d33682d4896eab5a4bc961871b59b4e7886b09a678e04f1e692f1900a77d9e1041c4310588f4ab376eb3e5a0b018eb0d17c69d86fbc0819ad923
+  metadata.gz: da03ef21094993feba8baa55864c33292820678b7105a749abd68761522aae1b018796316f289ce0c847f10cd204d8f75df4530866f25d1742486674e9da85c3
+  data.tar.gz: 1cc6d927dbd821d7f0647c5dd22c30faeab751a39f948bcbde85f3cf269afded077dacc9935dea3cebf2b2e95f6aca4b5a21cffbdd2e92860c9a248039c3d9f2

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

@@ -37,12 +37,7 @@ export default class CommentsComponent {
       this.mounted = true;
       this._initializeComments(this.$element);
 
-      $(".order-by__dropdown .is-submenu-item a", this.$element).on(
-        "click.decidim-comments",
-        () => {
-          this._onInitOrder();
-        }
-      );
+      $(".order-by__dropdown .is-submenu-item a", this.$element).on("click.decidim-comments", () => this._onInitOrder());
     }
   }
 
@@ -68,14 +63,16 @@ export default class CommentsComponent {
    * Adds a new thread to the comments section.
    * @public
    * @param {String} threadHtml - The HTML content for the thread.
+   * @param {Boolean} fromCurrentUser - A boolean indicating whether the user
+   *   herself was the author of the new thread. Defaults to false.
    * @returns {Void} - Returns nothing
    */
-  addThread(threadHtml) {
+  addThread(threadHtml, fromCurrentUser = false) {
     const $parent = $(".comments:first", this.$element);
     const $comment = $(threadHtml);
     const $threads = $(".comment-threads", this.$element);
     this._addComment($threads, $comment);
-    this._finalizeCommentCreation($parent);
+    this._finalizeCommentCreation($parent, fromCurrentUser);
   }
 
   /**
@@ -84,15 +81,17 @@ export default class CommentsComponent {
    * @param {Number} commentId - The ID of the comment for which to add the
    *   reply to.
    * @param {String} replyHtml - The HTML content for the reply.
+   * @param {Boolean} fromCurrentUser - A boolean indicating whether the user
+   *   herself was the author of the new reply. Defaults to false.
    * @returns {Void} - Returns nothing
    */
-  addReply(commentId, replyHtml) {
+  addReply(commentId, replyHtml, fromCurrentUser = false) {
     const $parent = $(`#comment_${commentId}`);
     const $comment = $(replyHtml);
     const $replies = $(`#comment-${commentId}-replies`);
     this._addComment($replies, $comment);
     $replies.siblings(".comment__additionalreply").removeClass("hide");
-    this._finalizeCommentCreation($parent);
+    this._finalizeCommentCreation($parent, fromCurrentUser);
   }
 
   /**
@@ -170,18 +169,22 @@ export default class CommentsComponent {
    * successfully.
    * @private
    * @param {jQuery} $parent - The parent comment element to finalize.
+   * @param {Boolean} fromCurrentUser - A boolean indicating whether the user
+   *   herself was the author of the new comment.
    * @returns {Void} - Returns nothing
    */
-  _finalizeCommentCreation($parent) {
-    const $add = $("> .add-comment", $parent);
-    const $text = $("textarea", $add);
-    const characterCounter = $text.data("remaining-characters-counter");
-    $text.val("");
-    if (characterCounter) {
-      characterCounter.updateStatus();
-    }
-    if (!$add.parent().is(".comments")) {
-      $add.addClass("hide");
+  _finalizeCommentCreation($parent, fromCurrentUser) {
+    if (fromCurrentUser) {
+      const $add = $("> .add-comment", $parent);
+      const $text = $("textarea", $add);
+      const characterCounter = $text.data("remaining-characters-counter");
+      $text.val("");
+      if (characterCounter) {
+        characterCounter.updateStatus();
+      }
+      if (!$add.parent().is(".comments")) {
+        $add.addClass("hide");
+      }
     }
 
     // Restart the polling
@@ -207,9 +210,7 @@ export default class CommentsComponent {
           order: this.order,
           after: this.lastCommentId
         }
-      }).done(() => {
-        this._pollComments();
-      });
+      }).done(() => this._pollComments());
     }, this.pollingInterval);
   }
 

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

@@ -558,17 +558,82 @@ describe("CommentsComponent", () => {
           "This is a dynamically added comment"
         ));
       });
+
+      it("does not clear the comment form text area", () => {
+        const commentSection = addComment[addComment.length - 1];
+        const textArea = $("textarea", commentSection);
+        textArea.val("I am writing a new comment...");
+
+        const newThread = generateCommentThread(999, "This is a dynamically added comment");
+        subject.addThread(newThread);
+
+        expect(textArea.val()).toEqual("I am writing a new comment...");
+      });
+
+      describe("as the current user", () => {
+        it("clears the comment form text area", () => {
+          const commentSection = addComment[addComment.length - 1];
+          const textArea = $("textarea", commentSection);
+          textArea.val("I am writing a new comment...");
+
+          const newThread = generateCommentThread(999, "This is a dynamically added comment");
+          subject.addThread(newThread, true);
+
+          expect(textArea.val()).toEqual("");
+        });
+      });
     });
 
     describe("addReply", () => {
+      const newReply = generateSingleComment(999, "This is a dynamically added reply");
+
       it("adds a new reply to an existing thread", () => {
-        const newThread = generateSingleComment(999, "This is a dynamically added reply");
-        subject.addReply(450, newThread);
+        subject.addReply(450, newReply);
 
         expect(subject.$element.html()).toEqual(expect.stringContaining(
           "This is a dynamically added reply"
         ));
       });
+
+      it("does not clear the reply comment form text area", () => {
+        const commentSection = $("#comment450-reply", subject.$element);
+        const textArea = $("textarea", commentSection);
+        textArea.val("I am writing a new comment...");
+
+        subject.addReply(450, newReply);
+
+        expect(textArea.val()).toEqual("I am writing a new comment...");
+      });
+
+      it("does not hide the reply form", () => {
+        const commentSection = $("#comment450-reply", subject.$element);
+        commentSection.removeClass("hide");
+
+        subject.addReply(450, newReply);
+
+        expect(commentSection.hasClass("hide")).toBeFalsy();
+      });
+
+      describe("as the current user", () => {
+        it("clears the comment form text area", () => {
+          const commentSection = $("#comment450-reply", subject.$element);
+          const textArea = $("textarea", commentSection);
+          textArea.val("I am writing a new comment...");
+
+          subject.addReply(450, newReply, true);
+
+          expect(textArea.val()).toEqual("");
+        });
+
+        it("hides the reply form", () => {
+          const commentSection = $("#comment450-reply", subject.$element);
+          commentSection.removeClass("hide");
+
+          subject.addReply(450, newReply, true);
+
+          expect(commentSection.hasClass("hide")).toBeTruthy();
+        });
+      });
     });
   });
 

data/app/queries/decidim/comments/sorted_comments.rb

@@ -33,12 +33,6 @@ module Decidim
         scope = base_scope
                 .not_hidden
                 .includes(:author, :user_group, :up_votes, :down_votes)
-        if @options[:after]
-          scope = scope.where(
-            "decidim_comments_comments.id > ?",
-            @options[:after]
-          )
-        end
 
         case @options[:order_by]
         when "older"
@@ -60,6 +54,14 @@ module Decidim
         id = @options[:id]
         return Comment.where(root_commentable: commentable, id: id) if id.present?
 
+        after = @options[:after]
+        if after.present?
+          return Comment.where(root_commentable: commentable).where(
+            "decidim_comments_comments.id > ?",
+            after
+          )
+        end
+
         Comment.where(commentable: commentable)
       end
 

data/app/views/decidim/comments/comments/create.js.erb

@@ -6,9 +6,9 @@
   var $comments = $("#" + rootCommentableId);
   var component = $comments.data("comments");
   if (inReplyTo) {
-    component.addReply(inReplyTo, commentHtml);
+    component.addReply(inReplyTo, commentHtml, true);
   } else {
-    component.addThread(commentHtml);
+    component.addThread(commentHtml, true);
   }
 
   // Update the comments count

data/lib/decidim/comments/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.25.0.rc2
+  version: 0.25.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-17 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.25.0.rc2
+        version: 0.25.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com