Convert resume sending button JS to TS, fix missing mta method var

[MAILPOET-3830]
This commit is contained in:
wxa
2021-10-07 13:52:06 +03:00
committed by Veljko V
parent 8b0a5bb8db
commit 1956e418d9
6 changed files with 10 additions and 9 deletions

View File

@@ -16,6 +16,7 @@ var MailPoet = {
hasPremiumSupport: window.mailpoet_has_premium_support,
hasValidApiKey: window.mailpoet_has_valid_api_key,
hasInvalidMssApiKey: window.mailpoet_mss_key_invalid,
mtaMethod: window.mailpoet_mta_method,
listingPerPage: window.mailpoet_listing_per_page,
libs3rdPartyEnabled: window.mailpoet_3rd_party_libs_enabled,
apiVersion: window.mailpoet_api_version,

View File

@@ -2,19 +2,19 @@ import jQuery from 'jquery';
import MailPoet from 'mailpoet';
const loadAuthorizedEmailAddresses = async () => {
if (window.mailpoet_mta_method !== 'MailPoet') {
if (MailPoet.mtaMethod !== 'MailPoet') {
return [];
}
const response = await MailPoet.Ajax.post({
api_version: window.mailpoet_api_version,
api_version: MailPoet.apiVersion,
endpoint: 'mailer',
action: 'getAuthorizedEmailAddresses',
});
return response.data || [];
};
const isValidFromAddress = async (fromAddress) => {
if (window.mailpoet_mta_method !== 'MailPoet') {
const isValidFromAddress = async (fromAddress: string | null) => {
if (MailPoet.mtaMethod !== 'MailPoet') {
return true;
}
const addresses = await loadAuthorizedEmailAddresses();
@@ -23,12 +23,11 @@ const isValidFromAddress = async (fromAddress) => {
const resumeMailerSending = () => {
MailPoet.Ajax.post({
api_version: window.mailpoet_api_version,
api_version: MailPoet.apiVersion,
endpoint: 'mailer',
action: 'resumeSending',
}).done(() => {
MailPoet.Notice.success(MailPoet.I18n.t('mailerSendingResumedNotice'));
window.mailpoet_listing.forceUpdate();
}).fail((response) => {
if (response.errors.length > 0) {
MailPoet.Notice.error(
@@ -39,7 +38,7 @@ const resumeMailerSending = () => {
});
};
const resumeSendingIfAuthorized = (fromAddress) => isValidFromAddress(fromAddress)
const resumeSendingIfAuthorized = (fromAddress: string | null) => isValidFromAddress(fromAddress)
.then((valid) => {
if (!valid) {
MailPoet.Notice.error(

View File

@@ -15,4 +15,4 @@ import 'wizard/wizard.jsx'; // side effect - renders ReactDOM to document
import 'experimental_features/experimental_features.jsx'; // side effect - renders ReactDOM to document
import 'logs/logs'; // side effect - renders ReactDOM to document
import 'sending-paused-notices-fix-button.tsx'; // side effect - renders ReactDOM to document
import 'sending-paused-notices-resume-button.jsx'; // side effect - executes on doc ready, adds events
import 'sending-paused-notices-resume-button.ts'; // side effect - executes on doc ready, adds events

View File

@@ -64,6 +64,7 @@ class PageRenderer {
'feature_flags' => $this->featuresController->getAllFlags(),
'referral_id' => $this->settings->get(ReferralDetector::REFERRAL_SETTING_NAME),
'mailpoet_api_key_state' => $this->settings->get('mta.mailpoet_api_key_state'),
'mta_method' => $this->settings->get('mta.method'),
'premium_key_state' => $this->settings->get('premium.premium_key_state'),
'last_announcement_seen' => $lastAnnouncementSeen,
'feature_announcement_has_news' => (empty($lastAnnouncementSeen) || $lastAnnouncementSeen < $lastAnnouncementDate),

View File

@@ -71,6 +71,7 @@ jQuery('#adminmenu #toplevel_page_mailpoet-newsletters')
var mailpoet_referral_id = <%= json_encode(referral_id) %>;
var mailpoet_feature_announcement_has_news = <%= json_encode(feature_announcement_has_news) %>;
var mailpoet_wp_segment_state = <%= json_encode(wp_segment_state) %>;
var mailpoet_mta_method = '<%= mta_method %>';
</script>
<!-- javascripts -->

View File

@@ -57,7 +57,6 @@
var mailpoet_is_new_user = <%= newUser %>;
var mailpoet_installed_at = '<%= settings.installed_at %>';
var mailpoet_mss_active = <%= json_encode(mss_active) %>;
var mailpoet_mta_method = '<%= settings.mta.method %>';
var mailpoet_editor_javascript_url = '<%= getJavascriptScriptUrl("newsletter_editor.js") %>';
var mailpoet_subscribers_count = <%= subscriber_count %>;
var mailpoet_newsletters_count = <%= newsletters_count %>;