Removing ErrorStore. (mattermost#1976)

actions/global_actions.jsx

@@ -33,7 +33,6 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 import {getCurrentLocale} from 'selectors/i18n';
 import {getIsRhsOpen, getRhsState} from 'selectors/rhs';
 import BrowserStore from 'stores/browser_store.jsx';
-import ErrorStore from 'stores/error_store.jsx';
 import store from 'stores/redux_store.jsx';
 import LocalStorageStore from 'stores/local_storage_store';
 import WebSocketClient from 'client/web_websocket_client.jsx';
@@ -400,7 +399,6 @@ export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = tr
  }
 
  BrowserStore.clear();
- ErrorStore.clearLastError();
  stopPeriodicStatusUpdates();
  WebsocketActions.close();
  document.cookie = 'MMUSERID=;expires=Thu, 01 Jan 1970 00:00:01 GMT;';

actions/views/system.js

@@ -0,0 +1,20 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {ActionTypes} from 'utils/constants.jsx';
+
+export function incrementWsErrorCount() {
+ return async (dispatch) => {
+ dispatch({
+ type: ActionTypes.INCREMENT_WS_ERROR_COUNT,
+ });
+ };
+}
+
+export function resetWsErrorCount() {
+ return async (dispatch) => {
+ dispatch({
+ type: ActionTypes.RESET_WS_ERROR_COUNT,
+ });
+ };
+}

actions/websocket_actions.jsx

@@ -11,6 +11,8 @@ import {
  markChannelAsRead,
 } from 'mattermost-redux/actions/channels';
 import {setServerVersion} from 'mattermost-redux/actions/general';
+import {clearErrors, logError} from 'mattermost-redux/actions/errors';
+
 import {getPosts, getProfilesAndStatusesForPosts, getCustomEmojiForReaction} from 'mattermost-redux/actions/posts';
 import * as TeamActions from 'mattermost-redux/actions/teams';
 import {getMe, getStatusesByIds, getProfilesByIds} from 'mattermost-redux/actions/users';
@@ -21,13 +23,14 @@ import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getChannel, getCurrentChannel, getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
 
 import {openModal} from 'actions/views/modals';
+import {incrementWsErrorCount, resetWsErrorCount} from 'actions/views/system';
+
 import {browserHistory} from 'utils/browser_history';
 import {loadChannelsForCurrentUser} from 'actions/channel_actions.jsx';
 import * as GlobalActions from 'actions/global_actions.jsx';
 import {handleNewPost} from 'actions/post_actions.jsx';
 import * as StatusActions from 'actions/status_actions.jsx';
 import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
-import ErrorStore from 'stores/error_store.jsx';
 import store from 'stores/redux_store.jsx';
 import WebSocketClient from 'client/web_websocket_client.jsx';
 import {loadPlugin, loadPluginsIfNecessary, removePlugin} from 'plugins';
@@ -130,9 +133,8 @@ export function reconnect(includeWebSocket = true) {
  dispatch(TeamActions.getMyTeamUnreads());
  }
 
- ErrorStore.setConnectionErrorCount(0);
- ErrorStore.clearLastError();
- ErrorStore.emitChange();
+ dispatch(resetWsErrorCount());
+ dispatch(clearErrors());
 }
 
 let intervalId = '';
@@ -176,17 +178,14 @@ export function unregisterAllPluginWebSocketEvents(pluginId) {
 }
 
 function handleFirstConnect() {
- ErrorStore.clearLastError();
- ErrorStore.emitChange();
+ dispatch(clearErrors);
 }
 
 function handleClose(failCount) {
  if (failCount > MAX_WEBSOCKET_FAILS) {
- ErrorStore.storeLastError({message: AnnouncementBarMessages.WEBSOCKET_PORT_ERROR});
+ dispatch(logError({type: 'critical', message: AnnouncementBarMessages.WEBSOCKET_PORT_ERROR}, true));
  }
-
- ErrorStore.setConnectionErrorCount(failCount);
- ErrorStore.emitChange();
+ dispatch(incrementWsErrorCount());
 }
 
 function handleEvent(msg) {

components/admin_console/email_settings.jsx

@@ -4,8 +4,6 @@
 import React from 'react';
 import {FormattedHTMLMessage, FormattedMessage} from 'react-intl';
 
-import ErrorStore from 'stores/error_store.jsx';
-import {AnnouncementBarMessages} from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
 
 import EmailConnectionTest from 'components/admin_console/email_connection_test';
@@ -51,12 +49,6 @@ export default class EmailSettings extends AdminSettings {
  return config;
  }
 
- handleSaved(newConfig) {
- if (newConfig.EmailSettings.SendEmailNotifications || !newConfig.EmailSettings.EnablePreviewModeBanner) {
- ErrorStore.clearError(AnnouncementBarMessages.PREVIEW_MODE);
- }
- }
-
  getStateFromConfig(config) {
  return {
  sendEmailNotifications: config.EmailSettings.SendEmailNotifications,

components/admin_console/jobs/table.jsx

@@ -6,7 +6,6 @@ import React from 'react';
 import {FormattedDate, FormattedMessage, FormattedTime, injectIntl, intlShape} from 'react-intl';
 
 import {cancelJob, createJob} from 'actions/job_actions.jsx';
-import ErrorStore from 'stores/error_store.jsx';
 import {JobStatuses} from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
 
@@ -276,9 +275,7 @@ class JobTable extends React.PureComponent {
  () => {
  this.reload();
  },
- (err) => {
- ErrorStore.storeLastError(err);
- ErrorStore.emitChange();
+ () => {
  this.reload();
  }
  );
@@ -296,9 +293,7 @@ class JobTable extends React.PureComponent {
  () => {
  this.reload();
  },
- (err) => {
- ErrorStore.storeLastError(err);
- ErrorStore.emitChange();
+ () => {
  this.reload();
  }
  );

components/admin_console/license_settings.jsx

@@ -8,7 +8,6 @@ import ReactDOM from 'react-dom';
 import {defineMessages, FormattedMessage, injectIntl, intlShape} from 'react-intl';
 
 import {removeLicenseFile, uploadLicenseFile} from 'actions/admin_actions.jsx';
-import ErrorStore from 'stores/error_store.jsx';
 import * as Utils from 'utils/utils.jsx';
 import {t} from 'utils/i18n';
 
@@ -83,7 +82,6 @@ class LicenseSettings extends React.Component {
  () => {
  $('#remove-button').button('reset');
  this.setState({fileSelected: false, fileName: null, serverError: null});
- ErrorStore.clearLastError(true);
  window.location.reload(true);
  },
  (error) => {