decidim-comments 0.9.3 → 0.10.0

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

@@ -10,7 +10,7 @@ import UpVoteButton from "./up_vote_button.component";
 import {
   AddCommentFormCommentableFragment,
   AddCommentFormSessionFragment,
-  CommentFragment,
+  CommentFragment
 } from "../support/schema";
 
 const { I18n } = require("react-i18nify");
@@ -41,7 +41,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
     articleClassName: "comment",
     isRootComment: false,
     session: null,
-    votable: false,
+    votable: false
   };
 
   public commentNode: HTMLElement;
@@ -50,7 +50,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
     super(props);
 
     this.state = {
-      showReplyForm: false,
+      showReplyForm: false
     };
   }
 
@@ -349,7 +349,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
     const { comment: { alignment } } = this.props;
     const spanClassName = classnames("label alignment", {
       success: alignment === 1,
-      alert: alignment === -1,
+      alert: alignment === -1
     });
 
     let label = "";
@@ -429,7 +429,7 @@ class Comment extends React.Component<CommentProps, CommentState> {
                     </label>
                     <button type="submit" name="commit" className="button">{I18n.t("components.comment.report.action")}</button>
                   </form>
-                ),
+                )
               ];
             })()
           }

data/app/frontend/comments/comment_order_selector.component.test.tsx

@@ -10,7 +10,7 @@ describe("<CommentOrderSelector />", () => {
   beforeEach(() => {
     window.$ = () => {
       return {
-        foundation: jasmine.createSpy(""),
+        foundation: jasmine.createSpy("")
       };
     };
   });

data/app/frontend/comments/comment_order_selector.component.tsx

@@ -24,7 +24,7 @@ class CommentOrderSelector extends React.Component<CommentOrderSelectorProps, Co
     super(props);
 
     this.state = {
-      orderBy: this.props.defaultOrderBy,
+      orderBy: this.props.defaultOrderBy
     };
   }
 

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

@@ -13,7 +13,7 @@ describe("<CommentThread />", () => {
   const orderBy = "older";
   const rootCommentable = {
     id: "1",
-    type: "Decidim::DummyResources::DummyResource",
+    type: "Decidim::DummyResources::DummyResource"
   };
   let comment: CommentFragment;
   let session: any = null;
@@ -23,7 +23,7 @@ describe("<CommentThread />", () => {
     const commentsData = generateCommentsData(1);
 
     session = {
-      user: generateCUserData(),
+      user: generateCUserData()
     };
     comment = commentsData[0];
   });

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

@@ -5,7 +5,7 @@ import Comment from "./comment.component";
 import {
   AddCommentFormCommentableFragment,
   AddCommentFormSessionFragment,
-  CommentFragment,
+  CommentFragment
 } from "../support/schema";
 
 const { I18n } = require("react-i18nify");
@@ -29,7 +29,7 @@ interface CommentThreadProps {
 class CommentThread extends React.Component<CommentThreadProps> {
   public static defaultProps: any = {
     session: null,
-    votable: false,
+    votable: false
   };
 
   public render() {

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

@@ -29,21 +29,21 @@ describe("<Comments />", () => {
       filterResult: false,
       rootValue: {
         session: {
-          user: userData,
+          user: userData
         },
         commentable: {
           acceptsNewComments: true,
           commentsHaveAlignment: true,
           commentsHaveVotes: true,
           totalCommentsCount: 15,
-          comments: commentsData,
-        },
+          comments: commentsData
+        }
       },
       variables: {
         orderBy,
         commentableId,
-        commentableType,
-      },
+        commentableType
+      }
     });
 
     session = result.session;

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

@@ -9,7 +9,7 @@ import CommentThread from "./comment_thread.component";
 
 import {
   GetCommentsQuery,
-  GetCommentsQueryVariables,
+  GetCommentsQueryVariables
 } from "../support/schema";
 
 const { I18n } = require("react-i18nify");
@@ -32,8 +32,8 @@ export class Comments extends React.Component<CommentsProps> {
     loading: false,
     session: null,
     commentable: {
-      comments: [],
-    },
+      comments: []
+    }
   };
 
   public render() {
@@ -142,7 +142,7 @@ export const commentsQuery = require("../queries/comments.query.graphql");
 
 const CommentsWithData: any = graphql<GetCommentsQuery, CommentsProps>(commentsQuery, {
   options: {
-    pollInterval: 15000,
+    pollInterval: 15000
   },
   props: ({ ownProps, data }) => {
     if (data) {
@@ -155,12 +155,12 @@ const CommentsWithData: any = graphql<GetCommentsQuery, CommentsProps>(commentsQ
         orderBy: ownProps.orderBy,
         reorderComments: (orderBy: string) => {
           return refetch({
-            orderBy,
+            orderBy
           });
-        },
+        }
       };
     }
-  },
+  }
 })(Comments);
 
 export interface CommentsApplicationProps extends GetCommentsQueryVariables {

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

@@ -13,7 +13,7 @@ describe("<DownVoteButton />", () => {
   const orderBy = "older";
   const rootCommentable = {
     id: "1",
-    type: "Decidim::DummyResources::DummyResource",
+    type: "Decidim::DummyResources::DummyResource"
   };
   let comment: DownVoteButtonFragment;
   let session: any = null;
@@ -22,7 +22,7 @@ describe("<DownVoteButton />", () => {
   beforeEach(() => {
     const commentsData = generateCommentsData(1);
     session = {
-      user: generateUserData(),
+      user: generateUserData()
     };
     comment = commentsData[0];
   });

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

@@ -9,7 +9,7 @@ import {
   CommentFragment,
   DownVoteButtonFragment,
   DownVoteMutation,
-  GetCommentsQuery,
+  GetCommentsQuery
 } from "../support/schema";
 
 interface DownVoteButtonProps {
@@ -25,7 +25,7 @@ interface DownVoteButtonProps {
 export const DownVoteButton: React.SFC<DownVoteButtonProps> = ({
   session,
   comment: { downVotes, upVoted, downVoted },
-  downVote,
+  downVote
 }) => {
   let selectedClass = "";
 
@@ -58,7 +58,7 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
   props: ({ ownProps, mutate }: { ownProps: DownVoteButtonProps, mutate: MutationFunc<DownVoteMutation> }) => ({
     downVote: () => mutate({
       variables: {
-        id: ownProps.comment.id,
+        id: ownProps.comment.id
       },
       optimisticResponse: {
         __typename: "Mutation",
@@ -68,15 +68,15 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
             __typename: "Comment",
             ...ownProps.comment,
             downVotes: ownProps.comment.downVotes + 1,
-            downVoted: true,
-          },
-        },
+            downVoted: true
+          }
+        }
       },
       update: (store, { data }: { data: DownVoteMutation }) => {
         const variables = {
           commentableId: ownProps.rootCommentable.id,
           commentableType: ownProps.rootCommentable.type,
-          orderBy: ownProps.orderBy,
+          orderBy: ownProps.orderBy
         };
 
         const commentReducer = (comment: CommentFragment): CommentFragment => {
@@ -88,7 +88,7 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
 
           return {
             ...comment,
-            comments: replies.map(commentReducer),
+            comments: replies.map(commentReducer)
           };
         };
 
@@ -101,15 +101,15 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
               ...prev,
               commentable: {
                 ...prev.commentable,
-                comments: prev.commentable.comments.map(commentReducer),
-              },
+                comments: prev.commentable.comments.map(commentReducer)
+              }
             },
-            variables,
+            variables
           });
         }
-      },
-    }),
-  }),
+      }
+    })
+  })
 })(DownVoteButton);
 
 export default DownVoteButtonWithMutation;

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

