diff --git a/.eslintrc b/.eslintrc
index d2f22509..15747caf 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,13 +11,12 @@
"quotes": [ 2, "single" ],
"quote-props": [1, "consistent-as-needed"],
"radix": 0,
- "react/display-name": [1, { "acceptTranspilerName": true }],
"react/jsx-boolean-value": [1, "never"],
"react/jsx-curly-spacing": [1, "never"],
"react/jsx-no-duplicate-props": 1,
"react/jsx-no-undef": 1,
- "react/jsx-quotes": 1,
- "react/jsx-sort-prop-types": 1,
+ "jsx-quotes": [1, "prefer-double"],
+ "react/sort-prop-types": 1,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
diff --git a/package.json b/package.json
index 65d7677b..b28d860a 100644
--- a/package.json
+++ b/package.json
@@ -39,10 +39,10 @@
"xhr2": "~0.1.2"
},
"devDependencies": {
- "babel-eslint": "^4.1.6",
+ "babel-eslint": "6.0.2",
"browser-sync": "~2.7.12",
- "eslint": "~1.1.0",
- "eslint-plugin-react": "~3.2.2",
+ "eslint": "2.7.0",
+ "eslint-plugin-react": "4.3.0",
"gulp": "~3.9.0",
"gulp-less": "~3.0.3",
"gulp-rename": "~1.2.2",
diff --git a/src/js/components/deployment-plan/DeploymentStatus.js b/src/js/components/deployment-plan/DeploymentStatus.js
index 5079a7d6..73cdab62 100644
--- a/src/js/components/deployment-plan/DeploymentStatus.js
+++ b/src/js/components/deployment-plan/DeploymentStatus.js
@@ -18,7 +18,7 @@ export default class DeploymentStatus extends React.Component {
};
}
- componentDidMount() {
+ componentWillMount() {
let intervalId = setInterval(() => {
this.props.fetchStacks();
}, 5000);
diff --git a/src/js/components/environment_configuration/EnvironmentConfiguration.js b/src/js/components/environment_configuration/EnvironmentConfiguration.js
index 9bb74c12..78b905a2 100644
--- a/src/js/components/environment_configuration/EnvironmentConfiguration.js
+++ b/src/js/components/environment_configuration/EnvironmentConfiguration.js
@@ -13,6 +13,7 @@ import Tab from '../ui/Tab';
import TabPane from '../ui/TabPane';
class EnvironmentConfiguration extends React.Component {
+
constructor() {
super();
this.state = {
@@ -190,9 +191,11 @@ export default connect(mapStateToProps, mapDispatchToProps)(EnvironmentConfigura
*/
Formsy.addValidationRule('requiresEnvironments',
function (values, value, requiredEnvironmentFieldNames) {
- if(value) {
- return !_.filter(_.values(_.pick(values, requiredEnvironmentFieldNames)),
- function(val){return val === false;}).length;
- }
- return true;
-});
+ if (value) {
+ return !_.filter(
+ _.values(
+ _.pick(values, requiredEnvironmentFieldNames)
+ ), function(val){return val === false;}).length;
+ }
+ return true;
+ });
diff --git a/src/js/components/nodes/RegisterNodesDialog.js b/src/js/components/nodes/RegisterNodesDialog.js
index feab51d6..f07f44fd 100644
--- a/src/js/components/nodes/RegisterNodesDialog.js
+++ b/src/js/components/nodes/RegisterNodesDialog.js
@@ -100,7 +100,7 @@ class RegisterNodesDialog extends React.Component {
// TODO(jtomasek): fix the name setting here
let nodeName = node.driver_info.get('ssh_address') ||
node.driver_info.get('ipmi_address') ||
- `Undefined Node`;
+ 'Undefined Node';
let validationIconClasses = ClassNames({
'pficon': true,
'pficon-error-circle-o': !node.valid
diff --git a/src/js/components/notifications/NotificationsToaster.js b/src/js/components/notifications/NotificationsToaster.js
index 58301762..63a9c6bf 100644
--- a/src/js/components/notifications/NotificationsToaster.js
+++ b/src/js/components/notifications/NotificationsToaster.js
@@ -93,7 +93,7 @@ export default class NotificationsToaster extends React.Component {
render() {
return this.state.toasterNotification ? (
-
+
{errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
diff --git a/src/js/components/ui/dropdown/Dropdown.js b/src/js/components/ui/dropdown/Dropdown.js
index 2769f266..6827d9b7 100644
--- a/src/js/components/ui/dropdown/Dropdown.js
+++ b/src/js/components/ui/dropdown/Dropdown.js
@@ -36,7 +36,7 @@ export default class Dropdown extends React.Component {
{otherChildren}
{React.cloneElement(toggle, { toggleDropdown: this.toggleDropdown.bind(this) })}
-
diff --git a/src/js/components/ui/forms/GenericCheckBox.js b/src/js/components/ui/forms/GenericCheckBox.js
index e87e1807..e26f8e4c 100644
--- a/src/js/components/ui/forms/GenericCheckBox.js
+++ b/src/js/components/ui/forms/GenericCheckBox.js
@@ -10,14 +10,14 @@ class GenericCheckBox extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
diff --git a/src/js/components/ui/forms/GenericInput.js b/src/js/components/ui/forms/GenericInput.js
index e5e9582a..46d66fe1 100644
--- a/src/js/components/ui/forms/GenericInput.js
+++ b/src/js/components/ui/forms/GenericInput.js
@@ -10,14 +10,14 @@ class GenericInput extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
diff --git a/src/js/components/ui/forms/GroupedCheckBox.js b/src/js/components/ui/forms/GroupedCheckBox.js
index 9c6b1275..856c9771 100644
--- a/src/js/components/ui/forms/GroupedCheckBox.js
+++ b/src/js/components/ui/forms/GroupedCheckBox.js
@@ -11,14 +11,14 @@ class GroupedCheckBox extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
diff --git a/src/js/components/ui/forms/HorizontalCheckBox.js b/src/js/components/ui/forms/HorizontalCheckBox.js
index ef2c6df6..9619175e 100644
--- a/src/js/components/ui/forms/HorizontalCheckBox.js
+++ b/src/js/components/ui/forms/HorizontalCheckBox.js
@@ -10,7 +10,7 @@ class HorizontalCheckBox extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
diff --git a/src/js/components/ui/forms/HorizontalInput.js b/src/js/components/ui/forms/HorizontalInput.js
index 128e39b0..722e48b4 100644
--- a/src/js/components/ui/forms/HorizontalInput.js
+++ b/src/js/components/ui/forms/HorizontalInput.js
@@ -11,14 +11,14 @@ class HorizontalInput extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
diff --git a/src/js/components/ui/forms/HorizontalSelect.js b/src/js/components/ui/forms/HorizontalSelect.js
index 7126e0ea..45f027b5 100644
--- a/src/js/components/ui/forms/HorizontalSelect.js
+++ b/src/js/components/ui/forms/HorizontalSelect.js
@@ -10,14 +10,14 @@ class HorizontalSelect extends React.Component {
renderErrorMessage() {
let errorMessage = this.props.getErrorMessage();
return errorMessage ? (
- {errorMessage}
+ {errorMessage}
) : false;
}
renderDescription() {
let description = this.props.description;
return description ? (
- {description}
+ {description}
) : false;
}
@@ -38,7 +38,7 @@ class HorizontalSelect extends React.Component {