public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Work in progress on Campaign Status

Browse source
This commit is contained in:
Tomas Bures 2018-09-10 20:15:59 +02:00
parent d1fa4f4211
commit 01d1a903a2
7 changed files with 116 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/campaigns/CUD.js
View file

@ -170,7 +170,7 @@ export default class CUD extends Component {
}
for (const overridable of campaignOverridables) {
data[overridable + '_overriden'] = data[overridable + '_override'] === null;
data[overridable + '_overriden'] = data[overridable + '_override'] !== null;
}
const lsts = [];

14
client/src/campaigns/Status.js
View file

@ -243,11 +243,11 @@ class SendControls extends Component {
} else if (entity.status === CampaignStatus.SENDING || (entity.status === CampaignStatus.SCHEDULED && !entity.scheduled)) {
return (
<div>
<div>
<AlignedRow label={t('Send status')}>
{t('Campaign is being sent out.')}
</div>
</AlignedRow>
<ButtonRow>
<Button className="btn-primary" icon="stop" label={t('Stop')} onClickAsync={::this.pauseAsync}/>
<Button className="btn-primary" icon="stop" label={t('Stop')} onClickAsync={::this.stopAsync}/>
</ButtonRow>
</div>
);
@ -255,9 +255,9 @@ class SendControls extends Component {
} else if (entity.status === CampaignStatus.FINISHED) {
return (
<div>
<div>
<AlignedRow label={t('Send status')}>
{t('All messages sent! Hit "Continue" if you you want to send this campaign to new subscribers.')}
</div>
</AlignedRow>
<ButtonRow>
<Button className="btn-primary" icon="play" label={t('Continue')} onClickAsync={::this.startAsync}/>
<Button className="btn-primary" icon="refresh" label={t('Reset')} onClickAsync={::this.resetAsync}/>
@ -356,8 +356,8 @@ export default class Status extends Component {
const listsColumns = [
{ data: 1, title: t('Name') },
{ data: 2, title: t('ID'), render: data => <code>{data}</code> },
{ data: 3, title: t('Namespace') },
{ data: 4, title: t('Segment') }
{ data: 4, title: t('Segment') },
{ data: 3, title: t('List namespace') }
];
return (

2
client/src/lists/subscriptions/List.js
View file

@ -86,7 +86,7 @@ export default class List extends Component {
const segments = this.props.segments;
const columns = [
{ data: 1, title: t('CID') },
{ data: 1, title: t('ID'), render: data => <code>{data}</code> },
{ data: 2, title: t('Email') },
{ data: 3, title: t('Status'), render: (data, display, rowData) => this.subscriptionStatusLabels[data] + (rowData[5] ? ', ' + t('Blacklisted') : '') },
{ data: 4, title: t('Created'), render: data => data ? moment(data).fromNow() : '' }