From 02ce9bb3b511b8d187f70ff2200b74efc7179009 Mon Sep 17 00:00:00 2001
From: SleepWalker <mybox@udf.su>
Date: Wed, 23 Aug 2017 00:00:10 +0300
Subject: [PATCH] #305: fix linting errors after upgrading to eslint 4

---
 .eslintrc                                     | 19 -------
 src/components/accounts/reducer.test.js       |  6 +-
 src/components/auth/BaseAuthBody.js           |  3 +-
 src/components/auth/PanelTransition.js        |  4 +-
 src/components/auth/actions.js                | 56 +++++++++----------
 src/components/contact/ContactForm.js         |  3 +-
 src/components/langMenu/LangMenu.js           | 16 +++---
 .../multiFactorAuth/MultiFactorAuth.js        | 20 +++----
 src/components/ui/form/Button.js              | 11 ++--
 src/components/ui/form/Captcha.js             |  8 +--
 src/components/ui/form/Dropdown.js            |  9 +--
 src/components/ui/form/Form.js                |  6 +-
 src/index.js                                  | 34 +++++------
 src/services/api/authentication.js            | 24 ++++----
 src/services/authFlow/MfaState.js             |  8 +--
 src/services/authFlow/PasswordState.js        | 20 +++----
 src/services/request/request.js               |  6 +-
 17 files changed, 115 insertions(+), 138 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 8bf8609..ec5894b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,25 +9,6 @@
         "react"
     ],
 
