Restore context to use absolute URL in View Only pointer.

Author: aaemnnosttv

includes/Core/Dashboard_Sharing/Dashboard_Sharing.php

@@ -10,6 +10,8 @@
 
 namespace Google\Site_Kit\Core\Dashboard_Sharing;
 
+use Google\Site_Kit\Context;
+
 /**
  * Class for handling Dashboard Sharing.
  *
@@ -31,9 +33,12 @@ class Dashboard_Sharing {
 	 *
 	 * @since 1.82.0
 	 * @since 1.158.0 Remove $user_options and $context params.
+	 * @since n.e.x.t Restore $context param.
+	 *
+	 * @param Context $context Plugin context.
 	 */
-	public function __construct() {
-		$this->view_only_pointer = new View_Only_Pointer();
+	public function __construct( Context $context ) {
+		$this->view_only_pointer = new View_Only_Pointer( $context );
 	}
 
 	/**

includes/Core/Dashboard_Sharing/View_Only_Pointer.php

@@ -10,6 +10,7 @@
 
 namespace Google\Site_Kit\Core\Dashboard_Sharing;
 
+use Google\Site_Kit\Context;
 use Google\Site_Kit\Core\Admin\Pointer;
 use Google\Site_Kit\Core\Permissions\Permissions;
 
@@ -24,6 +25,25 @@ final class View_Only_Pointer {
 
 	const SLUG = 'googlesitekit-view-only-pointer';
 
+	/**
+	 * Plugin context.
+	 *
+	 * @since n.e.x.t
+	 * @var Context
+	 */
+	private $context;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @param Context $context Plugin context.
+	 */
+	public function __construct( Context $context ) {
+		$this->context = $context;
+	}
+
 	/**
 	 * Registers functionality through WordPress hooks.
 	 *
@@ -88,7 +108,8 @@ private function get_view_only_pointer() {
 				'class'           => 'googlesitekit-view-only-pointer',
 				'buttons'         =>
 					sprintf(
-						'<a class="googlesitekit-pointer-cta button-primary" href="admin.php?page=googlesitekit-dashboard" data-action="dismiss">%s</a>',
+						'<a class="googlesitekit-pointer-cta button-primary" href="%s" data-action="dismiss">%s</a>',
+						esc_attr( $this->context->admin_url( 'dashboard' ) ),
 						esc_html__( 'View dashboard', 'google-site-kit' )
 					),
 			),

includes/Plugin.php

@@ -222,7 +222,7 @@ function () use ( $options, $activation_flag ) {
 				( new Core\Util\Migration_1_129_0( $this->context, $options ) )->register();
 				( new Core\Util\Migration_1_150_0( $this->context, $options ) )->register();
 				( new Core\Util\Migration_1_163_0( $this->context, $options ) )->register();
-				( new Core\Dashboard_Sharing\Dashboard_Sharing() )->register();
+				( new Core\Dashboard_Sharing\Dashboard_Sharing( $this->context ) )->register();
 				( new Core\Key_Metrics\Key_Metrics( $this->context, $user_options, $options ) )->register();
 				( new Core\Prompts\Prompts( $this->context, $user_options ) )->register();
 				( new Core\Consent_Mode\Consent_Mode( $this->context, $modules, $options ) )->register();

tests/phpunit/integration/Core/Dashboard_Sharing/View_Only_PointerTest.php

@@ -51,7 +51,7 @@ public function set_up() {
 
 		$this->context = new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE );
 
-		$pointer = new View_Only_Pointer();
+		$pointer = new View_Only_Pointer( $this->context );
 		$pointer->register();
 	}