Enqueue newletter assest using asset controller

[MAILPOET-4908]
mailpoet · Jan 4, 2023 · dd2eea7 · dd2eea7
1 parent 55dd032
commit dd2eea7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/mailpoet/lib/AdminPages/Pages/Newsletters.php b/mailpoet/lib/AdminPages/Pages/Newsletters.php
@@ -8,6 +8,7 @@
 use MailPoet\Config\Installer;
 use MailPoet\Config\Menu;
 use MailPoet\Entities\NewsletterEntity;
+use MailPoet\Form\AssetsController;
 use MailPoet\Listing\PageLimit;
 use MailPoet\Newsletter\NewslettersRepository;
 use MailPoet\NewsletterTemplates\NewsletterTemplatesRepository;
@@ -54,6 +55,9 @@ class Newsletters {
   /** @var AuthorizedSenderDomainController */
   private $senderDomainController;
 
+  /*** @var AssetsController */
+  private $assetsController;
+
   public function __construct(
     PageRenderer $pageRenderer,
     PageLimit $listingPageLimit,
@@ -65,7 +69,8 @@ public function __construct(
     SegmentsSimpleListRepository $segmentsListRepository,
     NewslettersRepository $newslettersRepository,
     Bridge $bridge,
-    AuthorizedSenderDomainController $senderDomainController
+    AuthorizedSenderDomainController $senderDomainController,
+    AssetsController $assetsController
   ) {
     $this->pageRenderer = $pageRenderer;
     $this->listingPageLimit = $listingPageLimit;
@@ -78,11 +83,13 @@ public function __construct(
     $this->newslettersRepository = $newslettersRepository;
     $this->bridge = $bridge;
     $this->senderDomainController = $senderDomainController;
+    $this->assetsController = $assetsController;
   }
 
   public function render() {
     global $wp_roles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
 
+    $this->assetsController->setupAdminPagesDependencies();
     $data = [];
 
     $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters');

diff --git a/mailpoet/lib/Form/AssetsController.php b/mailpoet/lib/Form/AssetsController.php
@@ -180,4 +180,16 @@ public function setupNewsletterEditorDependencies(): void {
      */
     \wp_scripts()->do_item('newsletter_editor');
   }
+
+  public function setupAdminPagesDependencies(): void {
+
+    $this->wp->wpEnqueueScript(
+      'mailpoet_admin_pages',
+      Env::$assetsUrl . '/dist/js/' . $this->renderer->getJsAsset('admin.js'),
+      [],
+      Env::$version,
+      true
+    );
+    $this->wp->wpSetScriptTranslations('mailpoet_admin_pages', 'mailpoet');
+  }
 }
diff --git a/mailpoet/views/layout.html b/mailpoet/views/layout.html
@@ -216,11 +216,6 @@
   'admin_vendor.js'
 )%>
 
-<%= do_action('mailpoet_scripts_admin_before') %>
-
-<%= javascript(
-  'admin.js'
-)%>
 
 <%if is_loading_3rd_party_enabled() %>
   <%= javascript('lib/analytics.js') %>