@@ -13,7 +13,7 @@ describe("<UpVoteButton />", () => {
   const orderBy = "older";
   const rootCommentable = {
     id: "1",
-    type: "Decidim::DummyResources::DummyResource",
+    type: "Decidim::DummyResources::DummyResource"
   };
   let comment: UpVoteButtonFragment;
   let session: any = null;
@@ -22,7 +22,7 @@ describe("<UpVoteButton />", () => {
   beforeEach(() => {
     const commentsData = generateCommentsData(1);
     session = {
-      user: generateUserData(),
+      user: generateUserData()
     };
     comment = commentsData[0];
   });

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

@@ -9,7 +9,7 @@ import {
   CommentFragment,
   GetCommentsQuery,
   UpVoteButtonFragment,
-  UpVoteMutation,
+  UpVoteMutation
 } from "../support/schema";
 
 interface UpVoteButtonProps {
@@ -25,7 +25,7 @@ interface UpVoteButtonProps {
 export const UpVoteButton: React.SFC<UpVoteButtonProps> = ({
   session,
   comment: { upVotes, upVoted, downVoted },
-  upVote,
+  upVote
 }) => {
   let selectedClass = "";
 
@@ -58,7 +58,7 @@ const UpVoteButtonWithMutation = graphql<UpVoteMutation, UpVoteButtonProps>(upVo
   props: ({ ownProps, mutate }: { ownProps: UpVoteButtonProps, mutate: MutationFunc<UpVoteMutation> }) => ({
     upVote: () => mutate({
       variables: {
-        id: ownProps.comment.id,
+        id: ownProps.comment.id
       },
       optimisticResponse: {
         __typename: "Mutation",
@@ -68,15 +68,15 @@ const UpVoteButtonWithMutation = graphql<UpVoteMutation, UpVoteButtonProps>(upVo
             __typename: "Comment",
             ...ownProps.comment,
             upVotes: ownProps.comment.upVotes + 1,
-            upVoted: true,
-          },
-        },
+            upVoted: true
+          }
+        }
       },
       update: (store, { data }: { data: UpVoteMutation }) => {
         const variables = {
           commentableId: ownProps.rootCommentable.id,
           commentableType: ownProps.rootCommentable.type,
-          orderBy: ownProps.orderBy,
+          orderBy: ownProps.orderBy
         };
 
         const commentReducer = (comment: CommentFragment): CommentFragment => {
@@ -88,7 +88,7 @@ const UpVoteButtonWithMutation = graphql<UpVoteMutation, UpVoteButtonProps>(upVo
 
           return {
             ...comment,
-            comments: replies.map(commentReducer),
+            comments: replies.map(commentReducer)
           };
         };
 
@@ -101,15 +101,15 @@ const UpVoteButtonWithMutation = graphql<UpVoteMutation, UpVoteButtonProps>(upVo
               ...prev,
               commentable: {
                 ...prev.commentable,
-                comments: prev.commentable.comments.map(commentReducer),
-              },
+                comments: prev.commentable.comments.map(commentReducer)
+              }
             },
-            variables,
+            variables
           });
         }
-      },
-    }),
-  }),
+      }
+    })
+  })
 })(UpVoteButton);
 
 export default UpVoteButtonWithMutation;

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

