decidim 0.2.0 → 0.3.0

data/decidim-budgets/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-comments/app/commands/decidim/comments/create_comment.rb

@@ -43,9 +43,9 @@ module Decidim
 
       def send_notification_to_author
         if @comment.depth.positive? && @commentable.author.replies_notifications?
-          CommentNotificationMailer.reply_created(@author, @comment, @commentable, @comment.root_commentable).deliver_later
+          CommentNotificationMailer.reply_created(@comment, @commentable, @comment.root_commentable).deliver_later
         elsif @comment.depth.zero? && @commentable.author.comments_notifications?
-          CommentNotificationMailer.comment_created(@author, @comment, @commentable).deliver_later
+          CommentNotificationMailer.comment_created(@comment, @commentable).deliver_later
         end
       end
 

data/decidim-comments/app/frontend/comments/add_comment_form.component.tsx

@@ -360,6 +360,7 @@ const AddCommentFormWithMutation = graphql(addCommentMutation, {
               __typename: "User",
               name: ownProps.session.user.name,
               avatarUrl: ownProps.session.user.avatarUrl,
+              deleted: false,
             },
             comments: [],
             hasComments: false,

data/decidim-comments/app/frontend/comments/comment.component.test.tsx

@@ -45,6 +45,17 @@ describe("<Comment />", () => {
     expect(wrapper.find("a.author__name").text()).toEqual(comment.author.name);
   });
 
+  describe("when the author's account has been deleted", () => {
+    beforeEach(() => {
+      comment.author.deleted = true;
+    });
+
+    it("should render 'Deleted user' inside a badge", () => {
+      const wrapper = shallow(<Comment comment={comment} session={session} />);
+      expect(wrapper.find("span.label.label--small.label--basic").text()).toEqual("Deleted user");
+    });
+  });
+
   it("should render author's avatar as a image tag", () => {
     const wrapper = shallow(<Comment comment={comment} session={session} />);
     expect(wrapper.find("a.author__avatar img").prop("src")).toEqual(comment.author.avatarUrl);
@@ -145,7 +156,7 @@ describe("<Comment />", () => {
   it("should render a 'in favor' badge if comment's alignment is 1", () => {
     comment.alignment = 1;
     const wrapper = shallow(<Comment comment={comment} session={session} />);
-    expect(wrapper.find("span.success.label").text()).toEqual("In favor");
+    expect(wrapper.find("span.alignment.label").text()).toEqual("In favor");
   });
 
   it("should render a 'against' badge if comment's alignment is -1", () => {

data/decidim-comments/app/frontend/comments/comment.component.tsx

@@ -42,6 +42,8 @@ class Comment extends React.Component<CommentProps, CommentState> {
     votable: false,
   };
 
+  public commentNode: HTMLElement;
+
   constructor(props: CommentProps) {
     super(props);
 
@@ -51,12 +53,37 @@ class Comment extends React.Component<CommentProps, CommentState> {
   }
 
   public componentDidMount() {
+    const { comment: { id } } = this.props;
+    const hash = document.location.hash;
+    const regex = new RegExp(`#comment_${id}`);
+
+    function scrollTo(element: Element, to: number, duration: number) {
+      if (duration <= 0) {
+        return;
+      }
+      const difference = to - element.scrollTop;
+      const perTick = difference / duration * 10;
+
+      setTimeout(() => {
+          element.scrollTop = element.scrollTop + perTick;
+          if (element.scrollTop === to) {
+            return;
+          }
+          scrollTo(element, to, duration - 10);
+      }, 10);
+    }
+
+    if (regex.test(hash)) {
+      scrollTo(document.body, this.commentNode.offsetTop, 200);
+    }
+
     if (window.$(document).foundation) {
-      const { comment: { id } } = this.props;
       window.$(`#flagModalComment${id}`).foundation();
     }
   }
 
+  public getNodeReference = (commentNode: HTMLElement) => this.commentNode = commentNode;
+
   public render(): JSX.Element {
     const { session, comment: { id, author, body, createdAt }, articleClassName } = this.props;
     const formattedCreatedAt = ` ${moment(createdAt).format("LLL")}`;
@@ -67,7 +94,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
     }
 
     return (
-      <article id={`comment_${id}`} className={articleClassName}>
+      <article id={`comment_${id}`} className={articleClassName} ref={this.getNodeReference}>
         <div className="comment__header">
           <div className="author-data">
             <div className="author-data__main">
@@ -75,7 +102,18 @@ class Comment extends React.Component<CommentProps, CommentState> {
                 <a className="author__avatar">
                   <img src={author.avatarUrl} alt="author-avatar" />
                 </a>
-                <a className="author__name">{author.name}</a>
+                { author.deleted ?
+                    <span className="label label--small label--basic">{I18n.t("components.comment.deleted_user")}</span> :
+                    <a className="author__name">{author.name}</a>
+                }
+                { !author.isUser && author.isVerified &&
+                  <span>
+                    &nbsp;
+                    <span className="label success label--small">
+                      {I18n.t("components.comment.verified_user_group")}
+                    </span>
+                  </span>
+                }
                 <time dateTime={createdAt}>{formattedCreatedAt}</time>
               </div>
             </div>
@@ -244,7 +282,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
    */
   private _renderAlignmentBadge() {
     const { comment: { alignment } } = this.props;
-    const spanClassName = classnames("label", {
+    const spanClassName = classnames("label alignment", {
       success: alignment === 1,
       alert: alignment === -1,
     });

data/decidim-comments/app/frontend/comments/comment_thread.component.test.tsx

@@ -39,6 +39,17 @@ describe("<CommentThread />", () => {
       const wrapper = shallow(<CommentThread comment={comment} session={session} />);
       expect(wrapper.find("h6.comment-thread__title").text()).toContain(`Conversation with ${comment.author.name}`);
     });
+
+    describe("when the author's account has been deleted", () => {
+      beforeEach(() => {
+        comment.author.deleted = true;
+      });
+
+      it("should render a h6 comment-thread__title with 'Deleted user'", () => {
+        const wrapper = shallow(<CommentThread comment={comment} session={session} />);
+        expect(wrapper.find("h6.comment-thread__title").text()).toContain("Conversation with Deleted user");
+      });
+    });
   });
 
   describe("should render a Comment", () => {

data/decidim-comments/app/frontend/comments/comment_thread.component.tsx

@@ -58,7 +58,11 @@ class CommentThread extends React.Component<CommentThreadProps, undefined> {
     if (hasComments) {
       return (
         <h6 className="comment-thread__title">
-          {I18n.t("components.comment_thread.title", { authorName: author.name })}
+          {
+            author.deleted ?
+              I18n.t("components.comment_thread.title", { authorName: I18n.t("components.comment.deleted_user") }) :
+              I18n.t("components.comment_thread.title", { authorName: author.name })
+          }
         </h6>
       );
     }

data/decidim-comments/app/frontend/fragments/comment_data.fragment.graphql

@@ -10,6 +10,9 @@ fragment CommentData on Comment {
   author {
     name
     avatarUrl
+    isVerified
+    isUser
+    deleted
   }
   hasComments
   acceptsNewComments

data/decidim-comments/app/frontend/support/generate_comments_data.ts

@@ -19,6 +19,9 @@ const generateCommentsData = (num = 1) => {
       author: {
         name: name.findName(),
         avatarUrl: image.imageUrl(),
+        isVerified: Math.random() >= 0.5,
+        isUser: Math.random() >= 0.5,
+        deleted: false,
       },
       hasComments: false,
       comments: [],

data/decidim-comments/app/frontend/support/schema.ts

@@ -59,11 +59,11 @@ export interface GetCommentsQuery {
     } | null,
   } | null;
   commentable: AddCommentFormCommentableFragment & {
-    // Wether the object can have new comments or not
+    // Whether the object can have new comments or not
     acceptsNewComments: boolean,
-    // Wether the object comments have alignment or not
+    // Whether the object comments have alignment or not
     commentsHaveAlignment: boolean,
-    // Wether the object comments have votes or not
+    // Whether the object comments have votes or not
     commentsHaveVotes: boolean,
     comments: Array< CommentThreadFragment & CommentFragment & CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
       // The Comment's unique ID
@@ -89,6 +89,14 @@ export interface AddCommentFormSessionFragment {
   } >;
 }
 
+export interface CommentFragment extends CommentDataFragment, UpVoteButtonFragment, DownVoteButtonFragment {
+  comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
+    comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
+      comments: Array<CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment>,
+    } >,
+  } >;
+}
+
 export interface CommentDataFragment extends UpVoteButtonFragment, DownVoteButtonFragment {
   // The Comment's unique ID
   id: string;
@@ -106,10 +114,16 @@ export interface CommentDataFragment extends UpVoteButtonFragment, DownVoteButto
     name: string,
     // The author's avatar url
     avatarUrl: string,
+    // Whether the author is verified or not
+    isVerified: boolean,
+    // Whether the author is a user or another kind of author (User Group)
+    isUser: boolean,
+    // Whether the author's account has been deleted or not
+    deleted: boolean,
   };
   // Check if the commentable has comments
   hasComments: boolean;
-  // Wether the object can have new comments or not
+  // Whether the object can have new comments or not
   acceptsNewComments: boolean;
   // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
   alignment: number | null;
@@ -122,14 +136,6 @@ export interface CommentThreadFragment extends CommentFragment, CommentDataFragm
   hasComments: boolean;
 }
 
-export interface CommentFragment extends CommentDataFragment, UpVoteButtonFragment, DownVoteButtonFragment {
-  comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
-    comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
-      comments: Array<CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment>,
-    } >,
-  } >;
-}
-
 export interface DownVoteButtonFragment {
   // The Comment's unique ID
   id: string;

data/decidim-comments/app/mailers/decidim/comments/comment_notification_mailer.rb

@@ -9,21 +9,23 @@ module Decidim
 
       helper_method :commentable_title
 
-      def comment_created(user, comment, commentable)
-        with_user(user) do
+      def comment_created(comment, commentable)
+        with_user(commentable.author) do
           @comment = comment
           @commentable = commentable
+          @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
           @organization = commentable.organization
           subject = I18n.t("comment_created.subject", scope: "decidim.comments.mailer.comment_notification")
           mail(to: commentable.author.email, subject: subject)
         end
       end
 
-      def reply_created(user, reply, comment, commentable)
-        with_user(user) do
+      def reply_created(reply, comment, commentable)
+        with_user(comment.author) do
           @reply = reply
           @comment = comment
           @commentable = commentable
+          @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
           @organization = commentable.organization
           subject = I18n.t("reply_created.subject", scope: "decidim.comments.mailer.comment_notification")
           mail(to: comment.author.email, subject: subject)

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

@@ -23,10 +23,12 @@ module Decidim
       has_many :up_votes, -> { where(weight: 1) }, foreign_key: "decidim_comment_id", class_name: "CommentVote", dependent: :destroy
       has_many :down_votes, -> { where(weight: -1) }, foreign_key: "decidim_comment_id", class_name: "CommentVote", dependent: :destroy
 
-      validates :author, :commentable, :root_commentable, :body, presence: true
+      validates :body, presence: true
       validates :depth, numericality: { greater_than_or_equal_to: 0 }
       validates :alignment, inclusion: { in: [0, 1, -1] }
 
+      validates :body, length: { maximum: 500 }
+
       validate :commentable_can_have_comments
 
       before_save :compute_depth
@@ -52,9 +54,9 @@ module Decidim
         down_votes.any? { |vote| vote.author == user }
       end
 
-      # Public: Overrides the `reported_content` Reportable concern method.
-      def reported_content
-        body
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(root_commentable).url(anchor: "comment_#{id}")
       end
 
       private

data/decidim-comments/app/models/decidim/comments/comment_vote.rb

@@ -8,8 +8,7 @@ module Decidim
       belongs_to :comment, foreign_key: "decidim_comment_id", class_name: "Comment"
       belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
 
-      validates :comment, presence: true, uniqueness: { scope: :author }
-      validates :author, presence: true
+      validates :comment, uniqueness: { scope: :author }
       validates :weight, inclusion: { in: [-1, 1] }
       validate :author_and_comment_same_organization
 

data/decidim-comments/app/models/decidim/comments/seed.rb

@@ -15,12 +15,15 @@ module Decidim
         organization = resource.organization
 
         rand(1..5).times do
-          random = rand(Decidim::User.count)
+          author = Decidim::User.where(organization: organization).all.sample
+          user_group = [true, false].sample ? author.user_groups.verified.sample : nil
+
           Comment.create(
             commentable: resource,
             root_commentable: resource,
             body: ::Faker::Lorem.sentence,
-            author: Decidim::User.where(organization: organization).offset(random).first
+            author: author,
+            user_group: user_group
           )
         end
       end

data/decidim-comments/app/resolvers/decidim/comments/vote_comment_resolver.rb

@@ -14,6 +14,9 @@ module Decidim
           on(:ok) do |comment|
             return comment
           end
+          on(:invalid) do
+            return GraphQL::ExecutionError.new(I18n.t("votes.create.error", scope: "decidim.comments"))
+          end
         end
       end
     end

data/decidim-comments/app/types/decidim/comments/commentable_interface.rb

@@ -13,15 +13,15 @@ module Decidim
         property :commentable_type
       end
 
-      field :acceptsNewComments, !types.Boolean, "Wether the object can have new comments or not" do
+      field :acceptsNewComments, !types.Boolean, "Whether the object can have new comments or not" do
         property :accepts_new_comments?
       end
 
-      field :commentsHaveAlignment, !types.Boolean, "Wether the object comments have alignment or not" do
+      field :commentsHaveAlignment, !types.Boolean, "Whether the object comments have alignment or not" do
         property :comments_have_alignment?
       end
 
-      field :commentsHaveVotes, !types.Boolean, "Wether the object comments have votes or not" do
+      field :commentsHaveVotes, !types.Boolean, "Whether the object comments have votes or not" do
         property :comments_have_votes?
       end
 

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb

@@ -4,7 +4,7 @@
   <%=
     t(".new_comment_html", {
       commenter: @comment.author.name,
-      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@comment.id}"))
     })
   %>
 </p>

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/reply_created.html.erb

@@ -4,7 +4,7 @@
   <%=
     t(".new_reply_html", {
       commenter: @reply.author.name,
-      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@reply.id}"))
     })
   %>
 </p>

data/decidim-comments/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/comments/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/comments/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-comments/config/locales/ca.yml

@@ -19,6 +19,9 @@ ca:
             subject: Tens un nou comentari
           reply_created:
             subject: Tens una nova resposta del teu comentari
+      votes:
+        create:
+          error: Hi ha hagut errors en votar el comentari.
     components:
       add_comment_form:
         account_message: "<a href=\"%{sign_in_url}\">Entra amb el teu compte</a> o <a href=\"%{sign_up_url}\">registra't</a> per a deixar un comentari.\n"
@@ -37,6 +40,7 @@ ca:
         alignment:
           against: En contra
           in_favor: A favor
+        deleted_user: Usuari eliminat
         reply: Respondre
         report:
           action: Denuncia
@@ -49,6 +53,7 @@ ca:
             offensive: Conté racisme, sexisme, insults, atacs personals, amenaces de mort, peticions de suïcidi o qualsevol forma de discurs d'odi.
             spam: Conté "clickbait", publicitat o estafes.
           title: Denuncia un problema
+        verified_user_group: Organització verificada
       comment_order_selector:
         order:
           best_rated: Més ben valorats

data/decidim-comments/config/locales/en.yml

@@ -20,6 +20,9 @@ en:
             subject: You have a new comment
           reply_created:
             subject: You have a new reply of your comment
+      votes:
+        create:
+          error: There's been errors when voting the comment.
     components:
       add_comment_form:
         account_message: '<a href="%{sign_in_url}">Sign in with your account</a> or <a href="%{sign_up_url}">sign up</a> to add your comment. '
@@ -38,6 +41,7 @@ en:
         alignment:
           against: Against
           in_favor: In favor
+        deleted_user: Deleted user
         reply: Reply
         report:
           action: Report
@@ -50,6 +54,7 @@ en:
             offensive: Contains racism, sexism, slurs, personal attacks, death threats, suicide requests or any form of hate speech.
             spam: Contains clickbait, advertising, scams or script bots.
           title: Report a problem
+        verified_user_group: Verified organization
       comment_order_selector:
         order:
           best_rated: Best rated