From 4737e846812dd30dce2fab935514b42be18d06ab Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 7 Nov 2016 16:11:10 -0500
Subject: [PATCH] Displaying comments and replies appropriately.

---
 client/coral-embed-stream/src/CommentStream.js |  6 ++++--
 client/coral-plugin-commentbox/CommentBox.js   | 16 ++++++++--------
 client/coral-plugin-replies/ReplyBox.js        |  3 ++-
 client/coral-plugin-replies/ReplyButton.js     |  2 +-
 routes/api/comments/index.js                   |  1 +
 routes/api/stream/index.js                     |  1 +
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index 787cba78a..b8ec5c762 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -111,7 +111,8 @@ class CommentStream extends Component {
                 postItem={this.props.postItem}
                 appendItemArray={this.props.appendItemArray}
                 updateItem={this.props.updateItem}
-                id={rootItemId}/>
+                id={rootItemId}
+                reply={false}/>
             </div>
             {
               rootItem.comments.map((commentId) => {
@@ -137,7 +138,8 @@ class CommentStream extends Component {
                       postItem={this.props.postItem}
                       appendItemArray={this.props.appendItemArray}
                       updateItem={this.props.updateItem}
-                      id={commentId}
+                      id={rootItemId}
+                      parent_id={commentId}
                       showReply={comment.showReply}/>
                     {
                       comment.children &&
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 1bd138af9..b7d282f10 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -19,26 +19,26 @@ class CommentBox extends Component {
   }
 
   postComment = () => {
-    const {postItem, updateItem, id, reply, addNotification, appendItemArray} = this.props
+    const {postItem, updateItem, id, parent_id, addNotification, appendItemArray} = this.props
     let comment = {
       body: this.state.body,
       asset_id: id,
       username: this.state.username
     }
     let related
-    if (reply) {
-      comment.parent_id = id
+    if (parent_id) {
+      comment.parent_id = parent_id
       related = 'children'
     } else {
       related = 'comments'
     }
-    updateItem(id, 'showReply', false)
+    updateItem(parent_id, 'showReply', false)
     postItem(comment, 'comments')
     .then((comment_id) => {
-      appendItemArray(id, related, comment_id)
+      appendItemArray(parent_id || id, related, comment_id)
       addNotification('success', 'Your comment has been posted.')
     }).catch((err) => console.error(err))
-    this.setState({content: ''})
+    this.setState({body: ''})
   }
 
   render () {
@@ -49,7 +49,7 @@ class CommentBox extends Component {
         <input type='text'
           className={name + '-username'}
           style={styles && styles.textarea}
-          value={this.state.content}
+          value={this.state.username}
           id={reply ? 'replyUser' : 'commentUser'}
           placeholder='Name'
           onChange={(e) => this.setState({username: e.target.value})}/>
@@ -65,7 +65,7 @@ class CommentBox extends Component {
           <textarea
             className={name + '-textarea'}
             style={styles && styles.textarea}
-            value={this.state.content}
+            value={this.state.body}
             placeholder='Comment'
             id={reply ? 'replyText' : 'commentText'}
             onChange={(e) => this.setState({body: e.target.value})}
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index d496a63f7..6ecd9eef3 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -8,7 +8,8 @@ const ReplyBox = (props) => <div
    style={props.styles && props.styles.container}>
      {
        props.showReply && <CommentBox
-         item_id = {props.item_id}
+         id = {props.id}
+         parent_id = {props.parent_id}
          postItem = {props.postItem}
          addNotification = {props.addNotification}
          appendItemArray = {props.appendItemArray}
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index 33c6d4c3f..157d24aaf 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -5,7 +5,7 @@ const name = 'coral-plugin-replies'
 
 const ReplyButton = (props) => <button
     className={name + '-reply-button'}
-    onClick={(e) => props.updateItem(props.item_id || props.parent_id, 'showReply', true)}>
+    onClick={(e) => props.updateItem(props.id || props.parent_id, 'showReply', true)}>
     <i className={name + '-icon material-icons'}
       aria-hidden={true}>reply</i>
     {lang.t('reply')}
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 428369ae1..57c434a6f 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -46,6 +46,7 @@ router.post('/:comment_id', (req, res, next) => {
     comment.asset_id = req.body.asset_id;
     comment.parent_id = req.body.parent_id;
     comment.status = req.body.status;
+    comment.username = req.body.username;
 
     comment.save().then((comment) => {
       res.status(200).send(comment);
diff --git a/routes/api/stream/index.js b/routes/api/stream/index.js
index c63bf871d..5c3333ac8 100644
--- a/routes/api/stream/index.js
+++ b/routes/api/stream/index.js
@@ -17,6 +17,7 @@ router.get('/', (req, res, next) => {
       Action.findByItemIdArray(comments.map((comment) => comment.id))
     ]);
   }).then(([comments, users, actions]) => {
+    console.log(comments.length);
     res.json([...comments,...users,...actions]);
   }).catch(error => {
     next(error);