Merge branch 'develop' into enhancement/11722-ga-event-analytics-setup.

Author: ankitrox

.github/workflows/test-credentials.yml

@@ -0,0 +1,47 @@
+name: Test Credentials
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: test-credentials-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test-gcp-credentials:
+    name: Test GCP credentials
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: google-github-actions/auth@v3
+        with:
+          credentials_json: ${{ secrets.TEST_GCP_CREDENTIALS }}
+      - uses: google-github-actions/setup-gcloud@v2
+      - run: gcloud config get-value project > /dev/null && echo "GCP credentials test succeeded"
+
+  test-gh-bot-token:
+    name: Test GitHub bot token
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - run: gh api user --jq '.login'
+        env:
+          GITHUB_TOKEN: ${{ secrets.TEST_GH_BOT_TOKEN }}
+
+  test-zenhub-gql-api-token:
+    name: Test Zenhub GraphQL API token
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - run: |
+          curl -X POST https://api.zenhub.com/public/graphql \
+            -H "Authorization: Bearer $ZENHUB_GQL_API_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "{ viewer { githubUser { login } } }"}' \
+            --fail --silent --show-error
+        env:
+          ZENHUB_GQL_API_TOKEN: ${{ secrets.TEST_ZENHUB_GQL_API_TOKEN }}
+

assets/js/components/SelectionPanel/index.stories.js

