MM-16477 Check for modified users on reconnect (#3028)

* MM-16477 Move websocket status to redux

* MM-16477 Check for modified users on reconnect

* Update mattermost-redux

* Fix unit tests

* Update mattermost-redux

* Fix incorrect merge

actions/views/channel.test.js

@@ -424,9 +424,9 @@ describe('channel view actions', () => {
  [channelId]: 12345,
  },
  },
-  websocket: {
-  lastDisconnectAt: 12344,
- },
+ },
+ websocket: {
+ lastDisconnectAt: 12344,
  },
  });
 
@@ -448,9 +448,9 @@ describe('channel view actions', () => {
  [channelId]: 12343,
  },
  },
-  websocket: {
-  lastDisconnectAt: 12344,
- },
+ },
+ websocket: {
+ lastDisconnectAt: 12344,
  },
  });
 

actions/websocket_actions.jsx

@@ -33,7 +33,7 @@ import {
 import {clearErrors, logError} from 'mattermost-redux/actions/errors';
 
 import * as TeamActions from 'mattermost-redux/actions/teams';
-import {getMe, getStatusesByIds, getProfilesByIds} from 'mattermost-redux/actions/users';
+import {checkForModifiedUsers, getMe, getStatusesByIds, getProfilesByIds} from 'mattermost-redux/actions/users';
 import {Client4} from 'mattermost-redux/client';
 import {getCurrentUser, getCurrentUserId, getStatusForUserId, getUser} from 'mattermost-redux/selectors/entities/users';
 import {getMyTeams, getCurrentRelativeTeamUrl, getCurrentTeamId, getCurrentTeamUrl} from 'mattermost-redux/selectors/entities/teams';
@@ -143,6 +143,7 @@ export function reconnect(includeWebSocket = true) {
 
  dispatch({
  type: GeneralTypes.WEBSOCKET_SUCCESS,
+ timestamp: Date.now(),
  });
 
  loadPluginsIfNecessary();
@@ -153,9 +154,9 @@ export function reconnect(includeWebSocket = true) {
  }
  });
 
- const currentTeamId = getState().entities.teams.currentTeamId;
+ const state = getState();
+ const currentTeamId = state.entities.teams.currentTeamId;
  if (currentTeamId) {
- const state = getState();
  const currentChannelId = getCurrentChannelId(state);
  const mostRecentId = getMostRecentPostIdInChannel(state, currentChannelId);
  const mostRecentPost = getPost(state, mostRecentId);
@@ -171,6 +172,10 @@ export function reconnect(includeWebSocket = true) {
  dispatch(TeamActions.getMyTeamUnreads());
  }
 
+ if (state.websocket.lastDisconnectAt) {
+ dispatch(checkForModifiedUsers());
+ }
+
  dispatch(resetWsErrorCount());
  dispatch(clearErrors());
 }
@@ -217,7 +222,10 @@ export function unregisterAllPluginWebSocketEvents(pluginId) {
 
 function handleFirstConnect() {
  dispatch(batchActions([
- {type: GeneralTypes.WEBSOCKET_SUCCESS},
+ {
+ type: GeneralTypes.WEBSOCKET_SUCCESS,
+ timestamp: Date.now(),
+ },
  clearErrors(),
  ]));
 }
@@ -227,7 +235,10 @@ function handleClose(failCount) {
  dispatch(logError({type: 'critical', message: AnnouncementBarMessages.WEBSOCKET_PORT_ERROR}, true));
  }
  dispatch(batchActions([
- {type: GeneralTypes.WEBSOCKET_FAILURE},
+ {
+ type: GeneralTypes.WEBSOCKET_FAILURE,
+ timestamp: Date.now(),
+ },
  incrementWsErrorCount(),
  ]));
 }

actions/websocket_actions.test.jsx

@@ -87,6 +87,7 @@ const mockState = {
  selectedChannelId: 'otherChannel',
  },
  },
+ websocket: {},
 };
 
 jest.mock('stores/redux_store', () => {

reducers/views/index.js

@@ -16,7 +16,6 @@ import search from './search';
 import notice from './notice';
 import system from './system';
 import channelSelectorModal from './channel_selector_modal';
-import websocket from './websocket';
 
 export default combineReducers({
  admin,
@@ -32,5 +31,4 @@ export default combineReducers({
  notice,
  system,
  channelSelectorModal,
- websocket,
 });

selectors/views/websocket.js

@@ -1,4 +1,4 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-export const getSocketStatus = (state) => state.views.websocket;
+export const getSocketStatus = (state) => state.websocket;