From 33345c17b76b98f7a32e059467ebba585e737b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Wed, 2 Oct 2019 10:46:20 +0200 Subject: [PATCH] Rewrite automatic email imports to local modules [MAILPOET-2382] --- assets/js/src/newsletters/automatic_emails.jsx | 4 ++-- .../automatic_emails/events/event_options.jsx | 2 +- .../automatic_emails/events/event_scheduling.jsx | 6 +++--- .../automatic_emails/events_conditions.jsx | 4 ++-- .../js/src/newsletters/automatic_emails/listings.jsx | 12 ++++++------ .../automatic_emails/send_event_conditions.jsx | 2 +- assets/js/src/webpack_admin_index.jsx | 1 + 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/assets/js/src/newsletters/automatic_emails.jsx b/assets/js/src/newsletters/automatic_emails.jsx index 4c16e31f5b..0e465c7b8e 100644 --- a/assets/js/src/newsletters/automatic_emails.jsx +++ b/assets/js/src/newsletters/automatic_emails.jsx @@ -2,9 +2,9 @@ import React from 'react'; import _ from 'underscore'; import Hooks from 'wp-js-hooks'; import MailPoet from 'mailpoet'; -import AutomaticEmailEventsList from 'automatic-email-events-list'; +import AutomaticEmailEventsList from 'newsletters/types/automatic_emails/events_list.jsx'; import EventsConditions from 'newsletters/automatic_emails/events_conditions.jsx'; -import AutomaticEmailsBreadcrumb from 'automatic-emails-breadcrumb'; +import AutomaticEmailsBreadcrumb from 'newsletters/types/automatic_emails/breadcrumb.jsx'; import SendEventConditions from 'newsletters/automatic_emails/send_event_conditions.jsx'; import Listings from 'newsletters/automatic_emails/listings.jsx'; diff --git a/assets/js/src/newsletters/automatic_emails/events/event_options.jsx b/assets/js/src/newsletters/automatic_emails/events/event_options.jsx index f1ac83761b..a2409baafd 100644 --- a/assets/js/src/newsletters/automatic_emails/events/event_options.jsx +++ b/assets/js/src/newsletters/automatic_emails/events/event_options.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Selection from 'form-field-selection'; +import Selection from 'form/fields/selection.jsx'; import _ from 'underscore'; import PropTypes from 'prop-types'; diff --git a/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx b/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx index cefd862211..3e0834c9be 100644 --- a/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx +++ b/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx @@ -1,7 +1,7 @@ import React from 'react'; -import Selection from 'form-field-selection'; -import Text from 'form-field-text'; -import { timeDelayValues } from 'newsletter-scheduling-common-options'; +import Selection from 'form/fields/selection.jsx'; +import Text from 'form/fields/text.jsx'; +import { timeDelayValues } from 'newsletters/scheduling/common.jsx'; import _ from 'underscore'; import PropTypes from 'prop-types'; diff --git a/assets/js/src/newsletters/automatic_emails/events_conditions.jsx b/assets/js/src/newsletters/automatic_emails/events_conditions.jsx index 86c46279d1..dbfcb31e75 100644 --- a/assets/js/src/newsletters/automatic_emails/events_conditions.jsx +++ b/assets/js/src/newsletters/automatic_emails/events_conditions.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import Selection from 'form-field-selection'; -import AutomaticEmailsBreadcrumb from 'automatic-emails-breadcrumb'; +import Selection from 'form/fields/selection.jsx'; +import AutomaticEmailsBreadcrumb from 'newsletters/types/automatic_emails/breadcrumb.jsx'; import EventScheduling from 'newsletters/automatic_emails/events/event_scheduling.jsx'; import EventOptions from 'newsletters/automatic_emails/events/event_options.jsx'; import MailPoet from 'mailpoet'; diff --git a/assets/js/src/newsletters/automatic_emails/listings.jsx b/assets/js/src/newsletters/automatic_emails/listings.jsx index 946395f5a5..2d2d350916 100644 --- a/assets/js/src/newsletters/automatic_emails/listings.jsx +++ b/assets/js/src/newsletters/automatic_emails/listings.jsx @@ -1,10 +1,10 @@ import React from 'react'; -import Listing from 'listing'; -import ListingTabs from 'newsletters-listings-tabs'; -import ListingHeading from 'newsletters-listings-heading'; -import FeatureAnnouncement from 'feature-announcement'; -import { checkMailerStatus, addStatsCTAAction } from 'newsletters-listings-utils'; -import Statistics from 'newsletters-listings-statistics'; +import Listing from 'listing/listing.jsx'; +import ListingTabs from 'newsletters/listings/tabs.jsx'; +import ListingHeading from 'newsletters/listings/heading.jsx'; +import FeatureAnnouncement from 'announcements/feature_announcement.jsx'; +import { checkMailerStatus, addStatsCTAAction } from 'newsletters/listings/utils.jsx'; +import Statistics from 'newsletters/listings/statistics.jsx'; import classNames from 'classnames'; import MailPoet from 'mailpoet'; import _ from 'underscore'; diff --git a/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx b/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx index a24f3c87c2..a7241698a3 100644 --- a/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx +++ b/assets/js/src/newsletters/automatic_emails/send_event_conditions.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Selection from 'form-field-selection'; +import Selection from 'form/fields/selection.jsx'; import EventScheduling from 'newsletters/automatic_emails/events/event_scheduling.jsx'; import EventOptions from 'newsletters/automatic_emails/events/event_options.jsx'; import _ from 'underscore'; diff --git a/assets/js/src/webpack_admin_index.jsx b/assets/js/src/webpack_admin_index.jsx index 2177a71c7f..39d9407983 100644 --- a/assets/js/src/webpack_admin_index.jsx +++ b/assets/js/src/webpack_admin_index.jsx @@ -4,6 +4,7 @@ // This is to avoid undefined import order & messy WebPack config. // Code can be gradually refactored to avoid side effects completely. +import 'newsletters/automatic_emails.jsx'; // side effect - sets up automatic emails via hooks import 'subscribers/subscribers.jsx'; // side effect - renders ReactDOM to document import 'newsletters/newsletters.jsx'; // side effect - renders ReactDOM to window import 'segments/segments.jsx'; // side effect - renders ReactDOM to document