decidim 0.0.8.1 → 0.1.0

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

@@ -1,15 +1,15 @@
-import { mount, shallow }   from "enzyme";
+import { mount, shallow } from "enzyme";
 import * as $ from "jquery";
 import * as React from "react";
 
 import { CommentFragment } from "../support/schema";
-import AddCommentForm       from "./add_comment_form.component";
-import Comment              from "./comment.component";
-import DownVoteButton       from "./down_vote_button.component";
-import UpVoteButton         from "./up_vote_button.component";
+import AddCommentForm from "./add_comment_form.component";
+import Comment from "./comment.component";
+import DownVoteButton from "./down_vote_button.component";
+import UpVoteButton from "./up_vote_button.component";
 
 import generateCommentsData from "../support/generate_comments_data";
-import generateUserData     from "../support/generate_user_data";
+import generateUserData from "../support/generate_user_data";
 
 import { loadLocaleTranslations } from "../support/load_translations";
 
@@ -19,7 +19,7 @@ describe("<Comment />", () => {
 
   beforeEach(() => {
     loadLocaleTranslations("en");
-    let commentsData = generateCommentsData(1);
+    const commentsData = generateCommentsData(1);
     commentsData[0].comments = generateCommentsData(3);
 
     comment = commentsData[0];

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

@@ -1,12 +1,12 @@
-import * as classnames     from "classnames";
-import * as moment         from "moment";
-import * as React          from "react";
+import * as classnames from "classnames";
+import * as moment from "moment";
+import * as React from "react";
 
 import Icon from "../application/icon.component";
 
-import AddCommentForm      from "./add_comment_form.component";
-import DownVoteButton      from "./down_vote_button.component";
-import UpVoteButton        from "./up_vote_button.component";
+import AddCommentForm from "./add_comment_form.component";
+import DownVoteButton from "./down_vote_button.component";
+import UpVoteButton from "./up_vote_button.component";
 
 import {
   AddCommentFormSessionFragment,

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

@@ -1,6 +1,6 @@
-import * as React            from "react";
+import * as React from "react";
 
-import Comment               from "./comment.component";
+import Comment from "./comment.component";
 
 import {
   AddCommentFormSessionFragment,

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

@@ -1,14 +1,14 @@
-import { shallow }          from "enzyme";
+import { shallow } from "enzyme";
 import * as React from "react";
 
-import AddCommentForm       from "./add_comment_form.component";
+import AddCommentForm from "./add_comment_form.component";
 import CommentOrderSelector from "./comment_order_selector.component";
-import CommentThread        from "./comment_thread.component";
+import CommentThread from "./comment_thread.component";
 import { Comments, commentsQuery } from "./comments.component";
 
 import generateCommentsData from "../support/generate_comments_data";
-import generateUserData     from "../support/generate_user_data";
-import resolveGraphQLQuery  from "../support/resolve_graphql_query";
+import generateUserData from "../support/generate_user_data";
+import resolveGraphQLQuery from "../support/resolve_graphql_query";
 
 import { loadLocaleTranslations } from "../support/load_translations";
 

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

@@ -1,11 +1,11 @@
-import * as React           from "react";
-import { graphql }          from "react-apollo";
+import * as React from "react";
+import { graphql } from "react-apollo";
 
-import Application          from "../application/application.component";
+import Application from "../application/application.component";
 
-import AddCommentForm       from "./add_comment_form.component";
+import AddCommentForm from "./add_comment_form.component";
 import CommentOrderSelector from "./comment_order_selector.component";
-import CommentThread        from "./comment_thread.component";
+import CommentThread from "./comment_thread.component";
 
 import {
   GetCommentsQuery,
@@ -18,7 +18,7 @@ interface CommentsProps extends GetCommentsQuery {
   loading?: boolean;
   orderBy: string;
   reorderComments: (orderBy: string) => void;
-};
+}
 
 /**
  * The core class of the Decidim Comments engine.

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

@@ -1,8 +1,8 @@
-import { shallow }          from "enzyme";
+import { shallow } from "enzyme";
 import * as React from "react";
 
-import { DownVoteButton }   from "./down_vote_button.component";
-import VoteButton           from "./vote_button.component";
+import { DownVoteButton } from "./down_vote_button.component";
+import VoteButton from "./vote_button.component";
 
 import generateCommentsData from "../support/generate_comments_data";
 
@@ -13,7 +13,7 @@ describe("<DownVoteButton />", () => {
   const downVote = jasmine.createSpy("downVote");
 
   beforeEach(() => {
-    let commentsData = generateCommentsData(1);
+    const commentsData = generateCommentsData(1);
 
     comment = commentsData[0];
   });

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

@@ -1,7 +1,7 @@
-import * as React          from "react";
-import { graphql }         from "react-apollo";
+import * as React from "react";
+import { graphql } from "react-apollo";
 
-import VoteButton          from "./vote_button.component";
+import VoteButton from "./vote_button.component";
 
 import {
   CommentFragment,

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

@@ -1,8 +1,8 @@
-import { shallow }          from "enzyme";
+import { shallow } from "enzyme";
 import * as React from "react";
 
-import { UpVoteButton }     from "./up_vote_button.component";
-import VoteButton           from "./vote_button.component";
+import { UpVoteButton } from "./up_vote_button.component";
+import VoteButton from "./vote_button.component";
 
 import generateCommentsData from "../support/generate_comments_data";
 
@@ -13,7 +13,7 @@ describe("<UpVoteButton />", () => {
   const upVote = jasmine.createSpy("upVote");
 
   beforeEach(() => {
-    let commentsData = generateCommentsData(1);
+    const commentsData = generateCommentsData(1);
 
     comment = commentsData[0];
   });

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

@@ -1,7 +1,7 @@
-import * as React           from "react";
-import { graphql }          from "react-apollo";
+import * as React from "react";
+import { graphql } from "react-apollo";
 
-import VoteButton           from "./vote_button.component";
+import VoteButton from "./vote_button.component";
 
 import {
   CommentFragment,

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import Icon       from "../application/icon.component";
+import Icon from "../application/icon.component";
 
 interface VoteButtonProps {
   buttonClassName: string;

data/decidim-comments/app/frontend/comments/vote_button_component.test.tsx

@@ -1,7 +1,7 @@
 import { shallow } from "enzyme";
 import * as React from "react";
-import Icon        from "../application/icon.component";
-import VoteButton  from "./vote_button.component";
+import Icon from "../application/icon.component";
+import VoteButton from "./vote_button.component";
 
 describe("<VoteButton />", () => {
   const voteAction: jasmine.Spy = jasmine.createSpy("voteAction");

data/decidim-comments/app/frontend/entry.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as ReactDOM    from "react-dom";
+import * as ReactDOM from "react-dom";
 
 import Comments, { CommentsApplicationProps } from "./comments/comments.component";
 import loadTranslations from "./support/load_translations";
@@ -7,7 +7,7 @@ import loadTranslations from "./support/load_translations";
 window.DecidimComments = window.DecidimComments || {};
 
 window.DecidimComments.renderCommentsComponent = (nodeId: string, props: CommentsApplicationProps) => {
-  let node = window.$(`#${nodeId}`)[0];
+  const node = window.$(`#${nodeId}`)[0];
 
   ReactDOM.render(
     React.createElement(Comments, props),

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

@@ -1,6 +1,6 @@
 import { date, image, lorem, name, random } from "faker/locale/en";
 
-import { CommentFragment }           from "../support/schema";
+import { CommentFragment } from "../support/schema";
 
 /**
  * Generate random comment data to emulate a database real content
@@ -8,7 +8,7 @@ import { CommentFragment }           from "../support/schema";
  * @returns {Object[]} - An array of objects representing comments data
  */
 const generateCommentsData = (num = 1) => {
-  let commentsData: CommentFragment[] = [];
+  const commentsData: CommentFragment[] = [];
 
   for (let idx = 0; idx < num; idx += 1) {
     commentsData.push({

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

@@ -9,14 +9,14 @@ const { I18n } = require("react-i18nify");
  * @returns {Void} - Nothing
  */
 const loadTranslations = () => {
-  const translationsContext = (<any> require).context("../../../config/locales/", true, /\.yml$/);
+  const translationsContext = (require as any).context("../../../config/locales/", true, /\.yml$/);
   const translationFiles = requireAll(translationsContext);
 
   const translations = translationsContext.keys().reduce((acc: any, key: string, index: number) => {
     const match = key.match(/\.\/(.*)\.yml/);
 
     if (match) {
-      let locale = match[1];
+      const locale = match[1];
       acc[locale] = translationFiles[index][locale].decidim;
     }
 

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

@@ -20,7 +20,7 @@ const resolver = (fieldName: string, root: any) => root[fieldName];
 const resolveGraphQLQuery = (document: any, options: any = {}) => {
   const { filterResult, rootValue, context, variables } = options;
 
-  let result = graphql(
+  const result = graphql(
     resolver,
     document,
     rootValue,

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

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def commentable_title
-        @commentable.title.kind_of?(Hash) ? @commentable.title[I18n.locale.to_s] : @commentable.title
+        @commentable.title.is_a?(Hash) ? @commentable.title[I18n.locale.to_s] : @commentable.title
       end
     end
   end

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

@@ -18,10 +18,11 @@ module Decidim
       MAX_DEPTH = 3
 
       belongs_to :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", polymorphic: true
+      belongs_to :root_commentable, foreign_key: "decidim_root_commentable_id", foreign_type: "decidim_root_commentable_type", polymorphic: true
       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, :body, presence: true
+      validates :author, :commentable, :root_commentable, :body, presence: true
       validates :depth, numericality: { greater_than_or_equal_to: 0 }
       validates :alignment, inclusion: { in: [0, 1, -1] }
 
@@ -50,15 +51,9 @@ module Decidim
         down_votes.any? { |vote| vote.author == user }
       end
 
-      # Public: Returns the commentable object of the parent comment
-      def root_commentable
-        return commentable if depth == 0
-        commentable.root_commentable
-      end
-
       # Public: Overrides the `reported_content` Reportable concern method.
       def reported_content
-        "<p>#{body}</p>"
+        body
       end
 
       private

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

@@ -17,6 +17,7 @@ module Decidim
           random = rand(Decidim::User.count)
           Comment.create(
             commentable: resource,
+            root_commentable: resource,
             body: ::Faker::Lorem.sentence,
             author: Decidim::User.where(organization: organization).offset(random).first
           )

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

@@ -1,5 +1,66 @@
 fr:
+  activerecord:
+    errors:
+      messages:
+        cannot_have_comments: ne peut pas être commenté
   decidim:
     comments:
       comment_notification_mailer:
-        hello: Bonjour %{name},
+        comment_created:
+          new_comment_html: Un nouveau commentaire a été publié par <b>%{commenter}</b> dans <b>%{commentable_link}</b>
+        hello: Bonjour %{name},
+        manage_email_subscriptions_html: Vous pouvez arrêter de recevoir ces emails en modifiant vos paramètres dans %{link}.
+        notifications_settings_link: la page de configuration des notifications
+        reply_created:
+          new_reply_html: Il y a une nouvelle réponse à votre commentaire de <b>%{commenter}</b> dans <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: Vous avez un nouveau commentaire
+          reply_created:
+            subject: Vous avez une nouvelle réponse à votre commentaire
+    components:
+      add_comment_form:
+        account_message: 'Pour ajouter votre commentaire <a href="%{sign_in_url}"> identifiez vous avec votre compte</a> ou <a href="%{sign_up_url}">inscrivez-vous</a>. '
+        form:
+          body:
+            label: Commentaire
+            placeholder: Que pensez-vous de cela?
+          form_error: Le texte est requis et ne peut pas dépasser %{length} caractères.
+          submit: Envoyer
+          user_group_id:
+            label: Commenter en tant que
+        opinion:
+          neutral: Neutre
+        title: Ajoutez votre commentaire
+      comment:
+        alignment:
+          against: Contre
+          in_favor: Pour
+        reply: Répondre
+        report:
+          action: Signaler
+          already_reported: Ce contenu a déjà été signalé et il sera examiné par un administrateur.
+          close: Fermer
+          description: Ce contenu est-il inapproprié?
+          details: Commentaires additionnels
+          reasons:
+            does_not_belong: Contient des activités illégales, des menaces suicidaires, des informations personnelles, ou autre chose que vous pensez ne pas être approprié à %{organization_name}.
+            offensive: Contient des propos racisme, sexiste, des insultes, des attaques personnelles, des menaces de mort, des incitations au suicide ou toute forme de discours de haine.
+            spam: Contient des piège-à-clic (clickbait), des publicités, des escroqueries ou des robots fonctionnant au script (script bots).
+          title: Signaler un problème
+      comment_order_selector:
+        order:
+          best_rated: Les mieux notés
+          most_discussed: Les plus débattus
+          older: Les plus anciens
+          recent: Les plus récents
+        title: 'Classement par :'
+      comment_thread:
+        title: Conversation avec %{authorName}
+      comments:
+        blocked_comments_warning: Les commentaires sont désactivés dans l'étape actuelle, mais vous pouvez lire les commentaires des étapes précédentes.
+        loading: Chargement des commentaires ...
+        title: "%{count} commentaires"
+      featured_comment:
+        title: Commentaire vedette

data/decidim-comments/db/migrate/20170504085413_add_root_commentable_to_comments.rb

@@ -0,0 +1,7 @@
+class AddRootCommentableToComments < ActiveRecord::Migration[5.0]
+  def change
+    change_table :decidim_comments_comments do |t|
+      t.references :decidim_root_commentable, polymorphic: true, index: { name: "decidim_comments_comment_root_commentable" }
+    end
+  end
+end

data/decidim-comments/db/migrate/20170510091348_update_root_commentable_for_comments.rb

@@ -0,0 +1,22 @@
+class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
+  def up
+    Decidim::Comments::Comment.where(depth: 0).update_all(
+      "decidim_root_commentable_id = decidim_commentable_id, decidim_root_commentable_type = decidim_commentable_type"
+    )
+
+    Decidim::Comments::Comment.where("depth > 0").find_each do |comment|
+      comment.root_commentable = root_commentable(comment)
+      comment.save(validate: false)
+    end
+  end
+
+  def down
+  end
+
+  private
+
+  def root_commentable(comment)
+    return comment.commentable if comment.depth.zero?
+    root_commentable comment.commentable
+  end
+end

data/decidim-comments/db/migrate/20170510091409_set_root_commentable_null_constraints.rb

@@ -0,0 +1,6 @@
+class SetRootCommentableNullConstraints < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null(:decidim_comments_comments, :decidim_root_commentable_id, false)
+    change_column_null(:decidim_comments_comments, :decidim_root_commentable_type, false)
+  end
+end

data/decidim-comments/db/seeds.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
 # Since comments cannot exist without a real model we are not including
 # specific seeds for this engine.
 # Other engines are free to include comments on their seeds like this:
-# 
-# n.times do 
+#
+# n.times do
 #   Decidim::Comments::Comment.create!(
 #     author: author,
 #     commentable: commentable,
+#     root_commentable: commentable,
 #     body: Faker::Lorem.paragraph
 #   )
 # end

data/decidim-comments/lib/decidim/comments/engine.rb

@@ -29,6 +29,14 @@ module Decidim
       initializer "decidim_comments.mutation_extensions" do
         Comments::MutationExtensions.extend!(Decidim::Api::MutationType)
       end
+
+      initializer "decidim.stats" do
+        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
+          Decidim.feature_manifests.sum do |feature|
+            feature.stats.filter(tag: :comments).with_context(features, start_at, end_at).map { |_name, value| value }.sum
+          end
+        end
+      end
     end
   end
 end

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

@@ -6,6 +6,7 @@ FactoryGirl.define do
   factory :comment, class: "Decidim::Comments::Comment" do
     author { build(:user, organization: commentable.organization) }
     commentable { build(:dummy_resource) }
+    root_commentable { commentable }
     body { Faker::Lorem.paragraph }
   end