Fix arrow-body-style eslint rule in ES6 files

[MAILPOET-1139]
This commit is contained in:
Pavel Dohnal
2017-12-06 14:16:41 +00:00
parent b08b53e9c0
commit e7ddfc3d29
26 changed files with 156 additions and 212 deletions

View File

@ -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,

View File

@ -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 (
<p key={'checkbox-' + index}>
<label>
<input
ref="checkbox"
type="checkbox"
value="1"
checked={isChecked}
onChange={this.onValueChange}
name={this.props.field.name}
(value, index) => (
<p key={'checkbox-' + index}>
<label>
<input
ref="checkbox"
type="checkbox"
value="1"
checked={isChecked}
onChange={this.onValueChange}
name={this.props.field.name}
/>
{ this.props.field.values[value] }
</label>
</p>
);
}
{ this.props.field.values[value] }
</label>
</p>
)
);
return (

View File

@ -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);
}

View File

@ -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 (
<p key={'radio-' + index}>
<label>
<input
type="radio"
checked={selected_value === value}
value={value}
onChange={this.props.onValueChange}
name={this.props.field.name} />
{ this.props.field.values[value] }
</label>
</p>
);
}
(value, index) => (
<p key={'radio-' + index}>
<label>
<input
type="radio"
checked={selected_value === value}
value={value}
onChange={this.props.onValueChange}
name={this.props.field.name} />
{ this.props.field.values[value] }
</label>
</p>
)
);
return (

View File

@ -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];

View File

