From c9c75c8c6da575b54e0db746a1fb58c9fbac3be0 Mon Sep 17 00:00:00 2001
From: Sam Najian <sam.najian@automattic.com>
Date: Fri, 6 Jan 2023 11:39:40 +0100
Subject: [PATCH] Add admin.js to all admin pages using AssetController

[MAILPOET-4908]
---
 mailpoet/lib/AdminPages/PageRenderer.php      | 9 ++++++++-
 mailpoet/lib/AdminPages/Pages/Newsletters.php | 9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mailpoet/lib/AdminPages/PageRenderer.php b/mailpoet/lib/AdminPages/PageRenderer.php
index ebf1deac52..f0db46c3ed 100644
--- a/mailpoet/lib/AdminPages/PageRenderer.php
+++ b/mailpoet/lib/AdminPages/PageRenderer.php
@@ -12,6 +12,7 @@ use MailPoet\Cron\Workers\SubscribersCountCacheRecalculation;
 use MailPoet\Entities\SegmentEntity;
 use MailPoet\Entities\TagEntity;
 use MailPoet\Features\FeaturesController;
+use MailPoet\Form\AssetsController;
 use MailPoet\Referrals\ReferralDetector;
 use MailPoet\Segments\SegmentsRepository;
 use MailPoet\Services\Bridge;
@@ -70,6 +71,9 @@ class PageRenderer {
   /** @var WPFunctions */
   private $wp;
 
+  /*** @var AssetsController */
+  private $assetsController;
+
   public function __construct(
     Bridge $bridge,
     Renderer $renderer,
@@ -84,7 +88,8 @@ class PageRenderer {
     SubscribersFeature $subscribersFeature,
     TrackingConfig $trackingConfig,
     TransientCache $transientCache,
-    WPFunctions $wp
+    WPFunctions $wp,
+    AssetsController $assetsController
   ) {
     $this->bridge = $bridge;
     $this->renderer = $renderer;
@@ -100,6 +105,7 @@ class PageRenderer {
     $this->trackingConfig = $trackingConfig;
     $this->transientCache = $transientCache;
     $this->wp = $wp;
+    $this->assetsController = $assetsController;
   }
 
   /**
@@ -193,6 +199,7 @@ class PageRenderer {
         $this->subscribersCountCacheRecalculation->schedule();
       }
 
+      $this->assetsController->setupAdminPagesDependencies();
       // We are in control of the template and the data can be considered safe at this point
       // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPressDotOrg.sniffs.OutputEscaping.UnescapedOutputParameter
       echo $this->renderer->render($template, $data + $defaults);
diff --git a/mailpoet/lib/AdminPages/Pages/Newsletters.php b/mailpoet/lib/AdminPages/Pages/Newsletters.php
index 1e8c7dde60..9328583962 100644
--- a/mailpoet/lib/AdminPages/Pages/Newsletters.php
+++ b/mailpoet/lib/AdminPages/Pages/Newsletters.php
@@ -8,7 +8,6 @@ use MailPoet\Config\Env;
 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;
@@ -55,9 +54,6 @@ class Newsletters {
   /** @var AuthorizedSenderDomainController */
   private $senderDomainController;
 
-  /*** @var AssetsController */
-  private $assetsController;
-
   public function __construct(
     PageRenderer $pageRenderer,
     PageLimit $listingPageLimit,
@@ -69,8 +65,7 @@ class Newsletters {
     SegmentsSimpleListRepository $segmentsListRepository,
     NewslettersRepository $newslettersRepository,
     Bridge $bridge,
-    AuthorizedSenderDomainController $senderDomainController,
-    AssetsController $assetsController
+    AuthorizedSenderDomainController $senderDomainController
   ) {
     $this->pageRenderer = $pageRenderer;
     $this->listingPageLimit = $listingPageLimit;
@@ -83,13 +78,11 @@ class Newsletters {
     $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');