Merge branch 'master' into stream-e2e

client/coral-admin/src/components/Comment.js

@@ -6,6 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations.json';
 import Linkify from 'react-linkify';
 import {FabButton} from 'coral-ui';
+import {Icon} from 'react-mdl';
 
 const linkify = new Linkify();
 

client/coral-admin/src/containers/Configure.js

@@ -100,7 +100,7 @@ class Configure extends React.Component {
   }
 
   getEmbed () {
-    const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='http://pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {});</script>`;
+    const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='${window.location.protocol}//pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {title: 'Comments'});</script>`;
 
     return <List>
       <ListItem className={styles.configSettingEmbed}>

client/coral-embed-stream/src/CommentStream.js

@@ -104,7 +104,8 @@ class CommentStream extends Component {
                 <div className="commentActionsLeft">
                   <ReplyButton
                     updateItem={this.props.updateItem}
-                    id={commentId}/>
+                    id={commentId}
+                    showReply={comment.showReply}/>
                   <LikeButton
                     addNotification={this.props.addNotification}
                     id={commentId}
@@ -145,13 +146,14 @@ class CommentStream extends Component {
                       let reply = this.props.items.comments[replyId];
                       return <div className="reply" key={replyId}>
                         <hr aria-hidden={true}/>
-                        <AuthorName author={users[comment.author_id]}/>
+                        <AuthorName author={users[reply.author_id]}/>
                         <PubDate created_at={reply.created_at}/>
                         <Content body={reply.body}/>
                         <div className="replyActionsLeft">
                             <ReplyButton
                               updateItem={this.props.updateItem}
-                              parent_id={reply.parent_id}/>
+                              id={replyId}
+                              showReply={reply.showReply}/>
                             <LikeButton
                               addNotification={this.props.addNotification}
                               id={replyId}
@@ -177,6 +179,17 @@ class CommentStream extends Component {
                                 asset_id={rootItemId}
                                 />
                           </div>
+                          <ReplyBox
+                            addNotification={this.props.addNotification}
+                            postItem={this.props.postItem}
+                            appendItemArray={this.props.appendItemArray}
+                            updateItem={this.props.updateItem}
+                            id={rootItemId}
+                            author={user}
+                            parent_id={commentId}
+                            child_id={replyId}
+                            premod={this.props.config.moderation}
+                            showReply={reply.showReply}/>
                       </div>;
                     })
                 }

client/coral-plugin-commentbox/CommentBox.js

@@ -22,7 +22,7 @@ class CommentBox extends Component {
   }
 
   postComment = () => {
-    const {postItem, updateItem, id, parent_id, addNotification, appendItemArray, premod, author} = this.props;
+    const {postItem, updateItem, id, parent_id, child_id, addNotification, appendItemArray, premod, author} = this.props;
     let comment = {
       body: this.state.body,
       asset_id: id,
@@ -38,7 +38,7 @@ class CommentBox extends Component {
       related = 'comments';
       parent_type = 'assets';
     }
-    updateItem(parent_id, 'showReply', false, 'comments');
+    updateItem(child_id || parent_id, 'showReply', false, 'comments');
     postItem(comment, 'comments')
     .then((comment_id) => {
       if (premod === 'pre') {

client/coral-plugin-replies/ReplyButton.js

@@ -6,7 +6,7 @@ const name = 'coral-plugin-replies';
 
 const ReplyButton = (props) => <button
     className={`${name}-reply-button`}
-    onClick={() => props.updateItem(props.id || props.parent_id, 'showReply', true, 'comments')}>
+    onClick={() => props.updateItem(props.id, 'showReply', !props.showReply, 'comments')}>
     {lang.t('reply')}
     <i className={`${name}-icon material-icons`}
       aria-hidden={true}>reply</i>