@@ -22,7 +22,7 @@ const VoteButton: React.SFC<VoteButtonProps> = ({
   voteAction,
   disabled,
   selectedClass,
-  userLoggedIn,
+  userLoggedIn
 }) => (
   <button
     className={`${buttonClassName} ${selectedClass}`}
@@ -40,7 +40,7 @@ VoteButton.defaultProps = {
   iconName: "",
   votes: 0,
   selectedClass: "selected",
-  disabled: false,
+  disabled: false
 };
 
 export default VoteButton;

data/app/frontend/entry.ts

@@ -11,7 +11,7 @@ window.DecidimComments.renderCommentsComponent = (nodeId: string, props: Comment
 
   ReactDOM.render(
     React.createElement(Comments, props),
-    node,
+    node
   );
 };
 

data/app/frontend/support/generate_comments_data.ts

@@ -27,7 +27,7 @@ const generateCommentsData = (num = 1) => {
         avatarUrl: image.imageUrl(),
         profilePath: `/profiles/${nickname}`,
         deleted: false,
-        badge: "verified-badge",
+        badge: "verified-badge"
       },
       hasComments: false,
       comments: [],
@@ -38,7 +38,7 @@ const generateCommentsData = (num = 1) => {
       downVotes: random.number(),
       downVoted: false,
       sgid: random.uuid(),
-      alreadyReported: false,
+      alreadyReported: false
     });
   }
 

data/app/frontend/support/generate_user_data.ts

@@ -7,7 +7,7 @@ import { name } from "faker/locale/en";
 const generateUserData = () => {
   return {
     name: `${name.firstName()} ${name.lastName()}`,
-    nickname: `@${name.findName()}`,
+    nickname: `@${name.findName()}`
   };
 };
 

data/app/frontend/support/generate_user_group_data.ts

@@ -7,7 +7,7 @@ import { company, random } from "faker/locale/en";
 const generateUserGrouprData = () => {
   return {
     id: random.uuid(),
-    name: company.companyName(),
+    name: company.companyName()
   };
 };
 

data/app/frontend/support/resolve_graphql_query.ts

@@ -25,7 +25,7 @@ const resolveGraphQLQuery = (document: any, options: any = {}) => {
     document,
     rootValue,
     context,
-    variables,
+    variables
   );
 
   if (filterResult) {

data/app/types/decidim/comments/commentable_mutation_type.rb

@@ -17,7 +17,7 @@ module Decidim
 
         resolve lambda { |obj, args, ctx|
           params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId] } }
-          form = Decidim::Comments::CommentForm.from_params(params)
+          form = Decidim::Comments::CommentForm.from_params(params).with_context(current_organization: ctx[:current_organization])
           Decidim::Comments::CreateComment.call(form, ctx[:current_user], obj) do
             on(:ok) do |comment|
               return comment

data/config/locales/uk.yml

@@ -52,6 +52,24 @@ uk:
         title: "%{count} коментарів"
       featured_comment:
         title: Рекомендований коментар
+    events:
+      comments:
+        comment_created:
+          comment:
+            email_intro: '"%{resource_title}" прокоментували. Ви можете прочитати коментар на цій сторінці:'
+            email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
+            email_subject: Надійшов новий коментар від %{author_name} на %{resource_title}
+            notification_title: Надійшов новий коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a> на <a href="%{resource_path}">%{resource_title}</a>
+          reply:
+            email_intro: '"%{resource_title}" прокоментували'
+            email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}" чи його автором. Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
+            email_subject: Надійшла нова відповідь на ваш коментар від %{author_name} на <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Надійшла нова відповідь на ваш коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a> на <a href="%{resource_path}">%{resource_title}</a>
+        user_mentioned:
+          email_intro: Вас згадали
+          email_outro: Ви отримали це сповіщення, оскільки вас згадали в "%{resource_title}".
+          email_subject: Вас згадали у %{resource_title}
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> згадав вас у <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: не підлягає коментуванню