@ -155,13 +155,11 @@ define(
render: function () {
let errors;
if (this.getErrors() !== undefined) {
errors = this.getErrors().map((error, index) => {
return (
<p key={'error-' + index} className="mailpoet_error">
{ error.message }
</p>
);
});
errors = this.getErrors().map((error, index) => (
<p key={'error-' + index} className="mailpoet_error">
{ error.message }
</p>
));
}
const formClasses = classNames(

View File

@ -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;

View File

@ -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 (<textarea
readOnly={true}

View File

@ -67,9 +67,7 @@ define([
getSelectedAction: function () {
const selected_action = this.refs.action.value;
if (selected_action.length > 0) {
const action = this.props.bulk_actions.filter((act) => {
return (act.name === selected_action);
});
const action = this.props.bulk_actions.filter(act => (act.name === selected_action));
if (action.length > 0) {
return action[0];
@ -97,14 +95,12 @@ define([
onChange={this.handleChangeAction}
>
<option value="">{MailPoet.I18n.t('bulkActions')}</option>
{ this.props.bulk_actions.map((action, index) => {
return (
<option
value={action.name}
key={'action-' + index}
{ this.props.bulk_actions.map((action, index) => (
<option
value={action.name}
key={'action-' + index}
>{ action.label }</option>
);
}) }
)) }
</select>
<input
onClick={this.handleApplyAction}

View File

@ -24,15 +24,13 @@ define([
},
getAvailableFilters: function () {
const filters = this.props.filters;
return Object.keys(filters).filter((filter) => {
return !(
return Object.keys(filters).filter(filter => !(
filters[filter].length === 0
|| (
filters[filter].length === 1
&& !filters[filter][0].value
)
);
});
));
},
componentDidUpdate: function () {
const selected_filters = this.props.filter;
@ -49,24 +47,20 @@ define([
render: function () {
const filters = this.props.filters;
const available_filters = this.getAvailableFilters()
.map((filter, i) => {
return (
<select
ref={`filter-${i}`}
key={`filter-${i}`}
name={filter}
.map((filter, i) => (
<select
ref={`filter-${i}`}
key={`filter-${i}`}
name={filter}
>
{ filters[filter].map((option, j) => {
return (
<option
value={option.value}
key={'filter-option-' + j}
{ filters[filter].map((option, j) => (
<option
value={option.value}
key={'filter-option-' + j}
>{ option.label }</option>
);
}) }
</select>
);
});
)) }
</select>
));
let button;

View File

@ -369,8 +369,7 @@ const Listing = React.createClass({
setParams: function () {
if (this.props.location) {
const params = Object.keys(this.state)
.filter((key) => {
return (
.filter(key => (
[
'group',
'filter',
@ -379,8 +378,7 @@ const Listing = React.createClass({
'sort_by',
'sort_order',
].indexOf(key) !== -1
);
})
))
.map((key) => {
let value = this.state[key];
if (value === Object(value)) {
@ -393,7 +391,7 @@ const Listing = React.createClass({
return `${key}[${value}]`;
}
})
.filter((key) => { return (key !== undefined); })
.filter(key => (key !== undefined))
.join('/');
// set url
@ -488,7 +486,7 @@ const Listing = 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 }
);
}
@ -518,7 +516,7 @@ const Listing = React.createClass({
this.getItems();
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
});
@ -546,7 +544,7 @@ const Listing = React.createClass({
this.getItems();
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
});
@ -574,7 +572,7 @@ const Listing = React.createClass({
this.getItems();
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
});
@ -591,7 +589,7 @@ const Listing = React.createClass({
this.handleGroup('all');
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
});
@ -630,7 +628,7 @@ const Listing = 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 }
);
}
@ -679,9 +677,7 @@ const Listing = React.createClass({
if (is_checked === false) {
this.clearSelection();
} else {
const selected_ids = this.state.items.map((item) => {
return Number(item.id);
});
const selected_ids = this.state.items.map(item => Number(item.id));
this.setState({
selected_ids: selected_ids,
@ -749,9 +745,9 @@ const Listing = React.createClass({
// columns
let columns = this.props.columns || [];
columns = columns.filter((column) => {
return (column.display === undefined || !!(column.display) === true);
});
columns = columns.filter(
column => (column.display === undefined || !!(column.display) === true)
);
// bulk actions
let bulk_actions = this.props.bulk_actions || [];

View File

@ -24,7 +24,7 @@ const QueueMixin = {
}).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 }
);
}
@ -44,7 +44,7 @@ const QueueMixin = {
}).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 }
);
}
@ -421,7 +421,7 @@ const MailerMixin = {
}).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 }
);
}

View File

@ -141,7 +141,7 @@ const newsletter_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 }
);
}
@ -197,9 +197,7 @@ const NewsletterListNotification = React.createClass({
let sendingFrequency;
// get list of segments' name
const segments = newsletter.segments.map((segment) => {
return segment.name;
});
const segments = newsletter.segments.map(segment => segment.name);
const sendingToSegments = MailPoet.I18n.t('ifNewContentToSegments').replace(
'%$1s', segments.join(', ')
);

View File

@ -64,9 +64,7 @@ const NewsletterListNotificationHistory = React.createClass({
'has-row-actions'
);
const segments = newsletter.segments.map((segment) => {
return segment.name;
}).join(', ');
const segments = newsletter.segments.map(segment => segment.name).join(', ');
return (
<div>

View File

@ -156,7 +156,7 @@ let newsletter_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 }
);
}
@ -180,9 +180,7 @@ const NewsletterListStandard = React.createClass({
'has-row-actions'
);
const segments = newsletter.segments.map((segment) => {
return segment.name;
}).join(', ');
const segments = newsletter.segments.map(segment => segment.name).join(', ');
return (
<div>

View File

@ -197,9 +197,10 @@ const NewsletterListWelcome = React.createClass({
case 'segment':
// get segment
segment = _.find(mailpoet_segments, (seg) => {
return (Number(seg.id) === Number(newsletter.options.segment));
});
segment = _.find(
mailpoet_segments,
seg => (Number(seg.id) === Number(newsletter.options.segment))
);
if (segment === undefined) {
return (

View File

@ -25,14 +25,12 @@ const TIME_STEP_SECONDS = 3600;
const numberOfTimeSteps = SECONDS_IN_DAY / TIME_STEP_SECONDS;
const timeOfDayValues = _.object(_.map(
_.times(numberOfTimeSteps, (step) => {
return step * TIME_STEP_SECONDS;
}), (seconds) => {
const date = new Date(null);
date.setSeconds(seconds);
const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 });
return [seconds, timeLabel];
})
_.times(numberOfTimeSteps, step => step * TIME_STEP_SECONDS), (seconds) => {
const date = new Date(null);
date.setSeconds(seconds);
const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 });
return [seconds, timeLabel];
})
);
const weekDayValues = {
@ -48,22 +46,20 @@ const weekDayValues = {
const NUMBER_OF_DAYS_IN_MONTH = 28;
const monthDayValues = _.object(
_.map(
_.times(NUMBER_OF_DAYS_IN_MONTH, (day) => {
return day;
}), (day) => {
const labels = {
0: MailPoet.I18n.t('first'),
1: MailPoet.I18n.t('second'),
2: MailPoet.I18n.t('third'),
};
let label;
if (labels[day] !== undefined) {
label = labels[day];
} else {
label = MailPoet.I18n.t('nth').replace('%$1d', day + 1);
_.times(NUMBER_OF_DAYS_IN_MONTH, day => day), (day) => {
const labels = {
0: MailPoet.I18n.t('first'),
1: MailPoet.I18n.t('second'),
2: MailPoet.I18n.t('third'),
};
let label;
if (labels[day] !== undefined) {
label = labels[day];
} else {
label = MailPoet.I18n.t('nth').replace('%$1d', day + 1);
}
return [day + 1, label];
}
return [day + 1, label];
}
)
);

View File

@ -194,7 +194,7 @@ define(
}).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 }
);
}
@ -257,7 +257,7 @@ define(
showError: (response) => {
if (response.errors.length > 0) {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
}

View File

@ -46,11 +46,7 @@ define(
},
transformChangedValue: function (segment_ids) {
const all_segments = this.state.items;
return _.map(segment_ids, (id) => {
return _.find(all_segments, (segment) => {
return segment.id === id;
});
});
return _.map(segment_ids, id => _.find(all_segments, segment => segment.id === id));
},
validation: {
'data-parsley-required': true,

View File

@ -168,15 +168,13 @@ define(
const TimeSelect = React.createClass({
render: function () {
const options = Object.keys(timeOfDayItems).map(
(value, index) => {
return (
<option
key={'option-' + index}
value={value}>
{ timeOfDayItems[value] }
</option>
);
}
(value, index) => (
<option
key={'option-' + index}
value={value}>
{ timeOfDayItems[value] }
</option>
)
);
return (
@ -354,11 +352,7 @@ define(
},
transformChangedValue: function (segment_ids) {
const all_segments = this.state.items;
return _.map(segment_ids, (id) => {
return _.find(all_segments, (segment) => {
return segment.id === id;
});
});
return _.map(segment_ids, id => _.find(all_segments, segment => segment.id === id));
},
validation: {
'data-parsley-required': true,

View File

@ -29,7 +29,7 @@ const ImportTemplate = 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 }
);
}
@ -122,7 +122,7 @@ const NewsletterTemplates = 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 }
);
}
@ -155,7 +155,7 @@ const NewsletterTemplates = 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 }
);
}
@ -176,7 +176,7 @@ const NewsletterTemplates = 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 }
);
}

View File

@ -44,7 +44,7 @@ define(
}).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 }
);
}
@ -101,24 +101,22 @@ define(
<Breadcrumb step="type" />
<ul className="mailpoet_boxes clearfix">
{types.map((type, index) => {
return (
<li key={index} data-type={type.id}>
<div>
<div className="mailpoet_thumbnail"></div>
{types.map((type, index) => (
<li key={index} data-type={type.id}>
<div>
<div className="mailpoet_thumbnail"></div>
<div className="mailpoet_description">
<h3>{type.title}</h3>
<p>{type.description}</p>
</div>
<div className="mailpoet_actions">
{type.action}
</div>
<div className="mailpoet_description">
<h3>{type.title}</h3>
<p>{type.description}</p>
</div>
</li>
);
}, this)}
<div className="mailpoet_actions">
{type.action}
</div>
</div>
</li>
), this)}
</ul>
</div>
);

View File

@ -55,7 +55,7 @@ define(
}).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 }
);
}

