Reorganize imports and add eslint rules (mattermost#87)

* reorganize imports and add eslint rules * rebase and fix conflicts
koox00 · Oct 5, 2017 · c41de17 · c41de17
1 parent 38d0d3e
commit c41de17
Show file tree

Hide file tree

Showing 494 changed files with 2,578 additions and 2,296 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,7 +12,8 @@
  },
  "parser": "babel-eslint",
  "plugins": [
- "react"
+ "react",
+ "import"
  ],
  "env": {
  "browser": true,
@@ -28,6 +29,9 @@
  "before": true,
  "after": true
  },
+ "settings": {
+ "import/resolver": "webpack"
+ },
  "rules": {
  "array-bracket-spacing": [2, "never"],
  "array-callback-return": 2,
@@ -59,6 +63,8 @@
  "global-require": 2,
  "guard-for-in": 2,
  "id-blacklist": 0,
+ "import/no-unresolved": 2,
+ "import/order": ["error", {"newlines-between": "always-and-inside-groups", "groups": ["builtin", "external", ["internal", "parent"], "sibling", "index"]}],
  "indent": [2, 4, {"SwitchCase": 0}],
  "jsx-quotes": [2, "prefer-single"],
  "key-spacing": [2, {"beforeColon": false, "afterColon": true, "mode": "strict"}],

diff --git a/actions/admin_actions.jsx b/actions/admin_actions.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {clientLogout} from 'actions/global_actions.jsx';
+import * as AdminActions from 'mattermost-redux/actions/admin';
+import * as UserActions from 'mattermost-redux/actions/users';
+import {Client4} from 'mattermost-redux/client';
 
+import {clientLogout} from 'actions/global_actions.jsx';
 import store from 'stores/redux_store.jsx';
+
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import * as AdminActions from 'mattermost-redux/actions/admin';
-import * as UserActions from 'mattermost-redux/actions/users';
-import {Client4} from 'mattermost-redux/client';
-
 export function saveConfig(config, success, error) {
  AdminActions.updateConfig(config)(dispatch, getState).then(
  (data) => {

diff --git a/actions/channel_actions.jsx b/actions/channel_actions.jsx
@@ -1,34 +1,31 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import TeamStore from 'stores/team_store.jsx';
-import UserStore from 'stores/user_store.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
-import * as ChannelUtils from 'utils/channel_utils.jsx';
-import PreferenceStore from 'stores/preference_store.jsx';
+import {browserHistory} from 'react-router/es6';
 
-import * as GlobalActions from 'actions/global_actions.jsx';
-import * as PostActions from 'actions/post_actions.jsx';
+import * as ChannelActions from 'mattermost-redux/actions/channels';
+import {deletePreferences, savePreferences} from 'mattermost-redux/actions/preferences';
+import {Client4} from 'mattermost-redux/client';
+import {getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
 
-import {loadProfilesForSidebar, loadNewDMIfNeeded, loadNewGMIfNeeded} from 'actions/user_actions.jsx';
 import {trackEvent} from 'actions/diagnostics_actions.jsx';
+import * as GlobalActions from 'actions/global_actions.jsx';
+import * as PostActions from 'actions/post_actions.jsx';
+import {loadNewDMIfNeeded, loadNewGMIfNeeded, loadProfilesForSidebar} from 'actions/user_actions.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
+import PreferenceStore from 'stores/preference_store.jsx';
+import store from 'stores/redux_store.jsx';
+import TeamStore from 'stores/team_store.jsx';
+import UserStore from 'stores/user_store.jsx';
 
+import * as ChannelUtils from 'utils/channel_utils.jsx';
+import {Constants, Preferences} from 'utils/constants.jsx';
 import * as UserAgent from 'utils/user_agent.jsx';
 import * as Utils from 'utils/utils.jsx';
-import {Constants, Preferences} from 'utils/constants.jsx';
-
-import {browserHistory} from 'react-router/es6';
 
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import * as ChannelActions from 'mattermost-redux/actions/channels';
-import {savePreferences, deletePreferences} from 'mattermost-redux/actions/preferences';
-import {Client4} from 'mattermost-redux/client';
-
-import {getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
-
 export function goToChannel(channel) {
  if (channel.fake) {
  const user = UserStore.getProfileByUsername(channel.display_name);

diff --git a/actions/emoji_actions.jsx b/actions/emoji_actions.jsx
@@ -1,16 +1,17 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import UserStore from 'stores/user_store.jsx';
+import * as EmojiActions from 'mattermost-redux/actions/emojis';
+import {getProfilesByIds} from 'mattermost-redux/actions/users';
 
 import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import store from 'stores/redux_store.jsx';
+import UserStore from 'stores/user_store.jsx';
+
 import {ActionTypes} from 'utils/constants.jsx';
 
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
-import {getProfilesByIds} from 'mattermost-redux/actions/users';
-import * as EmojiActions from 'mattermost-redux/actions/emojis';
 
 export async function loadEmoji(getProfiles = true) {
  const data = await EmojiActions.getAllCustomEmojis()(dispatch, getState);

diff --git a/actions/file_actions.jsx b/actions/file_actions.jsx
@@ -2,17 +2,18 @@
 // See License.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
-import request from 'superagent';
-
-import store from 'stores/redux_store.jsx';
 
-import * as Utils from 'utils/utils.jsx';
+import request from 'superagent';
 
 import {FileTypes} from 'mattermost-redux/action_types';
-import {forceLogoutIfNecessary} from 'mattermost-redux/actions/helpers';
 import {getLogErrorAction} from 'mattermost-redux/actions/errors';
+import {forceLogoutIfNecessary} from 'mattermost-redux/actions/helpers';
 import {Client4} from 'mattermost-redux/client';
 
+import store from 'stores/redux_store.jsx';
+
+import * as Utils from 'utils/utils.jsx';
+
 export function uploadFile(file, name, channelId, clientId, successCallback, errorCallback) {
  const {dispatch, getState} = store;
 

diff --git a/actions/global_actions.jsx b/actions/global_actions.jsx
@@ -1,44 +1,41 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import {browserHistory} from 'react-router/es6';
 
-import ChannelStore from 'stores/channel_store.jsx';
-import UserStore from 'stores/user_store.jsx';
-import BrowserStore from 'stores/browser_store.jsx';
-import ErrorStore from 'stores/error_store.jsx';
-import TeamStore from 'stores/team_store.jsx';
-import SearchStore from 'stores/search_store.jsx';
+import {createDirectChannel, getChannelAndMyMember, getChannelStats, getMyChannelMember, joinChannel, viewChannel} from 'mattermost-redux/actions/channels';
+import {getPostThread} from 'mattermost-redux/actions/posts';
+import {removeUserFromTeam} from 'mattermost-redux/actions/teams';
+import {Client4} from 'mattermost-redux/client';
 
-import {handleNewPost} from 'actions/post_actions.jsx';
-import {loadProfilesForSidebar, loadNewDMIfNeeded, loadNewGMIfNeeded} from 'actions/user_actions.jsx';
 import {loadChannelsForCurrentUser} from 'actions/channel_actions.jsx';
+import {trackEvent} from 'actions/diagnostics_actions.jsx';
+import {handleNewPost} from 'actions/post_actions.jsx';
 import {stopPeriodicStatusUpdates} from 'actions/status_actions.jsx';
+import {loadNewDMIfNeeded, loadNewGMIfNeeded, loadProfilesForSidebar} from 'actions/user_actions.jsx';
 import * as WebsocketActions from 'actions/websocket_actions.jsx';
-import {trackEvent} from 'actions/diagnostics_actions.jsx';
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import BrowserStore from 'stores/browser_store.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
+import ErrorStore from 'stores/error_store.jsx';
+import store from 'stores/redux_store.jsx';
+import SearchStore from 'stores/search_store.jsx';
+import TeamStore from 'stores/team_store.jsx';
+import UserStore from 'stores/user_store.jsx';
+
+import WebSocketClient from 'client/web_websocket_client.jsx';
 
 import {ActionTypes, Constants, ErrorPageTypes} from 'utils/constants.jsx';
 import EventTypes from 'utils/event_types.jsx';
-
-import WebSocketClient from 'client/web_websocket_client.jsx';
 import {sortTeamsByDisplayName} from 'utils/team_utils.jsx';
 import * as Utils from 'utils/utils.jsx';
 
 import en from 'i18n/en.json';
 import * as I18n from 'i18n/i18n.jsx';
-import {browserHistory} from 'react-router/es6';
 
-// Redux actions
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import {Client4} from 'mattermost-redux/client';
-
-import {removeUserFromTeam} from 'mattermost-redux/actions/teams';
-import {viewChannel, getChannelStats, getMyChannelMember, getChannelAndMyMember, createDirectChannel, joinChannel} from 'mattermost-redux/actions/channels';
-import {getPostThread} from 'mattermost-redux/actions/posts';
-
 export function emitChannelClickEvent(channel) {
  function userVisitedFakeChannel(chan, success, fail) {
  const currentUserId = UserStore.getCurrentId();

diff --git a/actions/integration_actions.jsx b/actions/integration_actions.jsx
@@ -1,24 +1,23 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import UserStore from 'stores/user_store.jsx';
+import request from 'superagent';
+
+import * as IntegrationActions from 'mattermost-redux/actions/integrations';
+import {getProfilesByIds} from 'mattermost-redux/actions/users';
+import {Client4} from 'mattermost-redux/client';
+
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import store from 'stores/redux_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
+import UserStore from 'stores/user_store.jsx';
 
-import * as UserAgent from 'utils/user_agent.jsx';
 import {ActionTypes} from 'utils/constants.jsx';
-import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import * as UserAgent from 'utils/user_agent.jsx';
 
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import {Client4} from 'mattermost-redux/client';
-
-import {getProfilesByIds} from 'mattermost-redux/actions/users';
-import * as IntegrationActions from 'mattermost-redux/actions/integrations';
-
-import request from 'superagent';
-
 export function loadIncomingHooks(complete) {
  IntegrationActions.getIncomingHooks('', 0, 10000)(dispatch, getState).then(
  (data) => {

diff --git a/actions/job_actions.jsx b/actions/job_actions.jsx
@@ -4,6 +4,7 @@
 import * as JobsActions from 'mattermost-redux/actions/jobs';
 
 import store from 'stores/redux_store.jsx';
+
 const dispatch = store.dispatch;
 const getState = store.getState;
 

diff --git a/actions/notification_actions.jsx b/actions/notification_actions.jsx
@@ -1,13 +1,13 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Constants, {NotificationLevels} from 'utils/constants.jsx';
-import UserStore from 'stores/user_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import NotificationStore from 'stores/notification_store.jsx';
+import UserStore from 'stores/user_store.jsx';
 
+import Constants, {NotificationLevels} from 'utils/constants.jsx';
 import {isSystemMessage} from 'utils/post_utils.jsx';
-import {isWindowsApp, isMacApp, isMobileApp} from 'utils/user_agent.jsx';
+import {isMacApp, isMobileApp, isWindowsApp} from 'utils/user_agent.jsx';
 import * as Utils from 'utils/utils.jsx';
 
 export function sendDesktopNotification(post, msgProps) {

diff --git a/actions/oauth_actions.jsx b/actions/oauth_actions.jsx
@@ -1,12 +1,13 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import * as IntegrationActions from 'mattermost-redux/actions/integrations';
+
 import store from 'stores/redux_store.jsx';
+
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import * as IntegrationActions from 'mattermost-redux/actions/integrations';
-
 export function deleteOAuthApp(id, success, error) {
  IntegrationActions.deleteOAuthApp(id)(dispatch, getState).then(
  (data) => {

diff --git a/actions/post_actions.jsx b/actions/post_actions.jsx
@@ -1,35 +1,30 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import {browserHistory} from 'react-router/es6';
+import {batchActions} from 'redux-batched-actions';
 
+import {PostTypes} from 'mattermost-redux/action_types';
+import {getMyChannelMember} from 'mattermost-redux/actions/channels';
+import * as PostActions from 'mattermost-redux/actions/posts';
+import {Client4} from 'mattermost-redux/client';
+import * as Selectors from 'mattermost-redux/selectors/entities/posts';
+
+import {sendDesktopNotification} from 'actions/notification_actions.jsx';
+import {loadNewDMIfNeeded, loadNewGMIfNeeded} from 'actions/user_actions.jsx';
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
-import UserStore from 'stores/user_store.jsx';
 import PostStore from 'stores/post_store.jsx';
+import store from 'stores/redux_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
-
-import {loadNewDMIfNeeded, loadNewGMIfNeeded} from 'actions/user_actions.jsx';
-import {sendDesktopNotification} from 'actions/notification_actions.jsx';
+import UserStore from 'stores/user_store.jsx';
 
 import {ActionTypes, Constants} from 'utils/constants.jsx';
 import {EMOJI_PATTERN} from 'utils/emoticons.jsx';
 
-import {browserHistory} from 'react-router/es6';
-
-// Redux actions
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import * as PostActions from 'mattermost-redux/actions/posts';
-import {getMyChannelMember} from 'mattermost-redux/actions/channels';
-
-import {Client4} from 'mattermost-redux/client';
-
-import {PostTypes} from 'mattermost-redux/action_types';
-import * as Selectors from 'mattermost-redux/selectors/entities/posts';
-import {batchActions} from 'redux-batched-actions';
-
 export function handleNewPost(post, msg) {
  let websocketMessageProps = {};
  if (msg) {

diff --git a/actions/status_actions.jsx b/actions/status_actions.jsx
@@ -1,20 +1,19 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import {getStatusesByIds} from 'mattermost-redux/actions/users';
+
 import ChannelStore from 'stores/channel_store.jsx';
 import PostStore from 'stores/post_store.jsx';
 import PreferenceStore from 'stores/preference_store.jsx';
+import store from 'stores/redux_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 
-import {Preferences, Constants} from 'utils/constants.jsx';
+import {Constants, Preferences} from 'utils/constants.jsx';
 
-// Redux actions
-import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
-import {getStatusesByIds} from 'mattermost-redux/actions/users';
-
 export function loadStatusesForChannel(channelId = ChannelStore.getCurrentId()) {
  const postList = PostStore.getVisiblePosts(channelId);
  if (!postList || !postList.posts) {

diff --git a/actions/team_actions.jsx b/actions/team_actions.jsx
@@ -1,23 +1,20 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import TeamStore from 'stores/team_store.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
-
 import {browserHistory} from 'react-router/es6';
 
-// Redux actions
-import store from 'stores/redux_store.jsx';
-const dispatch = store.dispatch;
-const getState = store.getState;
-
-import {Client4} from 'mattermost-redux/client';
-
-import {getUser} from 'mattermost-redux/actions/users';
+import {TeamTypes} from 'mattermost-redux/action_types';
 import {viewChannel} from 'mattermost-redux/actions/channels';
 import * as TeamActions from 'mattermost-redux/actions/teams';
+import {getUser} from 'mattermost-redux/actions/users';
+import {Client4} from 'mattermost-redux/client';
 
-import {TeamTypes} from 'mattermost-redux/action_types';
+import ChannelStore from 'stores/channel_store.jsx';
+import store from 'stores/redux_store.jsx';
+import TeamStore from 'stores/team_store.jsx';
+
+const dispatch = store.dispatch;
+const getState = store.getState;
 
 export function checkIfTeamExists(teamName, onSuccess, onError) {
  TeamActions.checkIfTeamExists(teamName)(dispatch, getState).then(