MM-30477 Fix for autocomplete not closing (#7093)

Automatic Merge

actions/views/channel.js

@@ -190,14 +190,13 @@ export function autocompleteUsersInChannel(prefix, channelId) {
 
  const respose = await dispatch(autocompleteUsers(prefix, currentTeamId, channelId));
  const data = respose.data;
-
  if (data) {
  return {
  ...respose,
  data: {
  ...data,
- users: addLastViewAtToProfiles(state, data.users),
- out_of_channel: addLastViewAtToProfiles(state, data.out_of_channel),
+ users: addLastViewAtToProfiles(state, data.users || []),
+ out_of_channel: addLastViewAtToProfiles(state, data.out_of_channel || []),
  },
  };
  }

actions/views/channel.test.js

@@ -6,6 +6,7 @@ import thunk from 'redux-thunk';
 
 import {General, Posts, RequestStatus} from 'mattermost-redux/constants';
 import {leaveChannel, markChannelAsRead} from 'mattermost-redux/actions/channels';
+import * as UserActions from 'mattermost-redux/actions/users';
 import * as PostActions from 'mattermost-redux/actions/posts';
 
 import {browserHistory} from 'utils/browser_history';
@@ -34,6 +35,8 @@ jest.mock('actions/channel_actions.jsx', () => ({
  openDirectChannelToUserId: jest.fn(() => ({type: ''})),
 }));
 
+jest.mock('mattermost-redux/actions/users');
+
 jest.mock('mattermost-redux/actions/channels', () => ({
  ...jest.requireActual('mattermost-redux/actions/channels'),
  markChannelAsRead: jest.fn(() => ({type: ''})),
@@ -46,6 +49,10 @@ jest.mock('selectors/local_storage', () => ({
  getLastViewedChannelName: () => 'channel1',
 }));
 
+jest.mock('mattermost-redux/selectors/entities/utils', () => ({
+ makeAddLastViewAtToProfiles: () => jest.fn().mockReturnValue([]),
+}));
+
 describe('channel view actions', () => {
  const channel1 = {id: 'channelid1', name: 'channel1', display_name: 'Channel 1', type: 'O', team_id: 'teamid1'};
  const townsquare = {id: 'channelid2', name: General.DEFAULT_CHANNEL, display_name: 'Town Square', type: 'O', team_id: 'teamid1'};
@@ -760,4 +767,12 @@ describe('channel view actions', () => {
  expect(PostActions.getPostsUnread).toHaveBeenCalledWith('channelid1');
  });
  });
+
+ describe('autocompleteUsersInChannel', () => {
+ test('should return empty arrays if the key is missing in reponse', async () => {
+ UserActions.autocompleteUsers.mockReturnValue(() => ({data: {}}));
+ const response = await store.dispatch(Actions.autocompleteUsersInChannel('test', 'channelid1'));
+ expect(response).toStrictEqual({data: {out_of_channel: [], users: []}});
+ });
+ });
 });