- GET {t('arguments')} + {t('Query params')}
curl -XPOST '{getUrl(`api/subscribe/B16uVTdW?access_token=${accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/subscribe/B16uVTdW?access_token=${accessToken}`)}' \
--data 'EMAIL=test@example.com&MERGE_CHECKBOX=yes&REQUIRE_CONFIRMATION=yes'
POST /api/unsubscribe/:listId – {t('removeSubscription')}
@@ -148,7 +148,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
curl -XPOST '{getUrl(`api/unsubscribe/B16uVTdW?access_token=${accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/unsubscribe/B16uVTdW?access_token=${accessToken}`)}' \
--data 'EMAIL=test@example.com'
POST /api/delete/:listId – {t('deleteSubscription')}
@@ -175,7 +175,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
curl -XPOST '{getUrl(`api/delete/B16uVTdW?access_token=${accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/delete/B16uVTdW?access_token=${accessToken}`)}' \
--data 'EMAIL=test@example.com'
POST /api/field/:listId – {t('addNewCustomField')}
@@ -202,7 +202,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
curl -XPOST '{getUrl(`api/field/B16uVTdW?access_token=${accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/field/B16uVTdW?access_token=${accessToken}`)}' \
--data 'NAME=Birthday&TYPE=birthday-us&VISIBLE=yes'
GET /api/blacklist/get – {t('getListOfBlacklistedEmails')}
@@ -250,7 +250,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
- GET {t('arguments')} + {t('Query params')}
curl -XPOST '{getUrl(`api/blacklist/add?access_token={accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/blacklist/add?access_token={accessToken}`)}' \
--data 'EMAIL=test@example.com&'
POST /api/blacklist/delete – {t('deleteEmailFromBlacklist')}
@@ -302,7 +302,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
curl -XPOST '{getUrl(`api/blacklist/delete?access_token=${accessToken}`)}' \
+ curl -XPOST '{getUrl(`api/blacklist/delete?access_token=${accessToken}`)}' \
--data 'EMAIL=test@example.com&'
GET /api/lists/:email – {t('getTheListsAUserHasSubscribedTo')}
@@ -329,7 +329,7 @@ export default class API extends Component {
- GET {t('arguments')}
+ {t('Query params')}
- GET {t('arguments')} + {t('Query params')}
- GET {t('arguments')} + {t('Query params')}
{t('example')}
-curl -XPOST '{getUrl(`api/templates/1/send?access_token={accessToken}`)}' \
---data 'EMAIL=test@example.com&SUBJECT=Test&VARIABLES[FOO]=bar&VARIABLES[TEST]=example'
+ curl -XPOST '{getUrl(`api/templates/1/send?access_token=${accessToken}`)}' \
+--data 'EMAIL=test@example.com&SUBJECT=Test&TAGS[FOO]=bar&TAGS[TEST]=example'
);
}
diff --git a/client/src/campaigns/CUD.js b/client/src/campaigns/CUD.js
index 74585082..c7d014d4 100644
--- a/client/src/campaigns/CUD.js
+++ b/client/src/campaigns/CUD.js
@@ -22,10 +22,10 @@ import {
withFormErrorHandlers
} from '../lib/form';
import {withAsyncErrorHandler, withErrorHandling} from '../lib/error-handling';
-import {NamespaceSelect, validateNamespace} from '../lib/namespace';
+import {getDefaultNamespace, NamespaceSelect, validateNamespace} from '../lib/namespace';
import {DeleteModalDialog} from "../lib/modals";
import mailtrainConfig from 'mailtrainConfig';
-import {getTemplateTypes, getTypeForm, ResourceType} from '../templates/helpers';
+import {getTagLanguages, getTemplateTypes, getTypeForm, ResourceType} from '../templates/helpers';
import axios from '../lib/axios';
import styles from "../lib/styles.scss";
import campaignsStyles from "./styles.scss";
@@ -50,6 +50,8 @@ export default class CUD extends Component {
const t = props.t;
this.templateTypes = getTemplateTypes(props.t, 'data_sourceCustom_', ResourceType.CAMPAIGN);
+ this.tagLanguages = getTagLanguages(props.t);
+
this.mailerTypes = getMailerTypes(props.t);
const { campaignTypeLabels } = getCampaignLabels(t);
@@ -68,15 +70,19 @@ export default class CUD extends Component {
};
this.sourceLabels = {
+ [CampaignSource.CUSTOM]: t('customContent'),
+ [CampaignSource.CUSTOM_FROM_CAMPAIGN]: t('customContentClonedFromAnotherCampaign'),
[CampaignSource.TEMPLATE]: t('template'),
[CampaignSource.CUSTOM_FROM_TEMPLATE]: t('customContentClonedFromTemplate'),
- [CampaignSource.CUSTOM_FROM_CAMPAIGN]: t('customContentClonedFromAnotherCampaign'),
- [CampaignSource.CUSTOM]: t('customContent'),
[CampaignSource.URL]: t('url')
};
+ const sourceLabelsOrder = [
+ CampaignSource.CUSTOM, CampaignSource.CUSTOM_FROM_CAMPAIGN , CampaignSource.TEMPLATE, CampaignSource.CUSTOM_FROM_TEMPLATE, CampaignSource.URL
+ ];
+
this.sourceOptions = [];
- for (const key in this.sourceLabels) {
+ for (const key in sourceLabelsOrder) {
this.sourceOptions.push({key, label: this.sourceLabels[key]});
}
@@ -85,6 +91,11 @@ export default class CUD extends Component {
this.customTemplateTypeOptions.push({key, label: this.templateTypes[key].typeName});
}
+ this.customTemplateTagLanguageOptions = [];
+ for (const key of mailtrainConfig.tagLanguages) {
+ this.customTemplateTagLanguageOptions.push({key, label: this.tagLanguages[key].name});
+ }
+
this.state = {
sendConfiguration: null
};
@@ -102,6 +113,7 @@ export default class CUD extends Component {
static propTypes = {
action: PropTypes.string.isRequired,
entity: PropTypes.object,
+ permissions: PropTypes.object,
type: PropTypes.number
}
@@ -114,13 +126,20 @@ export default class CUD extends Component {
onFormChangeBeforeValidation(mutStateData, key, oldValue, newValue) {
let match;
- if (key === undefined || key === 'data_sourceCustom_type') {
+ if (key === 'data_sourceCustom_type') {
if (newValue) {
this.templateTypes[newValue].afterTypeChange(mutStateData);
}
}
- if (key === undefined || (match = key.match(/^(lists_[0-9]+_)list$/))) {
+ if (key === 'data_sourceCustom_tag_language') {
+ if (newValue) {
+ const isEdit = !!this.props.entity;
+ this.templateTypes[newValue].afterTagLanguageChange(mutStateData, isEdit);
+ }
+ }
+
+ if (key && (match = key.match(/^(lists_[0-9]+_)list$/))) {
const prefix = match[1];
mutStateData.setIn([prefix + 'segment', 'value'], null);
}
@@ -162,7 +181,12 @@ export default class CUD extends Component {
}
for (const overridable of campaignOverridables) {
- data[overridable + '_overriden'] = data[overridable + '_override'] !== null;
+ if (data[overridable + '_override'] === null) {
+ data[overridable + '_override'] = '';
+ data[overridable + '_overriden'] = false;
+ } else {
+ data[overridable + '_overriden'] = true;
+ }
}
const lsts = [];
@@ -202,6 +226,7 @@ export default class CUD extends Component {
data.data.sourceCustom = {
type: data.data_sourceCustom_type,
+ tag_language: data.data_sourceCustom_tag_language,
data: data.data_sourceCustom_data,
html: data.data_sourceCustom_html,
text: data.data_sourceCustom_text
@@ -244,7 +269,7 @@ export default class CUD extends Component {
return filterData(data, [
'name', 'description', 'segment', 'namespace', 'send_configuration',
- 'from_name_override', 'from_email_override', 'reply_to_override', 'subject_override',
+ 'subject', 'from_name_override', 'from_email_override', 'reply_to_override',
'data', 'click_tracking_disabled', 'open_tracking_disabled', 'unsubscribe_url',
'type', 'source', 'parent', 'lists'
]);
@@ -282,14 +307,16 @@ export default class CUD extends Component {
lists: [lstUid],
send_configuration: null,
- namespace: mailtrainConfig.user.namespace,
+ namespace: getDefaultNamespace(this.props.permissions),
+
+ subject: '',
click_tracking_disabled: false,
open_tracking_disabled: false,
unsubscribe_url: '',
- source: CampaignSource.TEMPLATE,
+ source: CampaignSource.CUSTOM,
// This is for CampaignSource.TEMPLATE and CampaignSource.CUSTOM_FROM_TEMPLATE
data_sourceTemplate: null,
@@ -299,6 +326,7 @@ export default class CUD extends Component {
// This is for CampaignSource.CUSTOM
data_sourceCustom_type: mailtrainConfig.editors[0],
+ data_sourceCustom_tag_language: mailtrainConfig.tagLanguages[0],
data_sourceCustom_data: {},
data_sourceCustom_html: '',
data_sourceCustom_text: '',
@@ -326,6 +354,10 @@ export default class CUD extends Component {
state.setIn(['name', 'error'], t('nameMustNotBeEmpty'));
}
+ if (!state.getIn(['subject', 'value'])) {
+ state.setIn(['subject', 'error'], t('"Subject" line must not be empty"'));
+ }
+
if (!state.getIn(['send_configuration', 'value'])) {
state.setIn(['send_configuration', 'error'], t('sendConfigurationMustBeSelected'));
}
@@ -356,6 +388,10 @@ export default class CUD extends Component {
state.setIn(['data_sourceCustom_type', 'error'], t('typeMustBeSelected'));
}
+ if (!state.getIn(['data_sourceCustom_tag_language', 'value'])) {
+ state.setIn(['data_sourceCustom_tag_language', 'error'], t('Tag language must be selected'));
+ }
+
if (customTemplateTypeKey) {
this.templateTypes[customTemplateTypeKey].validate(state);
}
@@ -592,7 +628,6 @@ export default class CUD extends Component {
{ data: 2, title: t('id'), render: data => {data} },
{ data: 3, title: t('description') },
{ data: 4, title: t('type'), render: data => this.mailerTypes[data].typeName },
- { data: 5, title: t('created'), render: data => moment(data).fromNow() },
{ data: 6, title: t('namespace') }
];
@@ -604,10 +639,10 @@ export default class CUD extends Component {
const addOverridable = (id, label) => {
if(this.state.sendConfiguration[id + '_overridable']){
if (this.getFormValue(id + '_overriden')) {
- sendSettings.push({data}, className: styles.tblCol_id },
@@ -153,7 +141,7 @@ export default class List extends Component {