MNT ESLint issues (#501)

client/src/boot/cms/registerComponents.js

@@ -1,8 +1,7 @@
 import Injector from 'lib/Injector'; // eslint-disable-line
-import baseRegisterComponents from '../registerComponents';
 import MFARegister from 'components/Register';
 import RegisteredMFAMethodListField from 'components/FormField/RegisteredMFAMethodListField/RegisteredMFAMethodListField';
-
+import baseRegisterComponents from '../registerComponents';
 
 export default () => {
  baseRegisterComponents();

client/src/boot/cms/registerReducers.js

@@ -1,6 +1,6 @@
 import Injector from 'lib/Injector'; // eslint-disable-line
-import baseRegisterReducers from '../registerReducers';
 import mfaAdministrationReducer from 'state/mfaAdministration/reducer';
+import baseRegisterReducers from '../registerReducers';
 
 export default () => {
  baseRegisterReducers();

client/src/boot/index.js

@@ -1,12 +1,12 @@
 /* global window */
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import Login from '../containers/Login';
 import registerComponents from 'boot/registerComponents';
 import registerReducers from 'boot/registerReducers';
 import Injector from 'lib/Injector'; // eslint-disable-line
 import { createStore, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
+import Login from '../containers/Login';
 
 window.document.addEventListener('DOMContentLoaded', () => {
  registerComponents();
@@ -32,4 +32,3 @@ window.document.addEventListener('DOMContentLoaded', () => {
  // Force this to the end of the execution queue to ensure it's last.
  window.setTimeout(() => Injector.load(), 1);
 });
-

client/src/components/BackupCodes/Register.js

@@ -220,7 +220,6 @@ class Register extends Component {
  }
 }
 
-
 Register.propTypes = {
  codes: PropTypes.arrayOf(PropTypes.string),
  // Determines the duration of the 'copied' message (in milliseconds)

client/src/components/BackupCodes/tests/Register-test.js

@@ -1,8 +1,8 @@
 /* global jest, test */
 
 import React from 'react';
-import Register from '../Register';
 import { render, fireEvent, screen } from '@testing-library/react';
+import Register from '../Register';
 
 window.ss = {
  i18n: { _t: (key, string) => string },

client/src/components/BackupCodes/tests/Verify-test.js

@@ -1,8 +1,8 @@
 /* global jest, test */
 
 import React from 'react';
-import Verify from '../Verify';
 import { render, fireEvent } from '@testing-library/react';
+import Verify from '../Verify';
 
 window.ss = {
  i18n: { _t: (key, string) => string },

client/src/components/FormField/RegisteredMFAMethodListField/MethodListItem.js

@@ -3,10 +3,10 @@ import confirm from 'reactstrap-confirm';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import moment from 'moment';
+import methodShape from 'types/registeredMethod';
 import Remove from './MethodListItem/Remove';
 import Reset from './MethodListItem/Reset';
 import SetDefault from './MethodListItem/SetDefault';
-import methodShape from 'types/registeredMethod';
 
 import fallbacks from '../../../../lang/src/en.json';
 
@@ -113,7 +113,6 @@ class MethodListItem extends PureComponent {
  return <SetDefaultComponent method={method} />;
  }
 
-
  renderControls() {
  const { canRemove, canReset } = this.props;
 
@@ -123,9 +122,9 @@ class MethodListItem extends PureComponent {
 
  return (
  <div>
- { this.renderRemove() }
- { this.renderReset() }
- { this.renderSetAsDefault() }
+  { this.renderRemove() }
+  { this.renderReset() }
+  { this.renderSetAsDefault() }
  </div>
  );
  }
@@ -156,8 +155,8 @@ class MethodListItem extends PureComponent {
 
  return (
  <Tag className={classes}>
- { this.renderNameAndStatus() }
- { this.renderControls() }
+  { this.renderNameAndStatus() }
+  { this.renderControls() }
  </Tag>
  );
  }

client/src/components/FormField/RegisteredMFAMethodListField/MethodListItem/Remove.js

@@ -71,7 +71,6 @@ const Remove = ({
  }));
  };
 
-
  return (
  <button
  className="registered-method-list-item__control"

client/src/components/FormField/RegisteredMFAMethodListField/RegisteredMFAMethodListField.js

@@ -5,8 +5,6 @@ import { connect } from 'react-redux';
 import classnames from 'classnames';
 import registeredMethodShape from 'types/registeredMethod';
 import availableMethodShape from 'types/availableMethod';
-import AccountResetUI from './AccountResetUI';
-import MethodListItem from './MethodListItem';
 import {
  chooseMethod,
  setAvailableMethods,
@@ -17,6 +15,8 @@ import {
  SCREEN_CHOOSE_METHOD,
  SCREEN_INTRODUCTION
 } from 'components/Register';
+import MethodListItem from './MethodListItem';
+import AccountResetUI from './AccountResetUI';
 import RegisterModal from '../../RegisterModal';
 
 import fallbacks from '../../../../lang/src/en.json';

client/src/components/FormField/RegisteredMFAMethodListField/tests/AccountResetUI-test.js

@@ -2,8 +2,8 @@
 
 // eslint-disable-next-line no-unused-vars
 import React from 'react';
-import AccountResetUI from '../AccountResetUI';
 import { render, screen, fireEvent } from '@testing-library/react';
+import AccountResetUI from '../AccountResetUI';
 
 let resolveApiCall;
 let rejectApiCall;

client/src/components/FormField/RegisteredMFAMethodListField/tests/MethodListItem-test.js

@@ -1,7 +1,7 @@
 /* global jest, test, describe, it, expect */
 import React from 'react';
-import MethodListItem from '../MethodListItem';
 import { render } from '@testing-library/react';
+import MethodListItem from '../MethodListItem';
 
 window.ss = {
  i18n: {
@@ -14,7 +14,7 @@ window.ss = {
 function makeProps(obj = {}) {
  return {
  method: {
- urlSegment: 'foo'
+  urlSegment: 'foo'
  },
  RemoveComponent: () => <div className="test-remove" />,
  SetDefaultComponent: () => <div className="test-set-default" />,

client/src/components/FormField/RegisteredMFAMethodListField/tests/RegisteredMFAMethodListField-test.js

@@ -1,8 +1,10 @@
 /* global jest, test, describe, it, expect */
 
 import React from 'react';
-import { Component as RegisteredMFAMethodListField } from '../RegisteredMFAMethodListField';
 import { render } from '@testing-library/react';
+import { Component as RegisteredMFAMethodListField } from '../RegisteredMFAMethodListField';
+
+import translationStrings from '../../../../../lang/src/en.json';
 
 window.ss = {
  i18n: { _t: (key, string) => string, detectLocale: () => 'en', inject: () => {} },
@@ -27,8 +29,6 @@ function makeProps(obj = {}) {
  };
 }
 
-import translationStrings from '../../../../../lang/src/en.json';
-
 test('RegisteredMFAMethodListField filters out backup methods', () => {
  const { container } = render(
  <RegisteredMFAMethodListField {...makeProps({

client/src/components/Register.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-cycle */
 /* global window */
 
 import React, { Component } from 'react';
@@ -169,12 +170,12 @@ class Register extends Component {
  if (response && response.errors) {
  const formattedErrors = response.errors.join(', ');
 
- this.setState({
+ this.setState((prevState) => ({
  registerProps: {
- ...this.state.registerProps,
+ ...prevState.registerProps,
  error: formattedErrors,
  },
- });
+ }));
  }
  });
  }

client/src/components/Register/Complete.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-cycle */
 import React from 'react';
 import PropTypes from 'prop-types';
 import Title from './Title';
@@ -26,12 +27,12 @@ const Complete = ({ onComplete, showTitle, message }) => (
 );
 
 Complete.propTypes = {
-  onComplete: PropTypes.func.isRequired,
-  showTitle: PropTypes.bool,
+ onComplete: PropTypes.func.isRequired,
+ showTitle: PropTypes.bool,
 };
 
 Complete.defaultProps = {
-  showTitle: true,
+ showTitle: true,
 };
 
 export default Complete;

client/src/components/Register/Introduction.js

@@ -1,10 +1,11 @@
+/* eslint-disable import/no-cycle */
 /* global window */
 
 import React from 'react';
 import PropTypes from 'prop-types';
 import { showScreen, chooseMethod } from 'state/mfaRegister/actions';
-import { SCREEN_REGISTER_METHOD } from '../Register';
 import { connect } from 'react-redux';
+import { SCREEN_REGISTER_METHOD } from '../Register';
 import Title from './Title';
 
 import fallbacks from '../../../lang/src/en.json';

client/src/components/Register/SelectMethod.js

@@ -1,15 +1,16 @@
+/* eslint-disable import/no-cycle */
 /* global window */
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import MethodTile from './MethodTile';
 import availableMethodType from 'types/availableMethod';
 import classnames from 'classnames';
-import { SCREEN_INTRODUCTION, SCREEN_REGISTER_METHOD } from '../Register';
 import { showScreen, chooseMethod } from 'state/mfaRegister/actions';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import withMethodAvailability from 'state/methodAvailability/withMethodAvailability';
+import { SCREEN_INTRODUCTION, SCREEN_REGISTER_METHOD } from '../Register';
+import MethodTile from './MethodTile';
 import Title from './Title';
 
 /**

client/src/components/Register/Title.js

@@ -1,11 +1,12 @@
+/* eslint-disable import/no-cycle */
 import React from 'react';
+import { connect } from 'react-redux';
 import {
  SCREEN_INTRODUCTION,
  SCREEN_REGISTER_METHOD,
  SCREEN_CHOOSE_METHOD,
  SCREEN_COMPLETE,
 } from '../Register';
-import { connect } from 'react-redux';
 
 import fallbacks from '../../../lang/src/en.json';
 

client/src/components/Register/tests/Introduction-test.js

@@ -1,8 +1,8 @@
 /* global jest, test, describe, it, expect */
 
 import React from 'react';
-import { Component as Introduction, ActionList } from '../Introduction';
 import { fireEvent, render } from '@testing-library/react';
+import { Component as Introduction, ActionList } from '../Introduction';
 
 window.ss = {
  i18n: { _t: (key, string) => string },

client/src/components/Register/tests/MethodTile-test.js

@@ -1,8 +1,8 @@
 /* global jest, test, describe, it, expect */
 
 import React from 'react';
-import { Component as MethodTile } from '../MethodTile';
 import { fireEvent, render } from '@testing-library/react';
+import { Component as MethodTile } from '../MethodTile';
 
 function makeProps(obj = {}) {
  return {

client/src/components/Register/tests/SelectMethod-test.js

@@ -1,8 +1,8 @@
 /* global jest, test, describe, it, expect */
 
 import React from 'react';
-import { Component as SelectMethod } from '../SelectMethod';
 import { render, fireEvent } from '@testing-library/react';
+import { Component as SelectMethod } from '../SelectMethod';
 
 window.ss = {
  i18n: { _t: (key, string) => string },

client/src/components/RegisterModal.js

@@ -84,7 +84,6 @@ class RegisterModal extends Component {
  }
 }
 
-
 RegisterModal.propTypes = {
  // Boolean for if the modal is open
  isOpen: PropTypes.bool,

client/src/components/Verify.js

@@ -277,15 +277,15 @@ class Verify extends Component {
  }
 
  return (
- <Fragment>
+ <>
  {this.renderTitle()}
  <SelectMethodComponent
  resources={resources}
  methods={otherMethods}
  onClickBack={this.handleHideOtherMethodsPane}
  onSelectMethod={method => event => this.handleClickOtherMethod(event, method)}
  />
- </Fragment>
+ </>
  );
  }
 
@@ -327,7 +327,7 @@ class Verify extends Component {
  });
 
  return (
- <Fragment>
+ <>
  {this.renderTitle()}
 
  <h2 className="mfa-section-title">{leadInLabel}</h2>
@@ -338,7 +338,7 @@ class Verify extends Component {
  onCompleteVerification={this.handleCompleteVerification}
  moreOptionsControl={this.renderOtherMethodsControl()}
  />}
- </Fragment>
+ </>
  );
  }
 
@@ -363,10 +363,10 @@ class Verify extends Component {
  }
 
  return (
- <Fragment>
+ <>
  {this.renderSelectedMethod()}
  {this.renderOtherMethods()}
- </Fragment>
+ </>
  );
  }
 }

client/src/components/Verify/tests/SelectMethod-test.js

@@ -2,8 +2,8 @@
 
 // eslint-disable-next-line no-unused-vars
 import React from 'react';
-import { Component as SelectMethod } from '../SelectMethod';
 import { render, fireEvent } from '@testing-library/react';
+import { Component as SelectMethod } from '../SelectMethod';
 
 window.ss = {
  i18n: {