From e7ddfc3d29dd873b5e1cfb6db3b0858fccc2a629 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Wed, 6 Dec 2017 14:16:41 +0000 Subject: [PATCH] Fix arrow-body-style eslint rule in ES6 files [MAILPOET-1139] --- .eslintrc.es6.json | 1 - assets/js/src/form/fields/checkbox.jsx | 30 +++++++------ assets/js/src/form/fields/field.jsx | 14 +++---- assets/js/src/form/fields/radio.jsx | 28 ++++++------- assets/js/src/form/fields/selection.jsx | 4 +- assets/js/src/form/form.jsx | 12 +++--- assets/js/src/forms/list.jsx | 10 ++--- assets/js/src/help/system_info.jsx | 4 +- assets/js/src/listing/bulk_actions.jsx | 16 +++---- assets/js/src/listing/filters.jsx | 34 +++++++-------- assets/js/src/listing/listing.jsx | 30 ++++++------- assets/js/src/newsletters/listings/mixins.jsx | 6 +-- .../src/newsletters/listings/notification.jsx | 6 +-- .../listings/notification_history.jsx | 4 +- .../js/src/newsletters/listings/standard.jsx | 6 +-- .../js/src/newsletters/listings/welcome.jsx | 7 ++-- .../js/src/newsletters/scheduling/common.jsx | 42 +++++++++---------- assets/js/src/newsletters/send.jsx | 4 +- .../js/src/newsletters/send/notification.jsx | 6 +-- assets/js/src/newsletters/send/standard.jsx | 22 ++++------ assets/js/src/newsletters/templates.jsx | 8 ++-- assets/js/src/newsletters/types.jsx | 32 +++++++------- .../types/notification/notification.jsx | 2 +- assets/js/src/newsletters/types/standard.jsx | 2 +- .../newsletters/types/welcome/scheduling.jsx | 6 +-- assets/js/src/segments/list.jsx | 32 +++++++------- 26 files changed, 156 insertions(+), 212 deletions(-) diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json index 7e8dd0750c..fd70eb060d 100644 --- a/.eslintrc.es6.json +++ b/.eslintrc.es6.json @@ -40,7 +40,6 @@ "jsx-a11y/alt-text": 0, "func-names": 0, "object-shorthand": 0, - "arrow-body-style": 0, "prefer-template": 0, "default-case": 0, "array-callback-return": 0, diff --git a/assets/js/src/form/fields/checkbox.jsx b/assets/js/src/form/fields/checkbox.jsx index a4c2a047f6..5303eed810 100644 --- a/assets/js/src/form/fields/checkbox.jsx +++ b/assets/js/src/form/fields/checkbox.jsx @@ -18,23 +18,21 @@ define([ // it will be false in case value is "0" or empty const isChecked = !!(Number(this.props.item[this.props.field.name])); const options = Object.keys(this.props.field.values).map( - (value, index) => { - return ( -

-

+ -

- ); - } + { this.props.field.values[value] } + +

+ ) ); return ( diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx index 1495677050..d681ec4117 100644 --- a/assets/js/src/form/fields/field.jsx +++ b/assets/js/src/form/fields/field.jsx @@ -89,14 +89,12 @@ define([ let field = false; if (this.props.field.fields !== undefined) { - field = this.props.field.fields.map((subfield, index) => { - return this.renderField({ - index: index, - field: subfield, - item: this.props.item, - onValueChange: this.props.onValueChange || false, - }); - }); + field = this.props.field.fields.map((subfield, index) => this.renderField({ + index: index, + field: subfield, + item: this.props.item, + onValueChange: this.props.onValueChange || false, + })); } else { field = this.renderField(this.props); } diff --git a/assets/js/src/form/fields/radio.jsx b/assets/js/src/form/fields/radio.jsx index 4d13160b8d..9c6ae03a20 100644 --- a/assets/js/src/form/fields/radio.jsx +++ b/assets/js/src/form/fields/radio.jsx @@ -12,21 +12,19 @@ define([ const selected_value = this.props.item[this.props.field.name]; const options = Object.keys(this.props.field.values).map( - (value, index) => { - return ( -

- -

- ); - } + (value, index) => ( +

+ +

+ ) ); return ( diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index 0ca27b1ff6..9bba5a2522 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -88,9 +88,7 @@ define([ } else if (this.props.item !== undefined && this.props.field.name !== undefined) { if (this.allowMultipleValues()) { if (Array.isArray(this.props.item[this.props.field.name])) { - return this.props.item[this.props.field.name].map((item) => { - return item.id; - }); + return this.props.item[this.props.field.name].map(item => item.id); } } else { return this.props.item[this.props.field.name]; diff --git a/assets/js/src/form/form.jsx b/assets/js/src/form/form.jsx index 1cf4fc72f4..9a175dca30 100644 --- a/assets/js/src/form/form.jsx +++ b/assets/js/src/form/form.jsx @@ -155,13 +155,11 @@ define( render: function () { let errors; if (this.getErrors() !== undefined) { - errors = this.getErrors().map((error, index) => { - return ( -

- { error.message } -

- ); - }); + errors = this.getErrors().map((error, index) => ( +

+ { error.message } +

+ )); } const formClasses = classNames( diff --git a/assets/js/src/forms/list.jsx b/assets/js/src/forms/list.jsx index cef1eb35db..35ce257101 100644 --- a/assets/js/src/forms/list.jsx +++ b/assets/js/src/forms/list.jsx @@ -110,7 +110,7 @@ const item_actions = [ }).fail((response) => { if (response.errors.length > 0) { MailPoet.Notice.error( - response.errors.map((error) => { return error.message; }), + response.errors.map(error => error.message), { scroll: true } ); } @@ -133,7 +133,7 @@ const FormList = React.createClass({ }).fail((response) => { if (response.errors.length > 0) { MailPoet.Notice.error( - response.errors.map((error) => { return error.message; }), + response.errors.map(error => error.message), { scroll: true } ); } @@ -146,11 +146,7 @@ const FormList = React.createClass({ 'has-row-actions' ); - let segments = window.mailpoet_segments.filter((segment) => { - return (jQuery.inArray(segment.id, form.segments) !== -1); - }).map((segment) => { - return segment.name; - }).join(', '); + let segments = window.mailpoet_segments.filter(segment => (jQuery.inArray(segment.id, form.segments) !== -1)).map(segment => segment.name).join(', '); if (form.settings.segments_selected_by === 'user') { segments = MailPoet.I18n.t('userChoice') + ' ' + segments; diff --git a/assets/js/src/help/system_info.jsx b/assets/js/src/help/system_info.jsx index 2ebaf6faec..fc2ecd9aff 100644 --- a/assets/js/src/help/system_info.jsx +++ b/assets/js/src/help/system_info.jsx @@ -9,9 +9,7 @@ function handleFocus(event) { function printData(data) { if (_.isObject(data)) { - const printableData = Object.keys(data).map((key) => { - return `${key}: ${data[key]}`; - }); + const printableData = Object.keys(data).map(key => `${key}: ${data[key]}`); return (