-    "ecmaFeatures": {
-        "jsx": true,
-        "modules": true,
-        "classes": true,
-        "defaultParams": true,
-        "destructuring": true,
-        "spread": true,
-        "arrowFunctions": true,
-        "blockBindings": true,
-        "objectLiteralComputedProperties": true,
-        "objectLiteralDuplicateProperties": true,
-        "objectLiteralShorthandMethods": true,
-        "objectLiteralShorthandProperties": true,
-        "restParams": true,
-        "superInFunctions": true,
-        "templateStrings": true,
-        "experimentalObjectRestSpread": true
-    },
-
     "env": {
         "mocha": true, // needed for tests. Apply it globaly till eslint/selint#3611
         "browser": true,
diff --git a/src/components/accounts/reducer.test.js b/src/components/accounts/reducer.test.js
index b3d21c4..ac8e7cf 100644
--- a/src/components/accounts/reducer.test.js
+++ b/src/components/accounts/reducer.test.js
@@ -73,9 +73,9 @@ describe('Accounts reducer', () => {
             };
 
             expect(accounts({...initial, available: [account]}, add(newAccount)),
-            'to satisfy', {
-                available: [newAccount, account]
-            });
+                'to satisfy', {
+                    available: [newAccount, account]
+                });
         });
 
         it('throws, when account is invalid', () => {
diff --git a/src/components/auth/BaseAuthBody.js b/src/components/auth/BaseAuthBody.js
index d9b72f2..d7fea31 100644
--- a/src/components/auth/BaseAuthBody.js
+++ b/src/components/auth/BaseAuthBody.js
@@ -32,8 +32,7 @@ export default class BaseAuthBody extends Component {
     renderErrors() {
         return this.form.hasErrors()
             ? <AuthError error={this.form.getFirstError()} onClose={this.onClearErrors} />
-            : null
-            ;
+            : null;
     }
 
     onFormSubmit() {
diff --git a/src/components/auth/PanelTransition.js b/src/components/auth/PanelTransition.js
index 875c4bb..8f84b26 100644
--- a/src/components/auth/PanelTransition.js
+++ b/src/components/auth/PanelTransition.js
@@ -258,8 +258,8 @@ class PanelTransition extends Component {
 
         const currentContext = contexts.find((context) => context.includes(key));
         let sign = currentContext.indexOf(panelId) > currentContext.indexOf(prevPanelId)
-                ? fromRight
-                : fromLeft;
+            ? fromRight
+            : fromLeft;
         if (prevPanelId === key) {
             sign *= -1;
         }
diff --git a/src/components/auth/actions.js b/src/components/auth/actions.js
index 40892a3..38a4ff9 100644
--- a/src/components/auth/actions.js
+++ b/src/components/auth/actions.js
@@ -66,28 +66,28 @@ export function login({
         authentication.login(
             {login, password, totp, rememberMe}
         )
-        .then(authHandler(dispatch))
-        .catch((resp) => {
-            if (resp.errors) {
-                if (resp.errors.password === PASSWORD_REQUIRED) {
-                    return dispatch(setLogin(login));
-                } else if (resp.errors.login === ACTIVATION_REQUIRED) {
-                    return dispatch(needActivation());
-                } else if (resp.errors.totp === TOTP_REQUIRED) {
-                    return dispatch(requestTotp({
-                        login,
-                        password,
-                        rememberMe
-                    }));
-                } else if (resp.errors.login === LOGIN_REQUIRED && password) {
-                    logger.warn('No login on password panel');
+            .then(authHandler(dispatch))
+            .catch((resp) => {
+                if (resp.errors) {
+                    if (resp.errors.password === PASSWORD_REQUIRED) {
+                        return dispatch(setLogin(login));
+                    } else if (resp.errors.login === ACTIVATION_REQUIRED) {
+                        return dispatch(needActivation());
+                    } else if (resp.errors.totp === TOTP_REQUIRED) {
+                        return dispatch(requestTotp({
+                            login,
+                            password,
+                            rememberMe
+                        }));
+                    } else if (resp.errors.login === LOGIN_REQUIRED && password) {
+                        logger.warn('No login on password panel');
 
-                    return dispatch(logoutAll());
+                        return dispatch(logoutAll());
+                    }
                 }
-            }
 
-            return validationErrorsHandler(dispatch)(resp);
-        })
+                return validationErrorsHandler(dispatch)(resp);
+            })
     );
 }
 
@@ -152,17 +152,17 @@ export function register({
             rulesAgreement, lang: getState().user.lang,
             captcha
         })
-        .then(() => {
-            dispatch(updateUser({
-                username,
-                email
-            }));
+            .then(() => {
+                dispatch(updateUser({
+                    username,
+                    email
+                }));
 
-            dispatch(needActivation());
+                dispatch(needActivation());
 
-            browserHistory.push('/activation');
-        })
-        .catch(validationErrorsHandler(dispatch))
+                browserHistory.push('/activation');
+            })
+            .catch(validationErrorsHandler(dispatch))
     );
 }
 
diff --git a/src/components/contact/ContactForm.js b/src/components/contact/ContactForm.js
index 4135f57..1d77952 100644
--- a/src/components/contact/ContactForm.js
+++ b/src/components/contact/ContactForm.js
@@ -168,8 +168,7 @@ export class ContactForm extends Component {
 
                 logger.warn('Error sending feedback', resp);
             })
-            .finally(() => this.setState({isLoading: false}))
-            ;
+            .finally(() => this.setState({isLoading: false}));
     };
 }
 
diff --git a/src/components/langMenu/LangMenu.js b/src/components/langMenu/LangMenu.js
index 1165e89..1a867a2 100644
--- a/src/components/langMenu/LangMenu.js
+++ b/src/components/langMenu/LangMenu.js
@@ -68,14 +68,14 @@ class LangMenu extends Component {
                     <a className={styles.trigger} href="#">
                         {showCurrentLang
                             ? this.renderLangLabel(userLocale, LANGS[userLocale]) : (
-                            <span>
-                                <span className={styles.triggerIcon} />
-                                {' '}
-                                <Message {...messages.siteLanguage} />
-                                {' '}
-                                <span className={isActive ? styles.triggerArrowBottom : styles.triggerArrowTop} />
-                            </span>
-                        )}
+                                <span>
+                                    <span className={styles.triggerIcon} />
+                                    {' '}
+                                    <Message {...messages.siteLanguage} />
+                                    {' '}
+                                    <span className={isActive ? styles.triggerArrowBottom : styles.triggerArrowTop} />
+                                </span>
+                            )}
                     </a>
                 </div>
             </div>
diff --git a/src/components/profile/multiFactorAuth/MultiFactorAuth.js b/src/components/profile/multiFactorAuth/MultiFactorAuth.js
index 1604abc..a812615 100644
--- a/src/components/profile/multiFactorAuth/MultiFactorAuth.js
+++ b/src/components/profile/multiFactorAuth/MultiFactorAuth.js
@@ -188,17 +188,17 @@ export default class MultiFactorAuth extends Component<Props, {
                 return mfa.enable(data);
             }
         )
