Merge pull request #2866 from Gauravseta/issue_2836

issue #2836 fix

Author: maxceem

src/components/ActionCard/AddComment.jsx

@@ -25,7 +25,7 @@ export default class AddComment extends React.Component {
   }
 
   render() {
-    const { className, avatarUrl, authorName, placeholder, isAdding, hasError, allMembers } = this.props
+    const { className, avatarUrl, authorName, placeholder, isAdding, hasError, allMembers, projectMembers } = this.props
 
     return (
       <RichTextArea ref="richTextArea"
@@ -39,6 +39,7 @@ export default class AddComment extends React.Component {
         avatarUrl={avatarUrl}
         authorName={authorName}
         allMembers={allMembers}
+        projectMembers={projectMembers}
       />
     )
   }
@@ -54,5 +55,6 @@ AddComment.propTypes = {
   placeholder: PropTypes.string,
   hasError: PropTypes.bool,
   isAdding: PropTypes.bool,
-  allMembers: PropTypes.object
+  allMembers: PropTypes.object,
+  projectMembers: PropTypes.object
 }

src/components/ActionCard/Comment.jsx

@@ -58,7 +58,7 @@ class Comment extends React.Component {
   }
 
   render() {
-    const {message, author, date, edited, children, noInfo, self, isSaving, hasError, readonly, allMembers, canDelete} = this.props
+    const {message, author, date, edited, children, noInfo, self, isSaving, hasError, readonly, allMembers, canDelete, projectMembers} = this.props
     const messageAnchor = `comment-${message.id}`
     const messageLink = window.location.pathname.substr(0, window.location.pathname.indexOf('#')) + `#${messageAnchor}`
     const authorName = author ? (author.firstName + ' ' + author.lastName) : 'Connect user'
@@ -84,6 +84,7 @@ class Comment extends React.Component {
             authorName={authorName}
             cancelEdit={this.cancelEdit}
             allMembers={allMembers}
+            projectMembers={projectMembers}
             editingTopic = {false}
           />
         </div>
@@ -194,7 +195,7 @@ Comment.propTypes = {
    */
   readonly: PropTypes.bool,
   allMembers: PropTypes.object.isRequired,
-
+  projectMembers: PropTypes.object,
   /**
    * If true only comment text is shown without additional info
    */

src/components/Feed/Feed.jsx

@@ -86,7 +86,7 @@ class Feed extends React.Component {
       id, user, currentUser, topicMessage, totalComments, hasMoreComments, onLoadMoreComments, isLoadingComments,
       allowComments, comments, children, onNewCommentChange, onAddNewComment, isAddingComment, onSaveMessageChange,
       onEditMessage, onSaveMessage, isSavingTopic, onDeleteMessage, onDeleteTopic, isDeletingTopic, error, allMembers,
-      onEnterFullscreenClick, onExitFullscreenClick, isFullScreen, commentId
+      onEnterFullscreenClick, onExitFullscreenClick, isFullScreen, commentId, projectMembers
     } = this.props
     const { editTopicMode, headerHeight } = this.state
     let authorName = user ? user.firstName : 'Unknown'
@@ -177,6 +177,7 @@ class Feed extends React.Component {
           onSaveMessage={onSaveMessage}
           onDeleteMessage={onDeleteMessage}
           allMembers={allMembers}
+          projectMembers={projectMembers}
           isFullScreen={isFullScreen}
           headerHeight={headerHeight}
           commentId={commentId}

src/components/Feed/FeedComments.jsx

@@ -179,7 +179,7 @@ class FeedComments extends React.Component {
     const {
       comments, currentUser, onLoadMoreComments, isLoadingComments, hasMoreComments, onAddNewComment,
       onNewCommentChange, error, avatarUrl, isAddingComment, allowComments, onSaveMessage, onDeleteMessage, allMembers,
-      totalComments, isFullScreen, headerHeight
+      totalComments, isFullScreen, headerHeight, projectMembers
     } = this.props
     const { isNewCommentMobileOpen, stickyRowNext, stickyRowPrev } = this.state
     let authorName = currentUser.firstName
@@ -319,6 +319,7 @@ class FeedComments extends React.Component {
           isSaving={item.isSavingComment}
           hasError={item.error}
           allMembers={allMembers}
+          projectMembers={projectMembers}
           noInfo={item.noInfo}
           canDelete={idx !== 0}
         >
@@ -389,6 +390,7 @@ class FeedComments extends React.Component {
                     isAdding={isAddingComment}
                     hasError={error}
                     allMembers={allMembers}
+                    projectMembers={projectMembers}
                   />
                 </div>
               }

src/components/Feed/NewPost.jsx

@@ -13,7 +13,7 @@ class NewPost extends React.Component {
   }
 
   render() {
-    const {currentUser, allMembers, titlePlaceholder, contentPlaceholder, isCreating, hasError, expandedTitlePlaceholder} = this.props
+    const {currentUser, allMembers, titlePlaceholder, contentPlaceholder, isCreating, hasError, expandedTitlePlaceholder, projectMembers} = this.props
     let authorName = currentUser.firstName
     if (authorName && currentUser.lastName) {
       authorName += ' ' + currentUser.lastName
@@ -38,6 +38,7 @@ class NewPost extends React.Component {
         avatarUrl={currentUser.photoURL}
         authorName={authorName}
         allMembers={allMembers}
+        projectMembers={projectMembers}
       />
     )
   }
@@ -48,6 +49,7 @@ NewPost.propTypes = {
   expandedTitlePlaceholder: PropTypes.string,
   currentUser: PropTypes.object.isRequired,
   allMembers: PropTypes.object.isRequired,
+  projectMembers: PropTypes.object,
   onPost: PropTypes.func.isRequired,
   onNewPostChange: PropTypes.func.isRequired,
   hasError: PropTypes.bool,

src/components/RichTextArea/RichTextArea.jsx

@@ -80,7 +80,7 @@ class RichTextArea extends React.Component {
   }
 
   componentWillMount() {
-    const suggestions = _.map(_.values(this.props.allMembers), (e) => { return {name: e.firstName + ' ' + e.lastName, handle: e.handle, userId: e.userId, link:'/users/'+e.handle} })
+    const suggestions = _.map(_.values(this.props.projectMembers), (e) => { return {name: e.firstName + ' ' + e.lastName, handle: e.handle, userId: e.userId, link:'/users/'+e.handle} })
     this.setState({
       editorExpanded: this.props.editMode,
       titleValue: this.props.title || '',
@@ -436,6 +436,7 @@ RichTextArea.propTypes = {
   title: PropTypes.string,
   content: PropTypes.string,
   allMembers: PropTypes.object,
+  projectMembers: PropTypes.object,
   editingTopic: PropTypes.bool
 }
 

src/projects/detail/components/ProjectStage.jsx

@@ -176,6 +176,7 @@ class ProjectStage extends React.Component{
       isAddingComment,
       onDeleteMessage,
       allMembers,
+      projectMembers,
       onSaveMessage,
       timeline,
       notifications,
@@ -237,6 +238,7 @@ class ProjectStage extends React.Component{
               isAddingComment={isAddingComment}
               onDeleteMessage={onDeleteMessage}
               allMembers={allMembers}
+              projectMembers={projectMembers}
               onSaveMessage={onSaveMessage}
             />
           )}

src/projects/detail/containers/FeedContainer.js

@@ -367,7 +367,7 @@ class FeedView extends React.Component {
 
   render () {
     const {currentUser, currentMemberRole, isCreatingFeed, error, allMembers,
-      toggleNotificationRead, notifications, project, isSuperUser } = this.props
+      toggleNotificationRead, notifications, project, isSuperUser, projectMembers } = this.props
     const { feeds, isNewPostMobileOpen, fullscreenFeedId } = this.state
     const isChanged = this.isChanged()
     const onLeaveMessage = this.onLeave() || ''
@@ -393,6 +393,7 @@ class FeedView extends React.Component {
                 allowComments: fullscreenFeed.allowComments && !!currentMemberRole,
                 currentUser,
                 allMembers,
+                projectMembers,
                 onNewCommentChange: this.onNewCommentChange.bind(this, fullscreenFeedId),
                 onAddNewComment: this.onAddNewComment.bind(this, fullscreenFeedId),
                 onLoadMoreComments: this.onShowAllComments.bind(this, fullscreenFeedId),
@@ -432,6 +433,7 @@ class FeedView extends React.Component {
               <NewPost
                 currentUser={currentUser}
                 allMembers={allMembers}
+                projectMembers={projectMembers}
                 onPost={this.onNewPost}
                 isCreating={isCreatingFeed}
                 hasError={error}
@@ -452,6 +454,7 @@ class FeedView extends React.Component {
                     allowComments: feed.allowComments && !!currentMemberRole,
                     currentUser,
                     allMembers,
+                    projectMembers,
                     onNewCommentChange: this.onNewCommentChange.bind(this, feed.id),
                     onAddNewComment: this.onAddNewComment.bind(this, feed.id),
                     onLoadMoreComments: this.onShowAllComments.bind(this, feed.id),
@@ -526,7 +529,9 @@ FeedContainer.PropTypes = {
   project: PropTypes.object.isRequired
 }
 
-const mapStateToProps = ({ projectTopics, members, loadUser, notifications }) => {
+const mapStateToProps = ({ projectTopics, members, loadUser, notifications, projectState }) => {
+  const project = projectState.project
+  const projectMembers = _.filter(members.members, m => _.some(project.members, pm => pm.userId === m.userId))
   return {
     currentUser    : loadUser.user,
     feeds          : projectTopics.feeds[PROJECT_FEED_TYPE_PRIMARY].topics,
@@ -535,6 +540,7 @@ const mapStateToProps = ({ projectTopics, members, loadUser, notifications }) =>
     isCreatingFeed : projectTopics.isCreatingFeed,
     error          : projectTopics.error,
     allMembers     : members.members,
+    projectMembers : _.keyBy(projectMembers, 'userId'),
     notifications,
   }
 }

src/projects/detail/containers/PhaseFeedHOC.jsx

@@ -169,14 +169,16 @@ const phaseFeedHOC = (Component) => {
     }
   }
 
-  const mapStateToProps = ({ phasesTopics, loadUser, members, productsTimelines, notifications }, props) => {
+  const mapStateToProps = ({ phasesTopics, loadUser, members, productsTimelines, notifications, projectState }, props) => {
     const product = _.get(props.phase, 'products[0]')
     const phaseTopicState = phasesTopics[props.phase.id] || {}
-
+    const project = projectState.project
+    const projectMembers = _.filter(members.members, m => _.some(project.members, pm => pm.userId === m.userId))
     return {
       ...phaseTopicState,
       currentUser: loadUser.user,
       allMembers: members.members,
+      projectMembers : _.keyBy(projectMembers, 'userId'),
       timeline: _.get(productsTimelines[product.id], 'timeline'),
       notifications: _.get(notifications, 'notifications', [])
     }