View File

@ -32,7 +32,7 @@ define(
}).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 }
);
}

View File

@ -8,9 +8,7 @@ import { timeDelayValues } from 'newsletters/scheduling/common.jsx';
const availableRoles = window.mailpoet_roles || {};
const availableSegments = _.filter(
window.mailpoet_segments || [],
(segment) => {
return segment.type === 'default';
}
segment => segment.type === 'default'
);
const events = {
@ -113,7 +111,7 @@ const WelcomeScheduling = 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 }
);
}

View File

@ -109,26 +109,24 @@ const item_actions = [
{
name: 'duplicate_segment',
label: MailPoet.I18n.t('duplicate'),
onClick: (item, refresh) => {
return MailPoet.Ajax.post({
api_version: window.mailpoet_api_version,
endpoint: 'segments',
action: 'duplicate',
data: {
id: item.id,
},
}).done((response) => {
MailPoet.Notice.success(
onClick: (item, refresh) => MailPoet.Ajax.post({
api_version: window.mailpoet_api_version,
endpoint: 'segments',
action: 'duplicate',
data: {
id: item.id,
},
}).done((response) => {
MailPoet.Notice.success(
MailPoet.I18n.t('listDuplicated').replace('%$1s', response.data.name)
);
refresh();
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
refresh();
}).fail((response) => {
MailPoet.Notice.error(
response.errors.map(error => error.message),
{ scroll: true }
);
});
},
}),
display: function (segment) {
return (segment.type !== 'wp_users');
},
@ -166,7 +164,7 @@ const item_actions = [
MailPoet.Modal.loading(false);
if (response.errors.length > 0) {
MailPoet.Notice.error(
response.errors.map((error) => { return error.message; }),
response.errors.map(error => error.message),
{ scroll: true }
);
}