Github issue #572, Messaging: Owner response post missing from status update

-- Reverted previous changes. Found the root cause of the problem. Actually the flag, to prevent non team member from commenting on posts, was wrongly being used to render the feed's comments section on dashboard. It is used correctly on Discussions page.

Author: Vikas Agarwal

src/components/Feed/Feed.jsx

@@ -36,8 +36,8 @@ const Feed = (props) => {
           <div className="card-body draftjs-post" dangerouslySetInnerHTML={{__html: html}} />
         </div>
       </Panel.Body>
-      {allowComments &&
       <FeedComments
+        allowComments={ allowComments }
         totalComments={totalComments}
         hasMoreComments={hasMoreComments}
         onLoadMoreComments={onLoadMoreComments}
@@ -49,7 +49,7 @@ const Feed = (props) => {
         avatarUrl={currentUser.photoURL}
         comments={comments}
         isAddingComment={ isAddingComment }
-      />}
+      />
       {children}
     </ActionCard>
   )

src/components/Feed/FeedComments.jsx

@@ -25,7 +25,7 @@ class FeedComments extends React.Component {
   render() {
     const {
     comments, currentUser, totalComments, onLoadMoreComments, isLoadingComments, hasMoreComments, onAdd,
-    onChange, content, avatarUrl, isAddingComment
+    onChange, content, avatarUrl, isAddingComment, allowComments
   } = this.props
     let authorName = currentUser.firstName
     if (authorName && currentUser.lastName) {
@@ -77,6 +77,7 @@ class FeedComments extends React.Component {
           <div dangerouslySetInnerHTML={{__html: item.content}} />
         </Comment>
       )}
+      {allowComments &&
       <AddComment
         placeholder="Create a new comment..."
         onAdd={onAdd}
@@ -85,7 +86,7 @@ class FeedComments extends React.Component {
         avatarUrl={avatarUrl}
         authorName={ authorName }
         isAdding={ isAddingComment }
-      />
+      />}
     </div>
   )
   }

src/projects/detail/containers/FeedContainer.js

@@ -212,7 +212,7 @@ class FeedView extends React.Component {
         <div className="feed-action-card" key={item.id}>
           <Feed
             {...item}
-            allowComments={ item.allowComments }
+            allowComments={ item.allowComments && !!currentMemberRole}
             currentUser={currentUser}
             onNewCommentChange={this.onNewCommentChange.bind(this, item.id)}
             onAddNewComment={this.onAddNewComment.bind(this, item.id)}

src/projects/detail/containers/MessagesContainer.js

@@ -299,7 +299,7 @@ class MessagesView extends React.Component {
         return (
           <MessageDetails
             {...activeThread}
-            allowAddingComment={ activeThread.allowComments }
+            allowAddingComment={ activeThread.allowComments && !!currentMemberRole }
             onLoadMoreMessages={this.onShowAllComments.bind(this, activeThread.id)}
             onNewMessageChange={this.onNewMessageChange}
             onAddNewMessage={ this.onAddNewMessage.bind(this, activeThread.id) }