[MM-14242] Remove props such as lastPostCount, idCount and idPrefix w…

…hich were previously used for Se E2E (#2410) * Remove props such as lastPostCount, idCount and idPrefix which were previously used for Se E2E * revert commented out test setup
mattermost · Feb 28, 2019 · 4dce36d · 4dce36d
1 parent 9f99e56
commit 4dce36d
Show file tree

Hide file tree

Showing 34 changed files with 117 additions and 193 deletions.
diff --git a/components/common/comment_icon.jsx b/components/common/comment_icon.jsx
@@ -6,13 +6,13 @@ import React from 'react';
 import {OverlayTrigger, Tooltip} from 'react-bootstrap';
 import {FormattedMessage} from 'react-intl';
 
+import {Locations} from 'utils/constants.jsx';
+
 import ReplyIcon from 'components/svg/reply_icon';
-import * as Utils from 'utils/utils.jsx';
 
 export default class CommentIcon extends React.PureComponent {
  static propTypes = {
- idPrefix: PropTypes.string.isRequired,
- idCount: PropTypes.number,
+ location: PropTypes.oneOf([Locations.CENTER, Locations.SEARCH]).isRequired,
  handleCommentClick: PropTypes.func.isRequired,
  searchStyle: PropTypes.string,
  commentCount: PropTypes.number,
@@ -21,10 +21,10 @@ export default class CommentIcon extends React.PureComponent {
  };
 
  static defaultProps = {
- idCount: -1,
  searchStyle: '',
  commentCount: 0,
  extraClass: '',
+ location: Locations.CENTER,
  };
 
  render() {
@@ -41,13 +41,6 @@ export default class CommentIcon extends React.PureComponent {
  iconStyle = iconStyle + ' ' + this.props.searchStyle;
  }
 
- let selectorId = this.props.idPrefix;
- if (this.props.idCount > -1) {
- selectorId += this.props.idCount;
- }
-
- const id = Utils.createSafeId(this.props.idPrefix + '_' + this.props.postId);
-
  const tooltip = (
  <Tooltip
  id='comment-icon-tooltip'
@@ -68,8 +61,8 @@ export default class CommentIcon extends React.PureComponent {
  overlay={tooltip}
  >
  <button
- id={id}
- className={iconStyle + ' color--link style--none ' + selectorId + ' ' + this.props.extraClass}
+ id={`${this.props.location}_commentIcon_${this.props.postId}`}
+ className={iconStyle + ' color--link style--none ' + this.props.extraClass}
  onClick={this.props.handleCommentClick}
  >
  <ReplyIcon className='comment-icon'/>

diff --git a/components/dot_menu/dot_menu.jsx b/components/dot_menu/dot_menu.jsx
@@ -9,7 +9,7 @@ import {OverlayTrigger, Tooltip} from 'react-bootstrap';
 import Permissions from 'mattermost-redux/constants/permissions';
 
 import {showGetPostLinkModal} from 'actions/global_actions.jsx';
-import {ModalIdentifiers, UNSET_POST_EDIT_TIME_LIMIT} from 'utils/constants.jsx';
+import {Locations, ModalIdentifiers, UNSET_POST_EDIT_TIME_LIMIT} from 'utils/constants.jsx';
 import DeletePostModal from 'components/delete_post_modal';
 import DelayedAction from 'utils/delayed_action.jsx';
 import * as PostUtils from 'utils/post_utils.jsx';
@@ -28,7 +28,7 @@ export default class DotMenu extends Component {
  static propTypes = {
  post: PropTypes.object.isRequired,
  teamId: PropTypes.string,
- location: PropTypes.oneOf(['CENTER', 'RHS_ROOT', 'RHS_COMMENT', 'SEARCH']).isRequired,
+ location: PropTypes.oneOf([Locations.CENTER, Locations.RHS_ROOT, Locations.RHS_COMMENT, Locations.SEARCH]).isRequired,
  commentCount: PropTypes.number,
  isFlagged: PropTypes.bool,
  handleCommentClick: PropTypes.func,
@@ -79,6 +79,7 @@ export default class DotMenu extends Component {
  isFlagged: false,
  isReadOnly: false,
  pluginMenuItems: [],
+ location: Locations.CENTER,
  }
 
  constructor(props) {
@@ -167,7 +168,7 @@ export default class DotMenu extends Component {
  dialogProps: {
  post: this.props.post,
  commentCount: this.props.commentCount,
- isRHS: this.props.location === 'RHS_ROOT' || this.props.location === 'RHS_COMMENT',
+ isRHS: this.props.location === Locations.RHS_ROOT || this.props.location === Locations.RHS_COMMENT,
  },
  };
 
@@ -178,9 +179,9 @@ export default class DotMenu extends Component {
  this.props.actions.setEditingPost(
  this.props.post.id,
  this.props.commentCount,
- this.props.location === 'CENTER' ? 'post_textbox' : 'reply_textbox',
+ this.props.location === Locations.CENTER ? 'post_textbox' : 'reply_textbox',
  this.props.post.root_id ? Utils.localizeMessage('rhs_comment.comment', 'Comment') : Utils.localizeMessage('create_post.post', 'Post'),
- this.props.location === 'RHS_ROOT' || this.props.location === 'RHS_COMMENT',
+ this.props.location === Locations.RHS_ROOT || this.props.location === Locations.RHS_COMMENT,
  );
  }
 
@@ -276,7 +277,7 @@ export default class DotMenu extends Component {
  onClick={this.handleFlagMenuItemActivated}
  />
  <MenuItemAction
- show={!isSystemMessage && this.props.location === 'CENTER'}
+ show={!isSystemMessage && this.props.location === Locations.CENTER}
  text={Utils.localizeMessage('post_info.reply', 'Reply')}
  onClick={this.props.handleCommentClick}
  />

diff --git a/components/dot_menu/dot_menu.test.jsx b/components/dot_menu/dot_menu.test.jsx
@@ -28,7 +28,6 @@ jest.mock('utils/post_utils', () => {
 describe('components/dot_menu/DotMenu', () => {
  const baseProps = {
  post: {id: 'post_id_1', is_pinned: false},
- location: 'CENTER',
  isLicensed: false,
  postEditTimeLimit: '-1',
  handleCommentClick: jest.fn(),

diff --git a/components/dot_menu/dot_menu_empty.test.jsx b/components/dot_menu/dot_menu_empty.test.jsx
@@ -25,7 +25,6 @@ jest.mock('utils/post_utils', () => {
 describe('components/dot_menu/DotMenu returning empty ("")', () => {
  test('should match snapshot, return empty ("") on Center', () => {
  const baseProps = {
- location: 'CENTER',
  post: {id: 'post_id_1'},
  isLicensed: false,
  postEditTimeLimit: '-1',

diff --git a/components/dot_menu/dot_menu_mobile.test.jsx b/components/dot_menu/dot_menu_mobile.test.jsx
@@ -25,7 +25,6 @@ jest.mock('utils/post_utils', () => {
 describe('components/dot_menu/DotMenu on mobile view', () => {
  test('should match snapshot', () => {
  const baseProps = {
- location: 'CENTER',
  post: {id: 'post_id_1'},
  isLicensed: false,
  postEditTimeLimit: '-1',

diff --git a/components/post_view/post/index.js b/components/post_view/post/index.js
@@ -17,7 +17,6 @@ function mapStateToProps(state, ownProps) {
 
  return {
  post: getPost(state, detailedPost.id),
- lastPostCount: ownProps.lastPostCount,
  currentUserId: getCurrentUserId(state),
  isFirstReply: Boolean(detailedPost.isFirstReply && detailedPost.commentedOnPost),
  highlight: detailedPost.highlight,

diff --git a/components/post_view/post/post.jsx b/components/post_view/post/post.jsx
@@ -63,11 +63,6 @@ export default class Post extends React.PureComponent {
  */
  replyCount: PropTypes.number,
 
- /**
- * The post count used for selenium tests
- */
- lastPostCount: PropTypes.number,
-
  /**
  * Function to get the post list HTML element
  */
@@ -257,7 +252,6 @@ export default class Post extends React.PureComponent {
  handleCommentClick={this.handleCommentClick}
  handleDropdownOpened={this.handleDropdownOpened}
  compactDisplay={this.props.compactDisplay}
- lastPostCount={this.props.lastPostCount}
  isFirstReply={this.props.isFirstReply}
  replyCount={this.props.replyCount}
  showTimeWithoutHover={!hideProfilePicture}
@@ -268,7 +262,6 @@ export default class Post extends React.PureComponent {
  post={post}
  handleCommentClick={this.handleCommentClick}
  compactDisplay={this.props.compactDisplay}
- lastPostCount={this.props.lastPostCount}
  isCommentMention={this.props.isCommentMention}
  isFirstReply={this.props.isFirstReply}
  />

diff --git a/components/post_view/post_body/post_body.jsx b/components/post_view/post_body/post_body.jsx
@@ -62,11 +62,6 @@ export default class PostBody extends React.PureComponent {
  */
  previewEnabled: PropTypes.bool,
 
- /**
- * Post identifiers for selenium tests
- */
- lastPostCount: PropTypes.number,
-
  /*
  * Post type components from plugins
  */
@@ -171,7 +166,6 @@ export default class PostBody extends React.PureComponent {
  {failedOptions}
  {this.state.sending && <LoadingBars/>}
  <PostMessageView
- lastPostCount={this.props.lastPostCount}
  post={this.props.post}
  compactDisplay={this.props.compactDisplay}
  hasMention={true}

diff --git a/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.js.snap b/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.js.snap
@@ -28,7 +28,7 @@ exports[`components/post_view/PostFlagIcon should match snapshot 1`] = `
 >
  <button
  className="style--none flag-icon__container "
- id="centerPostFlag_post_id"
+ id="CENTER_flagIcon_post_id"
  onClick={[Function]}
  >
  <FlagIcon
@@ -66,7 +66,7 @@ exports[`components/post_view/PostFlagIcon should match snapshot 2`] = `
 >
  <button
  className="style--none flag-icon__container visible"
- id="centerPostFlag_post_id"
+ id="CENTER_flagIcon_post_id"
  onClick={[Function]}
  >
  <FlagIconFilled

diff --git a/components/post_view/post_flag_icon/post_flag_icon.js b/components/post_view/post_flag_icon/post_flag_icon.js
@@ -8,14 +8,12 @@ import {FormattedMessage} from 'react-intl';
 
 import FlagIcon from 'components/svg/flag_icon';
 import FlagIconFilled from 'components/svg/flag_icon_filled';
-import Constants from 'utils/constants.jsx';
-import * as Utils from 'utils/utils.jsx';
+import Constants, {Locations} from 'utils/constants.jsx';
 import {t} from 'utils/i18n';
 
 export default class PostFlagIcon extends React.PureComponent {
  static propTypes = {
- idPrefix: PropTypes.string.isRequired,
- idCount: PropTypes.number,
+ location: PropTypes.oneOf([Locations.CENTER, Locations.RHS_ROOT, Locations.RHS_COMMENT, Locations.SEARCH]).isRequired,
  postId: PropTypes.string.isRequired,
  isFlagged: PropTypes.bool.isRequired,
  isEphemeral: PropTypes.bool,
@@ -26,8 +24,8 @@ export default class PostFlagIcon extends React.PureComponent {
  };
 
  static defaultProps = {
- idCount: -1,
  isEphemeral: false,
+ location: Locations.CENTER,
  };
 
  handlePress = (e) => {
@@ -55,11 +53,6 @@ export default class PostFlagIcon extends React.PureComponent {
 
  const flagVisible = isFlagged ? 'visible' : '';
 
- let flagIconId = null;
- if (this.props.idCount > -1) {
- flagIconId = Utils.createSafeId(this.props.idPrefix + this.props.idCount);
- }
-
  let flagIcon;
  if (isFlagged) {
  flagIcon = <FlagIconFilled className='icon'/>;
@@ -83,7 +76,7 @@ export default class PostFlagIcon extends React.PureComponent {
  }
  >
  <button
- id={flagIconId || `${this.props.idPrefix}_${this.props.postId}`}
+ id={`${this.props.location}_flagIcon_${this.props.postId}`}
  className={'style--none flag-icon__container ' + flagVisible}
  onClick={this.handlePress}
  >

diff --git a/components/post_view/post_flag_icon/post_flag_icon.test.js b/components/post_view/post_flag_icon/post_flag_icon.test.js
@@ -8,7 +8,6 @@ import PostFlagIcon from 'components/post_view/post_flag_icon/post_flag_icon';
 
 describe('components/post_view/PostFlagIcon', () => {
  const baseProps = {
- idPrefix: 'centerPostFlag',
  postId: 'post_id',
  isFlagged: false,
  isEphemeral: false,

diff --git a/components/post_view/post_header/post_header.jsx b/components/post_view/post_header/post_header.jsx
@@ -43,11 +43,6 @@ export default class PostHeader extends React.PureComponent {
  */
  isFirstReply: PropTypes.bool,
 
- /*
- * Post identifiers for selenium tests
- */
- lastPostCount: PropTypes.number,
-
  /**
  * Function to get the post list HTML element
  */
@@ -156,7 +151,6 @@ export default class PostHeader extends React.PureComponent {
  handleCommentClick={this.props.handleCommentClick}
  handleDropdownOpened={this.props.handleDropdownOpened}
  compactDisplay={this.props.compactDisplay}
- lastPostCount={this.props.lastPostCount}
  replyCount={this.props.replyCount}
  isFirstReply={this.props.isFirstReply}
  showTimeWithoutHover={this.props.showTimeWithoutHover}

diff --git a/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap b/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap
@@ -112,8 +112,6 @@ exports[`components/post_view/PostInfo should match snapshot, flagged post 1`] =
  className="col"
  >
  <Connect(PostFlagIcon)
- idCount={-1}
- idPrefix="centerPostFlag"
  isEphemeral={false}
  isFlagged={true}
  postId="e584uzbwwpny9kengqayx5ayzw"
@@ -138,8 +136,6 @@ exports[`components/post_view/PostInfo should match snapshot, hover 1`] = `
  postId="e584uzbwwpny9kengqayx5ayzw"
  />
  <Connect(PostFlagIcon)
- idCount={-1}
- idPrefix="centerPostFlag"
  isEphemeral={false}
  isFlagged={false}
  postId="e584uzbwwpny9kengqayx5ayzw"
@@ -155,7 +151,6 @@ exports[`components/post_view/PostInfo should match snapshot, hover 1`] = `
  handleCommentClick={[MockFunction]}
  handleDropdownOpened={[Function]}
  isFlagged={false}
- location="CENTER"
  post={
  Object {
  "channel_id": "g6139tbospd18cmxroesdk3kkc",
@@ -181,8 +176,7 @@ exports[`components/post_view/PostInfo should match snapshot, hover 1`] = `
  commentCount={0}
  extraClass="pull-right"
  handleCommentClick={[MockFunction]}
- idCount={-1}
- idPrefix="commentIcon"
+ location="CENTER"
  postId="e584uzbwwpny9kengqayx5ayzw"
  searchStyle=""
  />
@@ -262,7 +256,6 @@ exports[`components/post_view/PostInfo toggleEmojiPicker, should have called pro
  handleCommentClick={[MockFunction]}
  handleDropdownOpened={[Function]}
  isFlagged={false}
- location="CENTER"
  post={
  Object {
  "channel_id": "g6139tbospd18cmxroesdk3kkc",
@@ -295,8 +288,7 @@ exports[`components/post_view/PostInfo toggleEmojiPicker, should have called pro
  commentCount={0}
  extraClass="pull-right"
  handleCommentClick={[MockFunction]}
- idCount={-1}
- idPrefix="commentIcon"
+ location="CENTER"
  postId="e584uzbwwpny9kengqayx5ayzw"
  searchStyle=""
  />