Display settings in the listings

[MAILPOET-3763]
This commit is contained in:
Pavel Dohnal
2021-09-14 11:05:06 +02:00
committed by Veljko V
parent 377910a2c2
commit b7e8557bc6
3 changed files with 68 additions and 4 deletions

View File

@ -1,5 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import MailPoet from 'mailpoet';
import classNames from 'classnames';
import { Link, withRouter } from 'react-router-dom';
import Toggle from 'common/form/toggle/toggle';
@ -11,9 +13,9 @@ import {
checkMailerStatus,
} from 'newsletters/listings/utils.jsx';
import NewsletterTypes from 'newsletters/types';
import classNames from 'classnames';
import MailPoet from 'mailpoet';
import ReactStringReplace from 'react-string-replace';
import Tags from '../../common/tag/tags';
import { ScheduledIcon } from '../../common/listings/newsletter_status';
const mailpoetTrackingEnabled = (!!(window.mailpoet_tracking_enabled));
@ -72,6 +74,10 @@ const columns = [
label: MailPoet.I18n.t('subject'),
sortable: true,
},
{
name: 'settings',
label: MailPoet.I18n.t('settings'),
},
{
name: 'statistics',
label: MailPoet.I18n.t('statistics'),
@ -214,6 +220,48 @@ class NewsletterListReEngagement extends React.Component {
);
};
renderSettings = (newsletter) => {
if (newsletter.segments.length === 0) {
return (
<Link className="mailpoet-listing-error" to={`/send/${newsletter.id}`}>
{ MailPoet.I18n.t('sendingToSegmentsNotSpecified') }
</Link>
);
}
const sendingToSegments = ReactStringReplace(
MailPoet.I18n.t('sendTo'),
'%1$s',
(match, i) => (
<Tags segments={newsletter.segments} key={i} />
)
);
let frequencyKey = 'reEngagementFrequencyMonth';
if ((newsletter.options.afterTimeNumber > 1) && (newsletter.options.afterTimeType === 'months')) {
frequencyKey = 'reEngagementFrequencyMonths';
} else if ((newsletter.options.afterTimeNumber > 1) && (newsletter.options.afterTimeType === 'weeks')) {
frequencyKey = 'reEngagementFrequencyWeeks';
} else if ((newsletter.options.afterTimeNumber === 1) && (newsletter.options.afterTimeType === 'weeks')) {
frequencyKey = 'reEngagementFrequencyWeek';
}
const sendingFrequency = MailPoet.I18n.t('reEngagementSettings')
.replace('{$count}', newsletter.options.afterTimeNumber)
.replace('{$frequency}', MailPoet.I18n.t(frequencyKey));
return (
<span>
{ sendingToSegments }
<div className="mailpoet-listing-schedule">
<div className="mailpoet-listing-schedule-icon">
<ScheduledIcon />
</div>
{ sendingFrequency }
</div>
</span>
);
}
renderItem = (newsletter, actions) => {
const rowClasses = classNames(
'manage-column',
@ -232,6 +280,9 @@ class NewsletterListReEngagement extends React.Component {
</a>
{ actions }
</td>
<td className="column mailpoet-hide-on-mobile" data-colname={MailPoet.I18n.t('settings')}>
{ this.renderSettings(newsletter) }
</td>
{ (mailpoetTrackingEnabled === true) ? (
<td className="column mailpoet-listing-stats-column" data-colname={MailPoet.I18n.t('statistics')}>
<Statistics

View File

@ -146,7 +146,7 @@ class NewslettersResponseBuilder {
if ($newsletter->getType() === NewsletterEntity::TYPE_STANDARD) {
$data['segments'] = $this->buildSegments($newsletter);
$data['queue'] = $latestQueue ? $this->buildQueue($latestQueue) : false; // false for BC
} elseif (in_array($newsletter->getType(), [NewsletterEntity::TYPE_WELCOME, NewsletterEntity::TYPE_AUTOMATIC, NewsletterEntity::TYPE_RE_ENGAGEMENT], true)) {
} elseif (in_array($newsletter->getType(), [NewsletterEntity::TYPE_WELCOME, NewsletterEntity::TYPE_AUTOMATIC], true)) {
$data['segments'] = [];
$data['options'] = $this->buildOptions($newsletter);
$data['total_sent'] = $statistics ? $statistics->getTotalSentCount() : 0;
@ -160,6 +160,13 @@ class NewslettersResponseBuilder {
} elseif ($newsletter->getType() === NewsletterEntity::TYPE_NOTIFICATION_HISTORY) {
$data['segments'] = $this->buildSegments($newsletter);
$data['queue'] = $latestQueue ? $this->buildQueue($latestQueue) : false; // false for BC
} elseif ($newsletter->getType() === NewsletterEntity::TYPE_RE_ENGAGEMENT) {
$data['segments'] = $this->buildSegments($newsletter);
$data['options'] = $this->buildOptions($newsletter);
$data['total_sent'] = $statistics ? $statistics->getTotalSentCount() : 0;
$data['total_scheduled'] = SendingQueue::findTaskByNewsletterId($newsletter->getId())
->where('tasks.status', SendingQueue::STATUS_SCHEDULED)
->count();
}
return $data;
}

View File

@ -258,6 +258,12 @@
'last': _x('last', 'e.g. monthly every last Monday'),
'next': _x('Next', 'Button label: Next step'),
'reEngagementSettings': _x('{$count} {$frequency} after inactivity', 'example: "5 months after inactivity"'),
'reEngagementFrequencyMonth': _x('month', 'month in the sentence "1 month after inactivity"'),
'reEngagementFrequencyMonths': _x('months', 'months in the sentence "5 months after inactivity"'),
'reEngagementFrequencyWeek': _x('week', 'week in the sentence "1 week after inactivity"'),
'reEngagementFrequencyWeeks': _x('weeks', 'weeks in the sentence "5 weeks after inactivity"'),
'selectEventToSendWelcomeEmail': __('When to send this welcome email?'),
'selectEventToSendReEngagementEmail': __('When to send this re-engagement email?'),