10 files changed, 19 insertions, 22 deletions

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 519691ede..df8980314 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -65,7 +65,7 @@ class Invite extends Component {
       {
         fields: {
           invite: [
-            ...Array(3).fill({
+            ...Array.from({ length: 3 }).fill({
               fields: {
                 name: {
                   label: this.props.intl.formatMessage(messages.nameLabel),
@@ -95,19 +95,19 @@ class Invite extends Component {
       this.props.intl,
     );
 
-    document.querySelector('input:first-child').focus();
+    document.querySelector('input:first-child')?.focus();
   }
 
   submit(e) {
     e.preventDefault();
 
-    this.form.submit({
+    this.form?.submit({
       onSuccess: form => {
         this.props.onSubmit({ invites: form.values().invite });
 
-        this.form.clear();
+        this.form?.clear();
         // this.form.$('invite.0.name').focus(); // path accepted but does not focus ;(
-        document.querySelector('input:first-child').focus();
+        document.querySelector('input:first-child')?.focus();
         this.setState({ showSuccessInfo: true });
       },
       onError: () => {},
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 0574b3765..71250bd4d 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -29,6 +29,7 @@ class SettingsLayout extends Component {
   componentWillUnmount() {
     document.removeEventListener(
       'keydown',
+      // eslint-disable-next-line unicorn/no-invalid-remove-event-listener
       this.handleKeyDown.bind(this),
       false,
     );
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 9a9abeab4..7df6d5c78 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -183,8 +183,8 @@ class EditServiceForm extends Component {
               removeTrailingSlash: false,
             });
             isValid = await recipe.validateUrl(values.customUrl);
-          } catch (err) {
-            console.warn('ValidateURL', err);
+          } catch (error) {
+            console.warn('ValidateURL', error);
             isValid = false;
           }
         }
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 847f2ea06..9272b05c9 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -91,7 +91,7 @@ class ServicesDashboard extends Component {
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body">
-          {(services.length !== 0 || searchNeedle) && !isLoading && (
+          {(services.length > 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
               onChange={needle => filterServices({ needle })}
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 8ea31ca40..49aff389b 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -30,14 +30,14 @@ class ImageUpload extends Component {
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
-    acceptedFiles.forEach(file => {
+    for (const file of acceptedFiles) {
       const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
       this.setState({
         path: imgPath,
       });
 
       this.props.field.onDrop(file);
-    });
+    }
 
     field.set('');
   }
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index f5cbad48b..dc6be10da 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import Loader from 'react-loader';
 import { defineMessages, injectIntl } from 'react-intl';
 
-// import { oneOrManyChildElements } from '../../prop-types';
 import Appear from './effects/Appear';
 
 const messages = defineMessages({
@@ -18,7 +17,7 @@ const messages = defineMessages({
 @observer
 class InfoBar extends Component {
   static propTypes = {
-    // eslint-disable-next-line
+    // eslint-disable-next-line react/forbid-prop-types
     children: PropTypes.any.isRequired,
     onClick: PropTypes.func,
     type: PropTypes.string,
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 13ae2303b..9e34bf110 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -15,7 +15,8 @@ const messages = defineMessages({
 @observer
 class Infobox extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     icon: PropTypes.string,
     type: PropTypes.string,
     ctaOnClick: PropTypes.func,
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 9e6830b0c..3c7c66c59 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -54,7 +54,7 @@ class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
-        appElement={document.getElementById('root')}
+        appElement={document.querySelector('#root')}
       >
         {showClose && close && (
           <button type="button" className={classes.close} onClick={close}>
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index 15b4c28e7..5ac7ddd6d 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -49,7 +49,7 @@ class Select extends Component {
     let selected = field.value;
 
     if (multiple) {
-      if (typeof field.value === 'string' && field.value.substr(0, 1) === '[') {
+      if (typeof field.value === 'string' && field.value.slice(0, 1) === '[') {
         // Value is JSON encoded
         selected = JSON.parse(field.value);
       } else if (typeof field.value === 'object') {
diff --git a/src/components/ui/effects/Appear.js b/src/components/ui/effects/Appear.js
index 1255fce2e..183181f8f 100644
--- a/src/components/ui/effects/Appear.js
+++ b/src/components/ui/effects/Appear.js
@@ -1,11 +1,11 @@
-/* eslint-disable react/no-did-mount-set-state */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 
 export default class Appear extends Component {
   static propTypes = {
-    children: PropTypes.any.isRequired, // eslint-disable-line
+    // eslint-disable-next-line react/forbid-prop-types
+    children: PropTypes.any.isRequired,
     transitionName: PropTypes.string,
     className: PropTypes.string,
   };
@@ -24,11 +24,7 @@ export default class Appear extends Component {
   }
 
   render() {
-    const {
-      children,
-      transitionName,
-      className,
-    } = this.props;
+    const { children, transitionName, className } = this.props;
 
     if (!this.state.mounted) {
       return null;