-        .catch((resp) => {
-            const {errors} = resp || {};
+            .catch((resp) => {
+                const {errors} = resp || {};
 
-            if (errors) {
-                return Promise.reject(errors);
-            }
+                if (errors) {
+                    return Promise.reject(errors);
+                }
 
-            logger.error('MFA: Unexpected form submit result', {
-                resp
-            });
-        })
-        .finally(() => this.setState({isLoading: false}));
+                logger.error('MFA: Unexpected form submit result', {
+                    resp
+                });
+            })
+            .finally(() => this.setState({isLoading: false}));
     };
 }
diff --git a/src/components/ui/form/Button.js b/src/components/ui/form/Button.js
index bef73e8..dcbdfbb 100644
--- a/src/components/ui/form/Button.js
+++ b/src/components/ui/form/Button.js
@@ -36,11 +36,12 @@ export default class Button extends FormComponent {
         } = this.props;
 
         return (
-            <button className={classNames(buttons[color], {
-                [buttons.loading]: loading,
-                [buttons.block]: block,
-                [buttons.smallButton]: small
-            }, className)}
+            <button
+                className={classNames(buttons[color], {
+                    [buttons.loading]: loading,
+                    [buttons.block]: block,
+                    [buttons.smallButton]: small
+                }, className)}
                 {...restProps}
             >
                 {this.formatMessage(label)}
diff --git a/src/components/ui/form/Captcha.js b/src/components/ui/form/Captcha.js
index a9545fc..02f080d 100644
--- a/src/components/ui/form/Captcha.js
+++ b/src/components/ui/form/Captcha.js
@@ -24,14 +24,12 @@ export default class Captcha extends FormInputComponent {
     };
 
     componentDidMount() {
-        setTimeout(() =>
+        setTimeout(() => {
             captcha.render(this.el, {
                 skin: this.props.skin,
                 onSetCode: this.setCode
-            })
-            .then((captchaId) => this.captchaId = captchaId),
-            this.props.delay
-        );
+            }).then((captchaId) => this.captchaId = captchaId);
+        }, this.props.delay);
     }
 
     render() {
diff --git a/src/components/ui/form/Dropdown.js b/src/components/ui/form/Dropdown.js
index 8fd9905..6fa6639 100644
--- a/src/components/ui/form/Dropdown.js
+++ b/src/components/ui/form/Dropdown.js
@@ -59,10 +59,11 @@ export default class Dropdown extends FormInputComponent {
 
         return (
             <div>
-                <div className={classNames(styles[color], {
-                    [styles.block]: block,
-                    [styles.opened]: isActive
-                })}
+                <div
+                    className={classNames(styles[color], {
+                        [styles.block]: block,
+                        [styles.opened]: isActive
+                    })}
                     {...props}
                     onClick={this.onToggle}
                 >
diff --git a/src/components/ui/form/Form.js b/src/components/ui/form/Form.js
index 48f4be0..cfc110a 100644
--- a/src/components/ui/form/Form.js
+++ b/src/components/ui/form/Form.js
@@ -113,9 +113,9 @@ export default class Form extends Component<Props, State> {
             Promise.resolve(this.props.onSubmit(
                 this.props.form ? this.props.form : new FormData(form)
             ))
-            .catch((errors: {[key: string]: string}) => {
-                this.setErrors(errors);
-            });
+                .catch((errors: {[key: string]: string}) => {
+                    this.setErrors(errors);
+                });
         } else {
             const invalidEls = form.querySelectorAll(':invalid');
             const errors = {};
diff --git a/src/index.js b/src/index.js
index 0f51030..60096ef 100644
--- a/src/index.js
+++ b/src/index.js
@@ -34,24 +34,24 @@ Promise.all([
     userFactory(store),
     font.load(['Roboto', 'Roboto Condensed'])
 ])
-.then(() => {
-    ReactDOM.render(
-        <ReduxProvider store={store}>
-            <IntlProvider>
-                <Router history={browserHistory}>
-                    <Switch>
-                        <Route path="/oauth2/code/success" component={SuccessOauthPage} />
-                        <AuthFlowRoute path="/oauth2/:version(v\d+)/:clientId?" component={() => null} />
-                        <Route path="/" component={RootPage} />
-                    </Switch>
-                </Router>
-            </IntlProvider>
-        </ReduxProvider>,
-        document.getElementById('app')
-    );
+    .then(() => {
+        ReactDOM.render(
+            <ReduxProvider store={store}>
+                <IntlProvider>
+                    <Router history={browserHistory}>
+                        <Switch>
+                            <Route path="/oauth2/code/success" component={SuccessOauthPage} />
+                            <AuthFlowRoute path="/oauth2/:version(v\d+)/:clientId?" component={() => null} />
+                            <Route path="/" component={RootPage} />
+                        </Switch>
+                    </Router>
+                </IntlProvider>
+            </ReduxProvider>,
+            document.getElementById('app')
+        );
 
-    initAnalytics();
-});
+        initAnalytics();
+    });
 
 import { loadScript, debounce } from 'functions';
 const trackPageView = debounce(_trackPageView);
diff --git a/src/services/api/authentication.js b/src/services/api/authentication.js
index bf71c04..a4cf0e5 100644
--- a/src/services/api/authentication.js
+++ b/src/services/api/authentication.js
@@ -95,19 +95,19 @@ const authentication = {
 
             resolve();
         })
-        .then(() => accounts.current({token}))
-        .then((user) => ({token, refreshToken, user}))
-        .catch((resp) => {
-            if (resp.message === 'Token expired') {
-                return authentication.requestToken(refreshToken)
-                    .then(({token}) =>
-                        accounts.current({token})
-                            .then((user) => ({token, refreshToken, user}))
-                    );
-            }
+            .then(() => accounts.current({token}))
+            .then((user) => ({token, refreshToken, user}))
+            .catch((resp) => {
+                if (resp.message === 'Token expired') {
+                    return authentication.requestToken(refreshToken)
+                        .then(({token}) =>
+                            accounts.current({token})
+                                .then((user) => ({token, refreshToken, user}))
+                        );
+                }
 
-            return Promise.reject(resp);
-        });
+                return Promise.reject(resp);
+            });
     },
 
     /**
diff --git a/src/services/authFlow/MfaState.js b/src/services/authFlow/MfaState.js
index 226da57..5d8a31e 100644
--- a/src/services/authFlow/MfaState.js
+++ b/src/services/authFlow/MfaState.js
@@ -37,10 +37,10 @@ export default class MfaState extends AbstractState {
             rememberMe,
             login
         })
-        .then(() => context.setState(new CompleteState()))
-        .catch((err = {}) =>
-            err.errors || logger.warn('Error logging in', err)
-        );
+            .then(() => context.setState(new CompleteState()))
+            .catch((err = {}) =>
+                err.errors || logger.warn('Error logging in', err)
+            );
     }
 
     goBack(context: AuthContext) {
diff --git a/src/services/authFlow/PasswordState.js b/src/services/authFlow/PasswordState.js
index b04f2e1..38de0fb 100644
--- a/src/services/authFlow/PasswordState.js
+++ b/src/services/authFlow/PasswordState.js
@@ -38,18 +38,18 @@ export default class PasswordState extends AbstractState {
             rememberMe,
             login
         })
-        .then(() => {
-            const {isTotpRequired} = getCredentials(context.getState());
+            .then(() => {
+                const {isTotpRequired} = getCredentials(context.getState());
 
-            if (isTotpRequired) {
-                return context.setState(new MfaState());
-            }
+                if (isTotpRequired) {
+                    return context.setState(new MfaState());
+                }
 
-            return context.setState(new CompleteState());
-        })
-        .catch((err = {}) =>
-            err.errors || logger.warn('Error logging in', err)
-        );
+                return context.setState(new CompleteState());
+            })
+            .catch((err = {}) =>
+                err.errors || logger.warn('Error logging in', err)
+            );
     }
 
     reject(context: AuthContext) {
diff --git a/src/services/request/request.js b/src/services/request/request.js
index 72968f7..aeca0be 100644
--- a/src/services/request/request.js
+++ b/src/services/request/request.js
@@ -117,8 +117,7 @@ function doFetch(url, options = {}) {
         .then(toJSON, rejectWithJSON)
         .then(handleResponseSuccess)
         .then((resp) => middlewareLayer.run('then', resp, {url, options}))
-        .catch((resp) => middlewareLayer.run('catch', resp, {url, options}, () => doFetch(url, options)))
-        ;
+        .catch((resp) => middlewareLayer.run('catch', resp, {url, options}, () => doFetch(url, options)));
 }
 
 /**
@@ -159,6 +158,5 @@ function buildQuery(data: Object = {}): string {
                     .map(encodeURIComponent)
                     .join('=')
         )
-        .join('&')
-        ;
+        .join('&');
 }