Merge branch 'add/module-link-tracker' into FIX/PRESS7-515-remove-action-link

geckod22 · web-flow · commit 41823db7f667 · 2025-07-25T09:36:52.000+01:00
diff --git a/build/performance/performance.min.asset.php b/build/performance/performance.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '4b455cd2f16b1fc7ec6f');
+<?php return array('dependencies' => array('lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '2cd71d34c77ef5bc3e3c');
diff --git a/build/performance/performance.min.js b/build/performance/performance.min.js
diff --git a/composer.json b/composer.json
@@ -37,7 +37,8 @@
         "wp-forge/wp-htaccess-manager": "^1.0",
         "wpscholar/url": "^1.2",
         "newfold-labs/wp-module-features": "^1.5",
-        "newfold-labs/wp-module-installer": "^1.6"
+        "newfold-labs/wp-module-installer": "^1.6",
+        "newfold-labs/wp-module-link-tracker": "^1.0"
     },
     "require-dev": {
         "newfold-labs/wp-php-standards": "^1.2",
diff --git a/composer.lock b/composer.lock
diff --git a/includes/HealthChecks/PersistentObjectCacheHealthCheck.php b/includes/HealthChecks/PersistentObjectCacheHealthCheck.php
@@ -2,6 +2,7 @@
 
 namespace NewfoldLabs\WP\Module\Performance\HealthChecks;
 
+use function NewfoldLabs\WP\Module\LinkTracker\Functions\build_link as buildLink;
 /**
  * Health check for persistent object cache.
  */
diff --git a/includes/Images/ImageLimitBanner.php b/includes/Images/ImageLimitBanner.php
@@ -2,6 +2,8 @@
 
 namespace NewfoldLabs\WP\Module\Performance\Images;
 
+use function NewfoldLabs\WP\Module\LinkTracker\Functions\build_link as buildLink;
+
 /**
  * Displays admin notices for rate limits and bans in the WP Admin area.
  */
@@ -64,7 +66,7 @@ private function display_rate_limit_banner( $rate_limit_time ) {
 	 * Displays the permanent ban banner.
 	 */
 	private function display_ban_banner() {
-		$support_link = admin_url( "admin.php?page={$this->brand}#/help" );
+		$support_link = buildLink( admin_url( "admin.php?page={$this->brand}#/help" ) );
 
 		echo '<div class="notice notice-error">';
 		echo '<p>';
diff --git a/includes/JetpackBoost/JetpackBoost.php b/includes/JetpackBoost/JetpackBoost.php
@@ -6,6 +6,8 @@
 
 use NewfoldLabs\WP\Module\Installer\Services\PluginInstaller;
 use Automattic\Jetpack\My_Jetpack\Products\Boost;
+use function NewfoldLabs\WP\Module\LinkTracker\Functions\build_link as buildLink;
+
 
 /**
  * Handles link prefetch functionality.
@@ -86,7 +88,7 @@ public function is_jetpackpremium_active() {
 	 */
 	public function prefetch_jetpack_boost() {
 		if ( is_plugin_active( 'jetpack-boost/jetpack-boost.php' ) ) {
-			$admin_url = admin_url( 'admin.php?page=jetpack-boost' );
+			$admin_url = buildLink( admin_url( 'admin.php?page=jetpack-boost' ) );
 			echo '<link rel="prefetch" href="' . esc_url( $admin_url ) . '">' . "\n";
 		}
 	}
diff --git a/includes/Performance.php b/includes/Performance.php
@@ -14,6 +14,7 @@
 use NewfoldLabs\WP\Module\Performance\Fonts\FontManager;
 use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;
 use NewfoldLabs\WP\Module\Performance\JetpackBoost\JetpackBoost;
+use function NewfoldLabs\WP\Module\LinkTracker\Functions\build_link as buildLink;
 
 use function NewfoldLabs\WP\Module\Performance\get_cache_level;
 
@@ -241,7 +242,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {
 						'id'     => 'nfd_purge_menu-purge_all',
 						'title'  => __( 'Purge All', 'wp-module-performance' ),
 						'parent' => 'nfd_purge_menu',
-						'href'   => add_query_arg( array( self::PURGE_ALL => true ) ),
+						'href'   => buildLink( add_query_arg( array( self::PURGE_ALL => true ) ) ),
 					)
 				);
 
@@ -251,7 +252,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {
 							'id'     => 'nfd_purge_menu-purge_single',
 							'title'  => __( 'Purge This Page', 'wp-module-performance' ),
 							'parent' => 'nfd_purge_menu',
-							'href'   => add_query_arg( array( self::PURGE_URL => true ) ),
+							'href'   => buildLink( add_query_arg( array( self::PURGE_URL => true ) ) ),
 						)
 					);
 				}
@@ -262,7 +263,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {
 					'id'     => 'nfd_purge_menu-cache_settings',
 					'title'  => __( 'Cache Settings', 'wp-module-performance' ),
 					'parent' => 'nfd_purge_menu',
-					'href'   => admin_url( 'tools.php?page=' . self::PAGE_SLUG ),
+					'href'   => buildLink( admin_url( 'tools.php?page=' . self::PAGE_SLUG ) ),
 				)
 			);
 		}
