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

Replace separately places notices by component that groups them

Browse Source 
[MAILPOET-5191]
This commit is contained in:
Rostislav Wolny
2023-04-27 13:54:29 +02:00
committed by Veljko V
parent 9bc8b8095d
commit b82ff65690
5 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mailpoet/assets/js/src/homepage/notices.tsx
View File

@@ -1,21 +1,14 @@
import { MailPoet } from 'mailpoet';
import { Notices } from 'notices/notices';
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
import { TransactionalEmailsProposeOptInNotice } from 'notices/transactional_emails_propose_opt_in_notice';
import { MailerError } from 'notices/mailer_error';
import { MssAccessNotices } from 'notices/mss_access_notices';
export function HomepageNotices(): JSX.Element {
return (
<>
<Notices />
<SubscribersLimitNotice />
<EmailVolumeLimitNotice />
<InvalidMssKeyNotice
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
subscribersCount={MailPoet.subscribersCount}
/>
<MssAccessNotices />
<TransactionalEmailsProposeOptInNotice
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
sendTransactionalEmails={MailPoet.transactionalEmailsEnabled}

7
mailpoet/assets/js/src/newsletters/campaign_stats/page.tsx
View File

@@ -3,7 +3,7 @@ import { __, _x } from '@wordpress/i18n';
import { Hooks } from 'wp-js-hooks';
import { MailPoet } from 'mailpoet';
import { withRouter } from 'react-router-dom';
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
import { MssAccessNotices } from 'notices/mss_access_notices';
import { TopBarWithBeamer } from 'common/top_bar/top_bar';
import { HideScreenOptions } from 'common/hide_screen_options/hide_screen_options';
import { RemoveWrapMargin } from 'common/remove_wrap_margin/remove_wrap_margin';
@@ -111,10 +111,7 @@ function CampaignStatsPageComponent({ match, history, location }: Props) {
<TopBarWithBeamer />
<div className="mailpoet-stats-page">
<InvalidMssKeyNotice
mssKeyInvalid={window.mailpoet_mss_key_invalid}
subscribersCount={window.mailpoet_subscribers_count}
/>
<MssAccessNotices />
<ErrorBoundary>
<NewsletterStatsInfo newsletter={newsletter} />

15
mailpoet/assets/js/src/newsletters/newsletters.jsx
View File

@@ -35,10 +35,8 @@ import { ErrorBoundary, registerTranslations, Tab, withBoundary } from 'common';
import { withNpsPoll } from 'nps_poll.jsx';
import { ListingHeading } from 'newsletters/listings/heading.jsx';
import { ListingHeadingDisplay } from 'newsletters/listings/heading_display.jsx';
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
import { TransactionalEmailsProposeOptInNotice } from 'notices/transactional_emails_propose_opt_in_notice';
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
import { MssAccessNotices } from 'notices/mss_access_notices';
import { CampaignStatsPage } from './campaign_stats/page';
import { CorruptEmailNotice } from '../notices/corrupt_email_notice';
@@ -247,12 +245,6 @@ function App() {
<GlobalContext.Provider value={useGlobalContextValue(window)}>
<HashRouter>
<Notices />
<ErrorBoundary>
<SubscribersLimitNotice />
</ErrorBoundary>
<ErrorBoundary>
<EmailVolumeLimitNotice />
</ErrorBoundary>
<ErrorBoundary>
<TransactionalEmailsProposeOptInNotice
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
@@ -263,10 +255,7 @@ function App() {
/>
</ErrorBoundary>
<ErrorBoundary>
<InvalidMssKeyNotice
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
subscribersCount={MailPoet.subscribersCount}
/>
<MssAccessNotices />
</ErrorBoundary>
<Switch>
<Route

11
mailpoet/assets/js/src/segments/heading.jsx
View File

@@ -3,9 +3,7 @@ import { MailPoet } from 'mailpoet';
import { TopBarWithBeamer } from 'common/top_bar/top_bar';
import { plusIcon } from 'common/button/icon/plus';
import { SubscribersInPlan } from 'common/subscribers_in_plan';
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
import { MssAccessNotices } from 'notices/mss_access_notices';
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
function ListHeading() {
@@ -35,12 +33,7 @@ function ListHeading() {
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}
/>
<SubscribersLimitNotice />
<EmailVolumeLimitNotice />
<InvalidMssKeyNotice
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
subscribersCount={MailPoet.subscribersCount}
/>
<MssAccessNotices />
</>
);
}

11
mailpoet/assets/js/src/subscribers/list.jsx
View File

@@ -8,9 +8,7 @@ import { Listing } from 'listing/listing.jsx';
import { MailPoet } from 'mailpoet';
import { Modal } from 'common/modal/modal.tsx';
import { Selection } from 'form/fields/selection.jsx';
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
import { MssAccessNotices } from 'notices/mss_access_notices';
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
import { SubscribersInPlan } from 'common/subscribers_in_plan';
import { ListingsEngagementScore } from './listings_engagement_score';
@@ -487,12 +485,7 @@ function SubscriberList({ match }) {
subscribersInPlanLimit={MailPoet.subscribersLimit}
/>
<SubscribersLimitNotice />
<EmailVolumeLimitNotice />
<InvalidMssKeyNotice
mssKeyInvalid={window.mailpoet_mss_key_invalid}
subscribersCount={window.mailpoet_subscribers_count}
/>
<MssAccessNotices />
<SubscribersCacheMessage
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}