diff --git a/assets/js/src/newsletters/listings/notification_history.jsx b/assets/js/src/newsletters/listings/notification_history.jsx index 4618b929a2..79fcf77e58 100644 --- a/assets/js/src/newsletters/listings/notification_history.jsx +++ b/assets/js/src/newsletters/listings/notification_history.jsx @@ -2,7 +2,6 @@ import React from 'react'; import { Link } from 'react-router-dom'; import classNames from 'classnames'; import MailPoet from 'mailpoet'; -import Hooks from 'wp-js-hooks'; import PropTypes from 'prop-types'; import Listing from 'listing/listing.jsx'; @@ -56,9 +55,7 @@ let newsletterActions = [ }, }, ]; - -Hooks.addFilter('mailpoet_newsletters_listings_notification_history_actions', 'mailpoet', addStatsCTAAction); -newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_notification_history_actions', newsletterActions); +newsletterActions = addStatsCTAAction(newsletterActions); class NewsletterListNotificationHistory extends React.Component { static displayName = 'NewsletterListNotificationHistory'; diff --git a/assets/js/src/newsletters/listings/standard.jsx b/assets/js/src/newsletters/listings/standard.jsx index ac234cfd46..7d3ad1103f 100644 --- a/assets/js/src/newsletters/listings/standard.jsx +++ b/assets/js/src/newsletters/listings/standard.jsx @@ -1,7 +1,6 @@ import React from 'react'; import classNames from 'classnames'; import MailPoet from 'mailpoet'; -import Hooks from 'wp-js-hooks'; import PropTypes from 'prop-types'; import confirmAlert from 'common/confirm_alert.jsx'; @@ -167,9 +166,7 @@ let newsletterActions = [ name: 'trash', }, ]; - -Hooks.addFilter('mailpoet_newsletters_listings_standard_actions', 'mailpoet', addStatsCTAAction); -newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_standard_actions', newsletterActions); +newsletterActions = addStatsCTAAction(newsletterActions); class NewsletterListStandard extends React.Component { static displayName = 'NewsletterListStandard'; diff --git a/assets/js/src/newsletters/listings/statistics.jsx b/assets/js/src/newsletters/listings/statistics.jsx index bdf98c3863..a767412bd3 100644 --- a/assets/js/src/newsletters/listings/statistics.jsx +++ b/assets/js/src/newsletters/listings/statistics.jsx @@ -35,17 +35,6 @@ const wrapInLink = (content, params, id, totalSent) => { ); }; -const addStatsCTALink = (params) => { - if (window.mailpoet_premium_active) { - return params; - } - const newParams = params; - newParams.link = 'admin.php?page=mailpoet-premium'; - newParams.externalLink = true; - newParams.onClick = trackStatsCTAClicked; - return newParams; -}; - const Statistics = ({ newsletter, isSent, currentTime }) => { let sent = isSent; if (sent === undefined) { @@ -60,9 +49,10 @@ const Statistics = ({ newsletter, isSent, currentTime }) => { ); } - let params = {}; - Hooks.addFilter('mailpoet_newsletters_listing_stats_before', 'mailpoet', addStatsCTALink); - params = Hooks.applyFilters('mailpoet_newsletters_listing_stats_before', params, newsletter); + const params = { + link: `/stats/${newsletter.id}`, + onClick: Hooks.applyFilters('mailpoet_newsletters_listing_stats_tracking', trackStatsCTAClicked), + }; // welcome emails provide explicit total_sent value const totalSent = Number((newsletter.total_sent || newsletter.queue.count_processed)); diff --git a/assets/js/src/newsletters/listings/utils.jsx b/assets/js/src/newsletters/listings/utils.jsx index 9e7bd7bb64..9258846329 100644 --- a/assets/js/src/newsletters/listings/utils.jsx +++ b/assets/js/src/newsletters/listings/utils.jsx @@ -1,6 +1,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; +import { Link } from 'react-router-dom'; import ReactStringReplace from 'react-string-replace'; +import Hooks from 'wp-js-hooks'; import MailPoet from 'mailpoet'; import jQuery from 'jquery'; @@ -12,16 +14,16 @@ export const trackStatsCTAClicked = () => { }; export const addStatsCTAAction = (actions) => { - if (window.mailpoet_premium_active) { - return actions; - } actions.unshift({ name: 'stats', - link: function link() { + link: function link(newsletter) { return ( - + {MailPoet.I18n.t('statsListingActionTitle')} - + ); }, display: function display(newsletter) { diff --git a/assets/js/src/newsletters/listings/welcome.jsx b/assets/js/src/newsletters/listings/welcome.jsx index d99ad121e4..d56ee3dbed 100644 --- a/assets/js/src/newsletters/listings/welcome.jsx +++ b/assets/js/src/newsletters/listings/welcome.jsx @@ -17,7 +17,6 @@ import { import classNames from 'classnames'; import MailPoet from 'mailpoet'; import _ from 'underscore'; -import Hooks from 'wp-js-hooks'; const mailpoetRoles = window.mailpoet_roles || {}; const mailpoetSegments = window.mailpoet_segments || {}; @@ -153,9 +152,7 @@ let newsletterActions = [ name: 'trash', }, ]; - -Hooks.addFilter('mailpoet_newsletters_listings_welcome_notification_actions', 'mailpoet', addStatsCTAAction); -newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_welcome_notification_actions', newsletterActions); +newsletterActions = addStatsCTAAction(newsletterActions); class NewsletterListWelcome extends React.Component { static displayName = 'NewsletterListWelcome'; diff --git a/assets/js/src/newsletters/sending_status.jsx b/assets/js/src/newsletters/sending_status.jsx index e02ba9efe9..66863e0998 100644 --- a/assets/js/src/newsletters/sending_status.jsx +++ b/assets/js/src/newsletters/sending_status.jsx @@ -101,10 +101,7 @@ SendingStatusListing.propTypes = { const StatsLink = ({ newsletterId, newsletterSubject }) => { if (!newsletterId || !newsletterSubject) return null; - if (window.mailpoet_premium_active) { - return
{ newsletterSubject }
; - } - return ; + return{ newsletterSubject }
; }; StatsLink.propTypes = { newsletterId: PropTypes.string,