Merge pull request #54 from mattermost/ws-m

Change closed websocket action type (master)
mattermost · Aug 28, 2020 · fce3857 · fce3857
1 parent 649df21
commit fce3857
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/mattermost-redux/src/action_types/general.js b/packages/mattermost-redux/src/action_types/general.js
@@ -32,5 +32,6 @@ export default keyMirror({
 
  WEBSOCKET_REQUEST: null,
  WEBSOCKET_SUCCESS: null,
- WEBSOCKET_FAILURE: null
+ WEBSOCKET_FAILURE: null,
+ WEBSOCKET_CLOSED: null
 });
diff --git a/packages/mattermost-redux/src/actions/websocket.js b/packages/mattermost-redux/src/actions/websocket.js
@@ -86,7 +86,7 @@ export function close() {
  return async (dispatch, getState) => {
  websocketClient.close(true);
  if (dispatch) {
- dispatch({type: GeneralTypes.WEBSOCKET_FAILURE, error: 'Closed'}, getState);
+ dispatch({type: GeneralTypes.WEBSOCKET_CLOSED}, getState);
  }
  };
 }

diff --git a/packages/mattermost-redux/src/reducers/requests/general.js b/packages/mattermost-redux/src/reducers/requests/general.js
@@ -41,6 +41,10 @@ function license(state = initialRequestState(), action) {
 }
 
 function websocket(state = initialRequestState(), action) {
+ if (action.type === GeneralTypes.WEBSOCKET_CLOSED) {
+ return initialRequestState();
+ }
+
  return handleRequest(
  GeneralTypes.WEBSOCKET_REQUEST,
  GeneralTypes.WEBSOCKET_SUCCESS,