Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Preserve dependent functionality on MTA tab

Browse Source 
[MAILPOET-2431]
This commit is contained in:
Jan Jakeš
2019-12-10 12:40:33 +01:00
committed by Jack Kitterhing
parent 014e6be4dc
commit d0b5a136b3
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/settings/premium_tab/messages/mss_messages.jsx
View File

@ -3,7 +3,7 @@ import React from 'react';
import MailPoet from 'mailpoet'; import MailPoet from 'mailpoet';
const validMessage = ( const validMessage = (
<div className="mailpoet_success"> <div className="mailpoet_success mailpoet_mss_key_valid">
{MailPoet.I18n.t('premiumTabMssValidMessage')} {MailPoet.I18n.t('premiumTabMssValidMessage')}
</div> </div>
); );

9
assets/js/src/settings/premium_tab/premium_tab.jsx
View File

@ -125,13 +125,15 @@ const PremiumTab = (props) => {
} }
}; };
async function verifyMailPoetSendingServiceKey() { async function verifyMailPoetSendingServiceKey(activateMssIfKeyValid) {
try { try {
const response = await requestServicesApi(key, 'checkMSSKey'); const response = await requestServicesApi(key, 'checkMSSKey');
setMssKeyValid(true); setMssKeyValid(true);
setMssKeyMessage(response.data.message || null); setMssKeyMessage(response.data.message || null);
if (activateMssIfKeyValid) {
await activateMss(key); await activateMss(key);
}
} catch (error) { } catch (error) {
setMssKeyValid(false); setMssKeyValid(false);
setMssKeyMessage(error.errors.map((e) => e.message).join(' ') || null); setMssKeyMessage(error.errors.map((e) => e.message).join(' ') || null);
@ -171,7 +173,7 @@ const PremiumTab = (props) => {
type="button" type="button"
id="mailpoet_premium_key_verify" id="mailpoet_premium_key_verify"
className="button-secondary" className="button-secondary"
onClick={async () => { onClick={async (event) => {
if (!key) { if (!key) {
MailPoet.Notice.error( MailPoet.Notice.error(
MailPoet.I18n.t('premiumTabNoKeyNotice'), MailPoet.I18n.t('premiumTabNoKeyNotice'),
@ -185,7 +187,8 @@ const PremiumTab = (props) => {
setMssKeyValid(null); setMssKeyValid(null);
MailPoet.Modal.loading(true); MailPoet.Modal.loading(true);
await verifyMailPoetSendingServiceKey(); const isUserTriggered = event.isTrusted;
await verifyMailPoetSendingServiceKey(isUserTriggered);
await verifyMailPoetPremiumKey(); await verifyMailPoetPremiumKey();
MailPoet.Modal.loading(false); MailPoet.Modal.loading(false);
}} }}

2
views/settings/mta.html
View File

@ -1131,7 +1131,7 @@
function updateMSSActivationUI() { function updateMSSActivationUI() {
var $ = jQuery; var $ = jQuery;
var group = $('.mailpoet_sending_methods .mailpoet_active').data('group'); var group = $('.mailpoet_sending_methods .mailpoet_active').data('group');
var key_valid = !$('.mailpoet_mss_key_valid').hasClass('mailpoet_hidden'); var key_valid = !!$('.mailpoet_mss_key_valid');
if (group !== 'mailpoet') { if (group !== 'mailpoet') {
$('.mailpoet_actions .mailpoet_invalid_key').toggleClass('mailpoet_hidden', key_valid); $('.mailpoet_actions .mailpoet_invalid_key').toggleClass('mailpoet_hidden', key_valid);