migrate searchForTerm into redux-style action (#1957)

actions/command.js

@@ -36,7 +36,7 @@ export function executeCommand(message, args) {
 
  switch (cmd) {
  case '/search':
- PostActions.searchForTerm(msg.substring(cmdLength + 1, msg.length));
+ dispatch(PostActions.searchForTerm(msg.substring(cmdLength + 1, msg.length)));
  return {data: true};
  case '/shortcuts':
  if (UserAgent.isMobile()) {
@@ -113,4 +113,4 @@ export function executeCommand(message, args) {
 
  return {data: true};
  };
-}
+}

actions/post_actions.jsx

@@ -222,8 +222,10 @@ export function increasePostVisibility(channelId, focusedPostId) {
 }
 
 export function searchForTerm(term) {
- dispatch(RhsActions.updateSearchTerms(term));
- dispatch(RhsActions.showSearchResults());
+ return (doDispatch) => {
+ doDispatch(RhsActions.updateSearchTerms(term));
+ doDispatch(RhsActions.showSearchResults());
+ };
 }
 
 export function pinPost(postId) {

tests/redux/actions/post_actions.test.js

@@ -96,7 +96,14 @@ describe('Actions.Posts', () => {
  users: {
  currentUserId: 'current_user_id',
  profiles: {
- current_user_id: {roles: 'system_role'},
+ current_user_id: {
+ id: 'current_user_id',
+ username: 'current_username',
+ roles: 'system_role',
+ useAutomaticTimezone: true,
+ automaticTimezone: '',
+ manualTimezone: '',
+ },
  },
  },
  general: {
@@ -126,6 +133,7 @@ describe('Actions.Posts', () => {
  loadingPosts: {},
  postVisibility: {current_channel_id: 60},
  },
+ rhs: {searchTerms: ''},
  },
  };
 
@@ -224,6 +232,19 @@ describe('Actions.Posts', () => {
  args: ['current_channel_id', 'latest_post_id', 2, 30],
  type: 'MOCK_GET_POSTS_BEFORE',
  },
- {channelId: 'current_channel_id', data: false, type: 'LOADING_POSTS'}]);
+ {channelId: 'current_channel_id', data: false, type: 'LOADING_POSTS'},
+ ]);
+ });
+
+ test('searchForTerm', async () => {
+ const testStore = await mockStore(initialState);
+
+ await testStore.dispatch(Actions.searchForTerm('hello'));
+ expect(testStore.getActions()).toEqual([
+ {terms: 'hello', type: 'UPDATE_RHS_SEARCH_TERMS'},
+ {state: 'search', type: 'UPDATE_RHS_STATE'},
+ {terms: '', type: 'UPDATE_RHS_SEARCH_RESULTS_TERMS'},
+ {isGettingMore: false, type: 'SEARCH_POSTS_REQUEST'},
+ ]);
  });
 });

utils/utils.jsx

@@ -1543,7 +1543,7 @@ export function handleFormattedTextClick(e) {
  if (hashtagAttribute) {
  e.preventDefault();
 
- searchForTerm(hashtagAttribute.value);
+ store.dispatch(searchForTerm(hashtagAttribute.value));
  } else if (linkAttribute) {
  const MIDDLE_MOUSE_BUTTON = 1;