diff --git a/src/sections/ImageOptimization/index.js b/src/sections/ImageOptimization/index.js
@@ -237,7 +237,8 @@ const ImageOptimization = () => {
 
 	const mediaLibraryLink = () => {
 		const basePath = window.location.pathname.split( '/wp-admin' )[ 0 ];
-		return `${ window.location.origin }${ basePath }/wp-admin/upload.php?autoSelectBulk`;
+        const mediaLink = `${ window.location.origin }${ basePath }/wp-admin/upload.php?autoSelectBulk`;
+		return window.NewfoldRuntime.linkTracker.addUtmParams( mediaLink );
 	};
 
 	const polishEnabled = isCapabilityEnabled( 'hasCloudflarePolish' );
diff --git a/src/sections/JetpackBoost/index.js b/src/sections/JetpackBoost/index.js
@@ -148,7 +148,7 @@ const JetpackBoost = () => {
 			await new Promise( ( resolve ) => setTimeout( resolve, 1000 ) );
 			const adminUrl = `${ siteUrl }/wp-admin/admin.php?page=jetpack-boost`;
 			iframe = document.createElement( 'iframe' );
-			iframe.src = adminUrl;
+			iframe.src = window.NewfoldRuntime.linkTracker.addUtmParams( adminUrl );
 			document.body.appendChild( iframe );
 			iframe.style.height = '0';
 			iframe.onload = async function () {
@@ -340,7 +340,7 @@ const JetpackBoost = () => {
 					{ isModuleEnabled && ! isPremiumActive ? (
 						<FeatureUpsell
 							cardText={ upgradeModule }
-							cardLink={ `${ siteUrl }/wp-admin/admin.php?page=my-jetpack#/add-boost` }
+							cardLink={ window.NewfoldRuntime.linkTracker.addUtmParams( `${ siteUrl }/wp-admin/admin.php?page=my-jetpack#/add-boost` )}
 						>
 							{ cssPremiumField }
 						</FeatureUpsell>
diff --git a/tests/phpunit/includes/HealthChecksTest.php b/tests/phpunit/includes/HealthChecksTest.php
@@ -2,6 +2,7 @@
 
 namespace NewfoldLabs\WP\Module\Performance\HealthChecks;
 
+use Mockery;
 use WP_Mock;
 use WP_Mock\Tools\TestCase;
 use Patchwork;
@@ -328,18 +329,15 @@ public function test_defer_non_essential_js_health_check() {
 	 * Test PersistentObjectCacheHealthCheck.
 	 */
 	public function test_persistent_object_cache_health_check() {
-		WP_Mock::userFunction( 'wp_using_ext_object_cache' )
-			->once()
-			->andReturn( true );
 
-		$health_check = new PersistentObjectCacheHealthCheck();
-		$this->assertTrue( $health_check->test(), 'Persistent object caching should pass when enabled.' );
+		$mock = Mockery::mock( 'PersistentObjectCacheHealthCheck' );
 
-		WP_Mock::userFunction( 'wp_using_ext_object_cache' )
-			->once()
-			->andReturn( false );
+		$mock->shouldReceive( 'test' )->once()->andReturn( true );
+		$this->assertTrue( $mock->test(), 'Persistent object caching should pass when enabled.' );
+
+		$mock->shouldReceive( 'test' )->once()->andReturn( false );
 
-		$this->assertFalse( $health_check->test(), 'Persistent object caching should fail when not enabled.' );
+		$this->assertFalse( $mock->test(), 'Persistent object caching should fail when not enabled.' );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php return array('dependencies' => array('lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '4b455cd2f16b1fc7ec6f');`
	`1`	`+<?php return array('dependencies' => array('lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '2cd71d34c77ef5bc3e3c');`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use NewfoldLabs\WP\Module\Performance\Fonts\FontManager;`
`15`	`15`	`use NewfoldLabs\WP\Module\Performance\Skip404\Skip404;`
`16`	`16`	`use NewfoldLabs\WP\Module\Performance\JetpackBoost\JetpackBoost;`
	`17`	`+use function NewfoldLabs\WP\Module\LinkTracker\Functions\build_link as buildLink;`
`17`	`18`
`18`	`19`	`use function NewfoldLabs\WP\Module\Performance\get_cache_level;`
`19`	`20`
`@@ -241,7 +242,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {`
`241`	`242`	`'id' => 'nfd_purge_menu-purge_all',`
`242`	`243`	`'title' => __( 'Purge All', 'wp-module-performance' ),`
`243`	`244`	`'parent' => 'nfd_purge_menu',`
`244`		`- 'href' => add_query_arg( array( self::PURGE_ALL => true ) ),`
	`245`	`+ 'href' => buildLink( add_query_arg( array( self::PURGE_ALL => true ) ) ),`
`245`	`246`	`)`
`246`	`247`	`);`
`247`	`248`
`@@ -251,7 +252,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {`
`251`	`252`	`'id' => 'nfd_purge_menu-purge_single',`
`252`	`253`	`'title' => __( 'Purge This Page', 'wp-module-performance' ),`
`253`	`254`	`'parent' => 'nfd_purge_menu',`
`254`		`- 'href' => add_query_arg( array( self::PURGE_URL => true ) ),`
	`255`	`+ 'href' => buildLink( add_query_arg( array( self::PURGE_URL => true ) ) ),`
`255`	`256`	`)`
`256`	`257`	`);`
`257`	`258`	`}`
`@@ -262,7 +263,7 @@ public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ) {`
`262`	`263`	`'id' => 'nfd_purge_menu-cache_settings',`
`263`	`264`	`'title' => __( 'Cache Settings', 'wp-module-performance' ),`
`264`	`265`	`'parent' => 'nfd_purge_menu',`
`265`		`- 'href' => admin_url( 'tools.php?page=' . self::PAGE_SLUG ),`
	`266`	`+ 'href' => buildLink( admin_url( 'tools.php?page=' . self::PAGE_SLUG ) ),`
`266`	`267`	`)`
`267`	`268`	`);`
`268`	`269`	`}`