De-lint JS sources

Author: acrellin

.eslintrc.yaml

@@ -69,3 +69,4 @@ rules:
   jsx-a11y/label-has-associated-control: 1
   jsx-a11y/control-has-associated-label: 0
   arrow-parens: [2, "always"]
+  react/jsx-props-no-spreading: 1

static/js/components/FoldableRow.jsx

@@ -8,7 +8,8 @@
  * The second element can be, e.g., another row in the table.
  * */
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import colorScheme from './colorscheme';
 
 const cs = colorScheme;

static/js/components/Form.jsx

@@ -92,10 +92,12 @@ export const TextInput = (props) => {
 
   return (
     <div className="form-group" style={textInputStyle}>
-      {props.label &&
-        <label>
-          {props.label}
-        </label>
+      {
+        props.label && (
+          <label>
+            {props.label}
+          </label>
+        )
       }
       <input
         className="form-control"
@@ -125,10 +127,12 @@ export const TextareaInput = (props) => {
 
   return (
     <div className="form-group" style={textareaInputStyle}>
-      {props.label &&
-        <label>
-          {props.label}
-        </label>
+      {
+        props.label && (
+          <label>
+            {props.label}
+          </label>
+        )
       }
       <textarea
         className="form-control"
@@ -181,23 +185,25 @@ export const SelectInput = (props) => {
 
   return (
     <div className="form-group" style={selectInputStyle}>
-      {props.label &&
-        <label>
-          {props.label}
-        </label>
+      {
+        props.label && (
+          <label>
+            {props.label}
+          </label>
+        )
       }
       <select
         className="form-control"
         {...selectProps}
       >
-        {props.options.map((option, idx) => (
-          <option
-            value={option.id}
-            key={option.id}
-          >
-            {option.label}
-          </option>
-         ))
+        {
+          props.options.map((option, idx) => (
+            <option value={option.id} key={option.id}>
+              {
+                option.label
+              }
+            </option>
+          ))
         }
       </select>
       <Error {...props} />
@@ -260,10 +266,12 @@ export const FileInput = (props) => {
 
   return (
     <div className="form-group" style={fileInputStyle}>
-      {props.label &&
-        <label>
-          {props.label}
-        </label>
+      {
+        props.label && (
+          <label>
+            {props.label}
+          </label>
+        )
       }
       <input type="file" {...inputProps} />
       <Error {...props} />

static/js/components/Plot.jsx

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { showNotification } from 'baselayer/components/Notifications';
 /* eslint-disable */
@@ -75,8 +76,8 @@ class Plot extends Component {
   }
 }
 Plot.propTypes = {
-  url: React.PropTypes.string.isRequired,
-  dispatch: React.PropTypes.func.isRequired
+  url: PropTypes.string.isRequired,
+  dispatch: PropTypes.func.isRequired
 };
 
 Plot = connect()(Plot);

static/js/components/Progress.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 const Progress = (props) => {
   let response = '';
@@ -27,7 +28,7 @@ const Progress = (props) => {
 };
 
 Progress.propTypes = {
-  type: React.PropTypes.string.isRequired
+  type: PropTypes.string.isRequired
 };
 
 export default Progress;

static/js/components/Projects.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { reduxForm } from 'redux-form';
 

static/js/components/UserProfile.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 let UserProfile = (props) => (
@@ -7,8 +8,8 @@ let UserProfile = (props) => (
   </div>
 );
 UserProfile.propTypes = {
-  style: React.PropTypes.object.isRequired,
-  profile: React.PropTypes.object.isRequired
+  style: PropTypes.object.isRequired,
+  profile: PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state) => (

static/js/reducers.js

@@ -127,7 +127,7 @@ const myFormReducer = (theirFormReducer) => (
         const field_names = Object.keys(state.featurize).filter(
           (field_name) => contains(action.payload.ctgy_list, field_name)
         );
-        const featurizeFormState = Object.assign({}, state.featurize);
+        const featurizeFormState = { ...state.featurize };
         const allAreChecked = (field_names.filter(
           (el) => !featurizeFormState[el].value
         ).length === 0);