@@ -105,7 +105,8 @@ function Template( {
 export const Default = Template.bind( {} );
 Default.storyName = 'Default';
 Default.scenario = {
-	delay: 1500,
+	readySelector:
+		'.googlesitekit-selection-panel-item:first-of-type .mdc-checkbox__native-control:focus',
 };
 
 export const WithSavedItems = Template.bind( {} );

assets/js/components/wp-dashboard/WPDashboardWidgets.stories.js

@@ -116,9 +116,7 @@ ReadyWithActivateAnalyticsCTA.args = {
 	},
 };
 
-ReadyWithActivateAnalyticsCTA.scenario = {
-	// delay: 6000, // This extra delay is required to fix unstable VRTs. TODO: remove if not required.
-};
+ReadyWithActivateAnalyticsCTA.scenario = {};
 
 export const ReadyWithCompleteAnalyticsActivationCTA = Template.bind( {} );
 ReadyWithCompleteAnalyticsActivationCTA.storyName =

assets/js/modules/analytics-4/components/dashboard/DashboardAllTrafficWidgetGA4/indexEntityDashboard.stories.js

@@ -49,7 +49,12 @@ const widgetComponentProps = getWidgetComponentProps(
 );
 
 function Template() {
-	return <DashboardAllTrafficWidgetGA4 { ...widgetComponentProps } />;
+	// Min height added to fix rare VRT instability where the mobile VRT for Zero Data was not capturing the full height.
+	return (
+		<div style={ { minHeight: '980px' } }>
+			<DashboardAllTrafficWidgetGA4 { ...widgetComponentProps } />
+		</div>
+	);
 }
 
 const baseAllTrafficOptions = {
@@ -167,7 +172,7 @@ EntityDashboardLoaded.args = {
 };
 EntityDashboardLoaded.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const EntityDashboardLoading = Template.bind( {} );
@@ -225,7 +230,7 @@ EntityDashboardDataUnavailable.args = {
 };
 EntityDashboardDataUnavailable.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const EntityDashboardZeroData = Template.bind( {} );
@@ -269,7 +274,7 @@ EntityDashboardZeroData.args = {
 };
 EntityDashboardZeroData.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const EntityDashboardError = Template.bind( {} );
@@ -316,7 +321,7 @@ EntityDashboardOneRowOfData.args = {
 };
 EntityDashboardOneRowOfData.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const NoDataInComparisonDateRange = Template.bind( {} );
@@ -332,7 +337,7 @@ NoDataInComparisonDateRange.args = {
 };
 NoDataInComparisonDateRange.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export default {

assets/js/modules/analytics-4/components/dashboard/DashboardAllTrafficWidgetGA4/indexMainDashboard.stories.js

@@ -173,7 +173,7 @@ MainDashboardLoaded.args = {
 };
 MainDashboardLoaded.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const MainDashboardLoading = Template.bind( {} );
@@ -235,7 +235,7 @@ MainDashboardDataUnavailable.args = {
 };
 MainDashboardDataUnavailable.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const MainDashboardZeroData = Template.bind( {} );
@@ -279,7 +279,7 @@ MainDashboardZeroData.args = {
 };
 MainDashboardZeroData.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const MainDashboardError = Template.bind( {} );
@@ -326,7 +326,7 @@ MainDashboardOneRowOfData.args = {
 };
 MainDashboardOneRowOfData.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const NoDataInComparisonDateRange = Template.bind( {} );
@@ -342,7 +342,7 @@ NoDataInComparisonDateRange.args = {
 };
 NoDataInComparisonDateRange.scenario = {
 	readySelector: '[id^="googlesitekit-chart-"] svg',
-	delay: 200,
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export default {

assets/js/modules/search-console/components/dashboard/SearchFunnelWidgetGA4/index.stories.js

@@ -294,9 +294,9 @@ ReadyWithActivateAnalyticsCTA.args = {
 		provideSearchConsoleMockReport( registry, searchConsoleArgs );
 	},
 };
-
 ReadyWithActivateAnalyticsCTA.scenario = {
-	delay: 3000,
+	readySelector: '[id^="googlesitekit-chart-"] svg',
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const ReadyWithCompleteAnalyticsActivationCTA = Template.bind( {} );
@@ -336,9 +336,9 @@ ReadyWithCreateKeyEventCTA.args = {
 		}
 	},
 };
-
 ReadyWithCreateKeyEventCTA.scenario = {
-	delay: 3000,
+	readySelector: '[id^="googlesitekit-chart-"] svg',
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
 };
 
 export const Loading = Template.bind( {} );
@@ -485,7 +485,10 @@ NoDataInComparisonDateRange.args = {
 		}
 	},
 };
-NoDataInComparisonDateRange.scenario = {};
+NoDataInComparisonDateRange.scenario = {
+	readySelector: '[id^="googlesitekit-chart-"] svg',
+	delay: 400, // This extended delay is required to fix rare VRT instability where the chart in this scenario does not render in the standard delay.
+};
 
 export default {
 	title: 'Modules/SearchConsole/Widgets/SearchFunnelWidgetGA4',

includes/Core/Email_Reporting/Email_Reporting.php

@@ -105,6 +105,14 @@ class Email_Reporting {
 	 */
 	protected $initiator_task;
 
+	/**
+	 * Monitor task instance.
+	 *
+	 * @since n.e.x.t
+	 * @var Monitor_Task
+	 */
+	protected $monitor_task;
+
 	/**
 	 * Worker task instance.
 	 *
@@ -145,6 +153,7 @@ public function __construct(
 		$this->email_log       = new Email_Log( $this->context );
 		$this->scheduler       = new Email_Reporting_Scheduler( $frequency_planner );
 		$this->initiator_task  = new Initiator_Task( $this->scheduler, $subscribed_users_query );
+		$this->monitor_task    = new Monitor_Task( $this->scheduler, $this->settings );
 		$this->worker_task     = new Worker_Task( $max_execution_limiter, $batch_query, $this->scheduler );
 	}
 
@@ -163,8 +172,10 @@ public function register() {
 
 		if ( $this->settings->is_email_reporting_enabled() ) {
 			$this->scheduler->schedule_initiator_events();
+			$this->scheduler->schedule_monitor();
 
 			add_action( Email_Reporting_Scheduler::ACTION_INITIATOR, array( $this->initiator_task, 'handle_callback_action' ), 10, 1 );
+			add_action( Email_Reporting_Scheduler::ACTION_MONITOR, array( $this->monitor_task, 'handle_monitor_action' ) );
 			add_action( Email_Reporting_Scheduler::ACTION_WORKER, array( $this->worker_task, 'handle_callback_action' ), 10, 3 );
 
 		} else {
@@ -178,6 +189,7 @@ function ( $old_value, $new_value ) {
 
 				if ( $is_enabled && ! $was_enabled ) {
 					$this->scheduler->schedule_initiator_events();
+					$this->scheduler->schedule_monitor();
 					return;
 				}
 

includes/Core/Email_Reporting/Email_Reporting_Scheduler.php

@@ -24,6 +24,7 @@ class Email_Reporting_Scheduler {
 	const ACTION_INITIATOR = 'googlesitekit_email_reporting_initiator';
 	const ACTION_WORKER    = 'googlesitekit_email_reporting_worker';
 	const ACTION_FALLBACK  = 'googlesitekit_email_reporting_fallback';
+	const ACTION_MONITOR   = 'googlesitekit_email_reporting_monitor';
 
 	/**
 	 * Frequency planner instance.
@@ -122,13 +123,26 @@ public function schedule_fallback( $frequency, $timestamp, $delay = HOUR_IN_SECO
 		wp_schedule_single_event( $timestamp + $delay, self::ACTION_FALLBACK, array( $frequency ) );
 	}
 
+	/**
+	 * Ensures the monitor event is scheduled daily.
+	 *
+	 * @since n.e.x.t
+	 */
+	public function schedule_monitor() {
+		if ( wp_next_scheduled( self::ACTION_MONITOR ) ) {
+			return;
+		}
+
+		wp_schedule_event( time(), 'daily', self::ACTION_MONITOR );
+	}
+
 	/**
 	 * Unschedules all email reporting related events.
 	 *
 	 * @since n.e.x.t
 	 */
 	public function unschedule_all() {
-		foreach ( array( self::ACTION_INITIATOR, self::ACTION_WORKER, self::ACTION_FALLBACK ) as $hook ) {
+		foreach ( array( self::ACTION_INITIATOR, self::ACTION_WORKER, self::ACTION_FALLBACK, self::ACTION_MONITOR ) as $hook ) {
 			wp_unschedule_hook( $hook );
 		}
 	}

includes/Core/Email_Reporting/Monitor_Task.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Class Google\Site_Kit\Core\Email_Reporting\Monitor_Task
+ *
+ * @package   Google\Site_Kit\Core\Email_Reporting
+ * @copyright 2025 Google LLC
+ * @license   https://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link      https://sitekit.withgoogle.com
+ */
+
+namespace Google\Site_Kit\Core\Email_Reporting;
+
+use Google\Site_Kit\Core\User\Email_Reporting_Settings as User_Email_Reporting_Settings;
+
+/**
+ * Restores missing initiator schedules for email reporting.
+ *
+ * @since n.e.x.t
+ * @access private
+ * @ignore
+ */
+class Monitor_Task {
+
+	/**
+	 * Scheduler instance.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @var Email_Reporting_Scheduler
+	 */
+	private $scheduler;
+
+	/**
+	 * Settings instance.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @var Email_Reporting_Settings
+	 */
+	private $settings;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @param Email_Reporting_Scheduler $scheduler Scheduler instance.
+	 * @param Email_Reporting_Settings  $settings  Email reporting settings.
+	 */
+	public function __construct( Email_Reporting_Scheduler $scheduler, Email_Reporting_Settings $settings ) {
+		$this->scheduler = $scheduler;
+		$this->settings  = $settings;
+	}
+
+	/**
+	 * Handles the monitor cron callback.
+	 *
+	 * The monitor ensures each initiator schedule exists and recreates any
+	 * missing ones without disturbing existing events.
+	 *
+	 * @since n.e.x.t
+	 */
+	public function handle_monitor_action() {
+		if ( ! $this->settings->is_email_reporting_enabled() ) {
+			return;
+		}
+
+		foreach ( array( User_Email_Reporting_Settings::FREQUENCY_WEEKLY, User_Email_Reporting_Settings::FREQUENCY_MONTHLY, User_Email_Reporting_Settings::FREQUENCY_QUARTERLY ) as $frequency ) {
+			if ( wp_next_scheduled( Email_Reporting_Scheduler::ACTION_INITIATOR, array( $frequency ) ) ) {
+				continue;
+			}
+
+			$this->scheduler->schedule_initiator_once( $frequency );
+		}
+	}
+}

includes/Core/Util/Uninstallation.php

@@ -60,6 +60,7 @@ class Uninstallation {
 		Email_Reporting_Scheduler::ACTION_INITIATOR,
 		Email_Reporting_Scheduler::ACTION_WORKER,
 		Email_Reporting_Scheduler::ACTION_FALLBACK,
+		Email_Reporting_Scheduler::ACTION_MONITOR,
 		OAuth_Client::CRON_REFRESH_PROFILE_DATA,
 		Remote_Features_Cron::CRON_ACTION,
 		Synchronize_AdSenseLinked::CRON_SYNCHRONIZE_ADSENSE_LINKED,