MM-19195 - Clear search results before opening RHS for mobile view

actions/views/rhs.js

@@ -5,6 +5,7 @@ import {batchActions} from 'redux-batched-actions';
 
 import {SearchTypes} from 'mattermost-redux/action_types';
 import {
+ clearSearch,
  getFlaggedPosts,
  getPinnedPosts,
  searchPostsWithParams,
@@ -282,3 +283,12 @@ export function selectPost(post) {
 export function selectPostCard(post) {
  return {type: ActionTypes.SELECT_POST_CARD, postId: post.id, channelId: post.channel_id};
 }
+
+export function openRHSSearch() {
+ return (dispatch) => {
+ dispatch(clearSearch());
+ dispatch(updateSearchTerms(''));
+
+ dispatch(updateRhsState(RHSStates.SEARCH));
+ };
+}

components/channel_header/channel_header.js

@@ -66,8 +66,8 @@ export default class ChannelHeader extends React.PureComponent {
  showFlaggedPosts: PropTypes.func.isRequired,
  showPinnedPosts: PropTypes.func.isRequired,
  showMentions: PropTypes.func.isRequired,
+ openRHSSearch: PropTypes.func.isRequired,
  closeRightHandSide: PropTypes.func.isRequired,
- updateRhsState: PropTypes.func.isRequired,
  getCustomEmojisInText: PropTypes.func.isRequired,
  updateChannelNotifyProps: PropTypes.func.isRequired,
  goToLastViewedChannel: PropTypes.func.isRequired,
@@ -188,7 +188,8 @@ export default class ChannelHeader extends React.PureComponent {
 
  searchButtonClick = (e) => {
  e.preventDefault();
- this.props.actions.updateRhsState(RHSStates.SEARCH);
+
+ this.props.actions.openRHSSearch();
  };
 
  handleShortcut = (e) => {

components/channel_header/channel_header.test.jsx

@@ -17,8 +17,8 @@ describe('components/ChannelHeader', () => {
  showFlaggedPosts: jest.fn(),
  showPinnedPosts: jest.fn(),
  showMentions: jest.fn(),
+ openRHSSearch: jest.fn(),
  closeRightHandSide: jest.fn(),
- updateRhsState: jest.fn(),
  openModal: jest.fn(),
  closeModal: jest.fn(),
  getCustomEmojisInText: jest.fn(),

components/channel_header/index.js

@@ -33,8 +33,8 @@ import {
  showFlaggedPosts,
  showPinnedPosts,
  showMentions,
+ openRHSSearch,
  closeRightHandSide,
- updateRhsState,
 } from 'actions/views/rhs';
 import {getRhsState} from 'selectors/rhs';
 import {isModalOpen} from 'selectors/views/modals';
@@ -83,8 +83,8 @@ const mapDispatchToProps = (dispatch) => ({
  showFlaggedPosts,
  showPinnedPosts,
  showMentions,
+ openRHSSearch,
  closeRightHandSide,
- updateRhsState,
  getCustomEmojisInText,
  updateChannelNotifyProps,
  goToLastViewedChannel,

components/channel_header_mobile/show_search_button/index.js

@@ -4,13 +4,13 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {updateRhsState} from 'actions/views/rhs';
+import {openRHSSearch} from 'actions/views/rhs';
 
 import ShowSearchButton from './show_search_button';
 
 const mapDispatchToProps = (dispatch) => ({
  actions: bindActionCreators({
- updateRhsState,
+ openRHSSearch,
  }, dispatch),
 });
 

components/channel_header_mobile/show_search_button/show_search_button.js

@@ -5,17 +5,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import SearchIcon from 'components/widgets/icons/search_icon';
-import {RHSStates} from 'utils/constants';
 
 export default class ShowSearchButton extends React.PureComponent {
  static propTypes = {
  actions: PropTypes.shape({
- updateRhsState: PropTypes.func.isRequired,
+ openRHSSearch: PropTypes.func.isRequired,
  }).isRequired,
  }
 
  handleClick = () => {
- this.props.actions.updateRhsState(RHSStates.SEARCH);
+ this.props.actions.openRHSSearch();
  }
 
  render() {

components/search_results/index.jsx

@@ -13,13 +13,13 @@ import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 import {getCurrentSearchForCurrentTeam} from 'mattermost-redux/selectors/entities/search';
 
 import {
- getSearchResultsTerms,
+ getSearchTerms,
  getIsSearchingTerm,
  getIsSearchingFlaggedPost,
  getIsSearchingPinnedPost,
  getIsSearchGettingMore,
 } from 'selectors/rhs';
-import {Preferences} from 'utils/constants';
+import {Preferences} from 'utils/constants.jsx';
 
 import SearchResults from './search_results.jsx';
 
@@ -61,7 +61,7 @@ function makeMapStateToProps() {
  results: posts,
  matches: getSearchMatches(state),
  currentUser: getCurrentUser(state),
- searchTerms: getSearchResultsTerms(state),
+ searchTerms: getSearchTerms(state),
  isSearchingTerm: getIsSearchingTerm(state),
  isSearchingFlaggedPost: getIsSearchingFlaggedPost(state),
  isSearchingPinnedPost: getIsSearchingPinnedPost(state),