Replace separately places notices by component that groups them
[MAILPOET-5191]
This commit is contained in:
committed by
Veljko V
parent
9bc8b8095d
commit
b82ff65690
@@ -1,21 +1,14 @@
|
|||||||
import { MailPoet } from 'mailpoet';
|
import { MailPoet } from 'mailpoet';
|
||||||
import { Notices } from 'notices/notices';
|
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 { TransactionalEmailsProposeOptInNotice } from 'notices/transactional_emails_propose_opt_in_notice';
|
||||||
import { MailerError } from 'notices/mailer_error';
|
import { MailerError } from 'notices/mailer_error';
|
||||||
|
import { MssAccessNotices } from 'notices/mss_access_notices';
|
||||||
|
|
||||||
export function HomepageNotices(): JSX.Element {
|
export function HomepageNotices(): JSX.Element {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Notices />
|
<Notices />
|
||||||
<SubscribersLimitNotice />
|
<MssAccessNotices />
|
||||||
<EmailVolumeLimitNotice />
|
|
||||||
<InvalidMssKeyNotice
|
|
||||||
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
|
|
||||||
subscribersCount={MailPoet.subscribersCount}
|
|
||||||
/>
|
|
||||||
<TransactionalEmailsProposeOptInNotice
|
<TransactionalEmailsProposeOptInNotice
|
||||||
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
|
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
|
||||||
sendTransactionalEmails={MailPoet.transactionalEmailsEnabled}
|
sendTransactionalEmails={MailPoet.transactionalEmailsEnabled}
|
||||||
|
@@ -3,7 +3,7 @@ import { __, _x } from '@wordpress/i18n';
|
|||||||
import { Hooks } from 'wp-js-hooks';
|
import { Hooks } from 'wp-js-hooks';
|
||||||
import { MailPoet } from 'mailpoet';
|
import { MailPoet } from 'mailpoet';
|
||||||
import { withRouter } from 'react-router-dom';
|
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 { TopBarWithBeamer } from 'common/top_bar/top_bar';
|
||||||
import { HideScreenOptions } from 'common/hide_screen_options/hide_screen_options';
|
import { HideScreenOptions } from 'common/hide_screen_options/hide_screen_options';
|
||||||
import { RemoveWrapMargin } from 'common/remove_wrap_margin/remove_wrap_margin';
|
import { RemoveWrapMargin } from 'common/remove_wrap_margin/remove_wrap_margin';
|
||||||
@@ -111,10 +111,7 @@ function CampaignStatsPageComponent({ match, history, location }: Props) {
|
|||||||
<TopBarWithBeamer />
|
<TopBarWithBeamer />
|
||||||
|
|
||||||
<div className="mailpoet-stats-page">
|
<div className="mailpoet-stats-page">
|
||||||
<InvalidMssKeyNotice
|
<MssAccessNotices />
|
||||||
mssKeyInvalid={window.mailpoet_mss_key_invalid}
|
|
||||||
subscribersCount={window.mailpoet_subscribers_count}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<NewsletterStatsInfo newsletter={newsletter} />
|
<NewsletterStatsInfo newsletter={newsletter} />
|
||||||
|
@@ -35,10 +35,8 @@ import { ErrorBoundary, registerTranslations, Tab, withBoundary } from 'common';
|
|||||||
import { withNpsPoll } from 'nps_poll.jsx';
|
import { withNpsPoll } from 'nps_poll.jsx';
|
||||||
import { ListingHeading } from 'newsletters/listings/heading.jsx';
|
import { ListingHeading } from 'newsletters/listings/heading.jsx';
|
||||||
import { ListingHeadingDisplay } from 'newsletters/listings/heading_display.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 { 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 { CampaignStatsPage } from './campaign_stats/page';
|
||||||
import { CorruptEmailNotice } from '../notices/corrupt_email_notice';
|
import { CorruptEmailNotice } from '../notices/corrupt_email_notice';
|
||||||
|
|
||||||
@@ -247,12 +245,6 @@ function App() {
|
|||||||
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
||||||
<HashRouter>
|
<HashRouter>
|
||||||
<Notices />
|
<Notices />
|
||||||
<ErrorBoundary>
|
|
||||||
<SubscribersLimitNotice />
|
|
||||||
</ErrorBoundary>
|
|
||||||
<ErrorBoundary>
|
|
||||||
<EmailVolumeLimitNotice />
|
|
||||||
</ErrorBoundary>
|
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<TransactionalEmailsProposeOptInNotice
|
<TransactionalEmailsProposeOptInNotice
|
||||||
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
|
mailpoetInstalledDaysAgo={MailPoet.installedDaysAgo}
|
||||||
@@ -263,10 +255,7 @@ function App() {
|
|||||||
/>
|
/>
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<InvalidMssKeyNotice
|
<MssAccessNotices />
|
||||||
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
|
|
||||||
subscribersCount={MailPoet.subscribersCount}
|
|
||||||
/>
|
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route
|
<Route
|
||||||
|
@@ -3,9 +3,7 @@ import { MailPoet } from 'mailpoet';
|
|||||||
import { TopBarWithBeamer } from 'common/top_bar/top_bar';
|
import { TopBarWithBeamer } from 'common/top_bar/top_bar';
|
||||||
import { plusIcon } from 'common/button/icon/plus';
|
import { plusIcon } from 'common/button/icon/plus';
|
||||||
import { SubscribersInPlan } from 'common/subscribers_in_plan';
|
import { SubscribersInPlan } from 'common/subscribers_in_plan';
|
||||||
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
|
import { MssAccessNotices } from 'notices/mss_access_notices';
|
||||||
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
|
|
||||||
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
|
|
||||||
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
|
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
|
||||||
|
|
||||||
function ListHeading() {
|
function ListHeading() {
|
||||||
@@ -35,12 +33,7 @@ function ListHeading() {
|
|||||||
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}
|
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SubscribersLimitNotice />
|
<MssAccessNotices />
|
||||||
<EmailVolumeLimitNotice />
|
|
||||||
<InvalidMssKeyNotice
|
|
||||||
mssKeyInvalid={MailPoet.hasInvalidMssApiKey}
|
|
||||||
subscribersCount={MailPoet.subscribersCount}
|
|
||||||
/>
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@@ -8,9 +8,7 @@ import { Listing } from 'listing/listing.jsx';
|
|||||||
import { MailPoet } from 'mailpoet';
|
import { MailPoet } from 'mailpoet';
|
||||||
import { Modal } from 'common/modal/modal.tsx';
|
import { Modal } from 'common/modal/modal.tsx';
|
||||||
import { Selection } from 'form/fields/selection.jsx';
|
import { Selection } from 'form/fields/selection.jsx';
|
||||||
import { SubscribersLimitNotice } from 'notices/subscribers_limit_notice';
|
import { MssAccessNotices } from 'notices/mss_access_notices';
|
||||||
import { InvalidMssKeyNotice } from 'notices/invalid_mss_key_notice';
|
|
||||||
import { EmailVolumeLimitNotice } from 'notices/email_volume_limit_notice';
|
|
||||||
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
|
import { SubscribersCacheMessage } from 'common/subscribers_cache_message';
|
||||||
import { SubscribersInPlan } from 'common/subscribers_in_plan';
|
import { SubscribersInPlan } from 'common/subscribers_in_plan';
|
||||||
import { ListingsEngagementScore } from './listings_engagement_score';
|
import { ListingsEngagementScore } from './listings_engagement_score';
|
||||||
@@ -487,12 +485,7 @@ function SubscriberList({ match }) {
|
|||||||
subscribersInPlanLimit={MailPoet.subscribersLimit}
|
subscribersInPlanLimit={MailPoet.subscribersLimit}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SubscribersLimitNotice />
|
<MssAccessNotices />
|
||||||
<EmailVolumeLimitNotice />
|
|
||||||
<InvalidMssKeyNotice
|
|
||||||
mssKeyInvalid={window.mailpoet_mss_key_invalid}
|
|
||||||
subscribersCount={window.mailpoet_subscribers_count}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<SubscribersCacheMessage
|
<SubscribersCacheMessage
|
||||||
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}
|
cacheCalculation={window.mailpoet_subscribers_counts_cache_created_at}
|
||||||
|
Reference in New Issue
Block a user