From cab93c1128f5c67becf5b2619fe3b7f144a145ca Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Wed, 9 Nov 2016 11:55:12 +0900
Subject: [PATCH] re-enable comment nesting

---
 .../lib/comments/CommentsNode.jsx              | 18 +++++++++---------
 .../lib/posts/PostsCommentsThread.jsx          |  4 +++-
 .../lib/users/UsersProfileCheck.jsx            |  3 ++-
 packages/nova-comments/lib/resolvers.js        |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/nova-base-components/lib/comments/CommentsNode.jsx b/packages/nova-base-components/lib/comments/CommentsNode.jsx
index 13ddfe59b..164c197d9 100644
--- a/packages/nova-base-components/lib/comments/CommentsNode.jsx
+++ b/packages/nova-base-components/lib/comments/CommentsNode.jsx
@@ -10,23 +10,23 @@ class CommentsNode extends Component {
     )
   }
 
-  // renderChildren(children) {
-  //   return (
-  //     <div className="comments-children">
-  //       {children.map(comment => <CommentsNode comment={comment} key={comment._id} currentUser={this.props.currentUser}/>)}
-  //     </div>
-  //   )
-  // }
+  renderChildren(children) {
+    return (
+      <div className="comments-children">
+        {children.map(comment => <CommentsNode comment={comment} key={comment._id} currentUser={this.props.currentUser}/>)}
+      </div>
+    )
+  }
 
   render() {
 
     const comment = this.props.comment;
-    //const children = this.props.comment.childrenResults;
+    const children = this.props.comment.childrenResults;
     
     return (
       <div className="comments-node">
         {this.renderComment(comment)}
-        {/*children ? this.renderChildren(children) : ""*/}
+        {children ? this.renderChildren(children) : null}
       </div>
     )
   }
diff --git a/packages/nova-base-components/lib/posts/PostsCommentsThread.jsx b/packages/nova-base-components/lib/posts/PostsCommentsThread.jsx
index a43d530a8..568ca5e5a 100644
--- a/packages/nova-base-components/lib/posts/PostsCommentsThread.jsx
+++ b/packages/nova-base-components/lib/posts/PostsCommentsThread.jsx
@@ -8,10 +8,12 @@ const PostsCommentsThread = (props, context) => {
 
   const {postId, results, commentCount} = props;
 
+  const nestedComments = Telescope.utils.unflatten(results, '_id', 'parentCommentId');
+
   return (
     <div className="posts-comments-thread">
       <h4 className="posts-comments-thread-title"><FormattedMessage id="comments.comments"/></h4>
-      <Telescope.components.CommentsList comments={results} commentCount={commentCount}/>
+      <Telescope.components.CommentsList comments={nestedComments} commentCount={commentCount}/>
       { context.currentUser ?
         <div className="posts-comments-thread-new">
           <h4><FormattedMessage id="comments.new"/></h4>
diff --git a/packages/nova-base-components/lib/users/UsersProfileCheck.jsx b/packages/nova-base-components/lib/users/UsersProfileCheck.jsx
index 30c58d7ba..167e86345 100644
--- a/packages/nova-base-components/lib/users/UsersProfileCheck.jsx
+++ b/packages/nova-base-components/lib/users/UsersProfileCheck.jsx
@@ -25,7 +25,8 @@ const UsersProfileCheckModal = ({show, router}, {currentUser}) => {
         <NovaForm
           collection={ Users }
           document={ currentUser }
-          methodName="users.edit"
+          mutationName="usersEdit"
+          resultQuery={Users.graphQLQueries.single}
           successCallback={ (user) => Telescope.callbacks.runAsync("users.profileCompleted.async", user) }
           fields={ requiredFields }
         />
diff --git a/packages/nova-comments/lib/resolvers.js b/packages/nova-comments/lib/resolvers.js
index 87efc40cc..2ee99fac3 100644
--- a/packages/nova-comments/lib/resolvers.js
+++ b/packages/nova-comments/lib/resolvers.js
@@ -33,7 +33,7 @@ const resolvers = {
   Query: {
     comments(root, {postId}, context) {
       const options = {
-        limit: 5,
+        // limit: 5, // no limit for now
         fields: context.getViewableFields(context.currentUser, context.Comments)
       }
       return context.Comments.find({postId: postId}, options).fetch();