MM-22989 - Adding reply count to root posts in RHS

components/search_results_item/index.js

@@ -3,13 +3,15 @@
 
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
+import {createSelector} from 'reselect';
+
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 import {makeGetCommentCountForPost} from 'mattermost-redux/selectors/entities/posts';
 import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
-import {isPostFlagged} from 'mattermost-redux/utils/post_utils';
+import {isPostEphemeral, isPostFlagged} from 'mattermost-redux/utils/post_utils';
 
 import {
  closeRightHandSide,
@@ -23,7 +25,23 @@ import {getDirectTeammate, getDisplayNameByUser} from 'utils/utils.jsx';
 
 import SearchResultsItem from './search_results_item.jsx';
 
+export function makeGetReplyCount() {
+ return createSelector(
+ (state) => state.entities.posts.posts,
+ (state, post) => state.entities.posts.postsInThread[post.root_id || post.id],
+ (allPosts, postIds) => {
+ if (!postIds) {
+ return 0;
+ }
+
+ // Count the number of non-ephemeral posts in the thread
+ return postIds.map((id) => allPosts[id]).filter((post) => post && !isPostEphemeral(post)).length;
+ }
+ );
+}
+
 function mapStateToProps() {
+ const getReplyCount = makeGetReplyCount();
  const createAriaLabelForPost = makeCreateAriaLabelForPost();
  const getCommentCountForPost = makeGetCommentCountForPost();
 
@@ -48,7 +66,8 @@ function mapStateToProps() {
  isFlagged: isPostFlagged(post.id, preferences),
  isBot: user ? user.is_bot : false,
  directTeammate,
- displayName: getDisplayNameByUser(state, directTeammate)
+ displayName: getDisplayNameByUser(state, directTeammate),
+ replyCount: getReplyCount(state, post),
  };
  };
 }

components/search_results_item/search_results_item.jsx

@@ -109,6 +109,11 @@ class SearchResultsItem extends React.PureComponent {
  intl: intlShape.isRequired,
  directTeammate: PropTypes.string.isRequired,
  displayName: PropTypes.string.isRequired,
+
+ /**
+ * The number of replies in the same thread as this post
+ */
+ replyCount: PropTypes.number,
  };
 
  static defaultProps = {
@@ -307,8 +312,10 @@ class SearchResultsItem extends React.PureComponent {
  <CommentIcon
  location={Locations.SEARCH}
  handleCommentClick={this.handleFocusRHSClick}
+ commentCount={this.props.replyCount}
  postId={post.id}
  searchStyle={'search-item__comment'}
+ extraClass={'icon--visible'}
  />
  <a
  href='#'