From 3aa382a0609fb8fda3d27ba8e5e966b0e7cdbf99 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Wed, 15 May 2019 19:37:45 +0200
Subject: [PATCH] Refactor resume sending js code out of PHP

[MAILPOET-1987]
---
 assets/js/src/dismissible-notice.jsx            | 15 +++++++++++++++
 .../Methods/ErrorMappers/MailPoetMapper.php     |  3 +--
 lib/Util/Notices/UnauthorizedEmailNotice.php    | 17 -----------------
 views/layout.html                               |  1 +
 views/newsletters.html                          |  1 -
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/assets/js/src/dismissible-notice.jsx b/assets/js/src/dismissible-notice.jsx
index 94b1c5095a..0ee736d8df 100644
--- a/assets/js/src/dismissible-notice.jsx
+++ b/assets/js/src/dismissible-notice.jsx
@@ -1,4 +1,5 @@
 import jQuery from 'jquery';
+import MailPoet from 'mailpoet';
 
 jQuery(($) => {
   $(document).on('click', '.mailpoet-dismissible-notice .notice-dismiss', function dismiss() {
@@ -12,4 +13,18 @@ jQuery(($) => {
         },
       });
   });
+  $(document).on('click', '.notice .mailpoet-js-button-resume-sending', function resumeSending() {
+    const noticeElement = $(this).closest('.notice');
+    MailPoet.Ajax.post({
+      api_version: window.mailpoet_api_version,
+      endpoint: 'mailer',
+      action: 'resumeSending',
+    }).done(() => {
+      noticeElement.slideUp();
+      MailPoet.Notice.success(MailPoet.I18n.t('mailerSendingResumedNotice'));
+      if (window.mailpoet_listing) { window.mailpoet_listing.forceUpdate(); }
+    }).fail((response) => {
+      MailPoet.Notice.showApiErrorNotice(response, { scroll: true });
+    });
+  });
 });
diff --git a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
index ea31e134f8..527366cc0a 100644
--- a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
+++ b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
@@ -103,9 +103,8 @@ class MailPoetMapper {
         'rel' => 'noopener noreferrer',
       ]
     );
-    $message .= ' &nbsp; <button class="button js-button-resume-sending">' . WPFunctions::get()->__('Resume sending', 'mailpoet') . '</button>';
+    $message .= ' &nbsp; <button class="button mailpoet-js-button-resume-sending">' . WPFunctions::get()->__('Resume sending', 'mailpoet') . '</button>';
     $message .= '</p>';
-    $message .= "<script>jQuery('.js-button-resume-sending').on('click', function() { MailPoet.Ajax.post({ api_version: window.mailpoet_api_version, endpoint: 'mailer', action: 'resumeSending' }).done(function() { jQuery('.js-error-unauthorized-email').slideUp(); MailPoet.Notice.success('" . WPFunctions::get()->__('Sending has been resumed.') . "'); if (window.mailpoet_listing) { window.mailpoet_listing.forceUpdate(); }}).fail(function(response) { if (response.errors.length > 0) { MailPoet.Notice.error(response.errors.map(function(error) { return error.message }), { scroll: true }); }}); })</script>";
     return $message;
   }
 
diff --git a/lib/Util/Notices/UnauthorizedEmailNotice.php b/lib/Util/Notices/UnauthorizedEmailNotice.php
index 53ff9faa04..c89b5d3b49 100644
--- a/lib/Util/Notices/UnauthorizedEmailNotice.php
+++ b/lib/Util/Notices/UnauthorizedEmailNotice.php
@@ -90,23 +90,6 @@ class UnauthorizedEmailNotice {
 
   private function getResumeSendingButton() {
     $button = '<button class="button button-primary mailpoet-js-button-resume-sending">' . $this->wp->__('Resume sending', 'mailpoet') . '</button>';
-    $script = "
-    <script>
-      jQuery('.mailpoet-js-button-resume-sending').on('click', function() {
-        MailPoet.Ajax.post({
-        api_version: window.mailpoet_api_version,
-        endpoint: 'mailer', action: 'resumeSending'
-        }).done(function() {
-          jQuery('.mailpoet-js-error-unauthorized-emails-notice').slideUp();
-          MailPoet.Notice.success('" . WPFunctions::get()->__('Sending has been resumed.') . "');}
-        ).fail(function(response) {
-          if (response.errors.length > 0) {
-            MailPoet.Notice.error(response.errors.map(function(error) { return error.message }), { scroll: true });
-          }
-        });
-      });
-    </script>";
-    $button .= str_replace("\n", "", $script);
     return "<p>$button</p>";
   }
 }
diff --git a/views/layout.html b/views/layout.html
index 76e0ef50d0..374bfec584 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -71,6 +71,7 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
   'senderEmailAddressWarning1': _x('You might not reach the inbox of your subscribers if you use this email address.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
   'senderEmailAddressWarning2': _x('Use an address like %suggested for the Sender and put %originalSender in the <em>Reply-to</em> field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
   'senderEmailAddressWarning3': _x('Read more.'),
+  'mailerSendingResumedNotice': __('Sending has been resumed.'),
 }) %>
 <% block translations %><% endblock %>
 
diff --git a/views/newsletters.html b/views/newsletters.html
index 9ecc70e5b5..7bee7bb1f1 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -293,7 +293,6 @@
     'mailerErrorCode': __('Error code: %$1s'),
     'mailerCheckSettingsNotice': __('Check your [link]sending method settings[/link].'),
     'mailerResumeSendingButton': __('Resume sending'),
-    'mailerSendingResumedNotice': __('Sending has been resumed.'),
     'confirmEdit': __('Sending is in progress. Do you want to pause sending and edit the newsletter?'),
     'confirmTitle': __('Confirm to proceed'),
     'confirmLabel': __('Confirm'),