From 11d74e1002f95fa74da615fc18c6fc5d885df1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Thu, 3 Oct 2019 11:01:23 +0200 Subject: [PATCH] Fix dynamic segment JS imports [MAILPOET-2382] --- assets/js/src/dynamic_segments/dynamic_segments.jsx | 4 ++-- assets/js/src/dynamic_segments/form.jsx | 2 +- assets/js/src/dynamic_segments/list.jsx | 2 +- assets/js/src/webpack_admin_index.jsx | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/assets/js/src/dynamic_segments/dynamic_segments.jsx b/assets/js/src/dynamic_segments/dynamic_segments.jsx index 3d1f058cb7..511d9cca12 100644 --- a/assets/js/src/dynamic_segments/dynamic_segments.jsx +++ b/assets/js/src/dynamic_segments/dynamic_segments.jsx @@ -2,8 +2,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { HashRouter, Switch, Route } from 'react-router-dom'; -import DynamicSegmentList from './list.jsx'; -import DynamicSegmentForm from './form.jsx'; +import DynamicSegmentList from 'dynamic_segments/list.jsx'; +import DynamicSegmentForm from 'dynamic_segments/form.jsx'; const container = document.getElementById('dynamic_segments_container'); diff --git a/assets/js/src/dynamic_segments/form.jsx b/assets/js/src/dynamic_segments/form.jsx index 29b99429e4..3f086e3fa3 100644 --- a/assets/js/src/dynamic_segments/form.jsx +++ b/assets/js/src/dynamic_segments/form.jsx @@ -2,7 +2,7 @@ import React from 'react'; import _ from 'underscore'; import { Link, withRouter } from 'react-router-dom'; import MailPoet from 'mailpoet'; -import Form from 'form'; +import Form from 'form/form.jsx'; import PropTypes from 'prop-types'; import wordpressRoleFields from './filters/wordpress_role.jsx'; diff --git a/assets/js/src/dynamic_segments/list.jsx b/assets/js/src/dynamic_segments/list.jsx index 5bf1dc1525..cae5a2c58c 100644 --- a/assets/js/src/dynamic_segments/list.jsx +++ b/assets/js/src/dynamic_segments/list.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import MailPoet from 'mailpoet'; -import Listing from 'listing'; +import Listing from 'listing/listing.jsx'; import PropTypes from 'prop-types'; const columns = [ diff --git a/assets/js/src/webpack_admin_index.jsx b/assets/js/src/webpack_admin_index.jsx index 39d9407983..cad76783e4 100644 --- a/assets/js/src/webpack_admin_index.jsx +++ b/assets/js/src/webpack_admin_index.jsx @@ -8,6 +8,7 @@ import 'newsletters/automatic_emails.jsx'; // side effect - sets up automatic em 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 +import 'dynamic_segments/dynamic_segments.jsx'; // side effect - renders ReactDOM to document import 'settings/settings.jsx'; // side effect - renders ReactDOM to document import 'forms/forms.jsx'; // side effect - renders ReactDOM to document import 'settings/tabs.js'; // side effect - assigns to MailPoet.Router, executes code on doc ready