Infrastructure/11740 playwright email reporting

assets/js/components/Notice/index.js

@@ -57,6 +57,7 @@ const Notice = forwardRef(
 						`googlesitekit-notice--${ type }`,
 						className
 					) }
+					role="alert"
 				>
 					{ ! hideIcon && (
 						<div className="googlesitekit-notice__icon">

assets/js/components/email-reporting/UserSettingsSelectionPanel/index.js

@@ -188,7 +188,7 @@ export default function UserSettingsSelectionPanel() {
 
 	return (
 		<SelectionPanel
-			className="googlesitekit-user-settings-selection-panel"
+			className="googlesitekit-user-settings-selection-panel googlesitekit-email-reporting-settings"
 			isOpen={ !! isOpen }
 			onOpen={ onSideSheetOpen }
 			closePanel={ closePanel }

assets/js/components/email-reporting/notices/__snapshots__/EmailReportingErrorNotices.test.js.snap

@@ -7,6 +7,7 @@ exports[`EmailReportingErrorNotices should render the permissions error notice w
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--error googlesitekit-email-reporting__admin-settings-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"
@@ -56,6 +57,7 @@ exports[`EmailReportingErrorNotices should render the report error notice when e
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--error googlesitekit-email-reporting__admin-settings-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"

assets/js/components/google-tag-gateway/__snapshots__/GoogleTagGatewayToggle.test.js.snap

@@ -160,6 +160,7 @@ exports[`GoogleTagGatewayToggle should render in disabled state if server requir
     >
       <div
         class="googlesitekit-notice googlesitekit-notice--warning"
+        role="alert"
       >
         <div
           class="googlesitekit-notice__icon"

assets/js/components/key-metrics-setup/__snapshots__/KeyMetricsSetupApp.test.js.snap

@@ -513,6 +513,7 @@ exports[`KeyMetricsSetupApp initial setup flow should display the progress indic
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"
@@ -1012,6 +1013,7 @@ exports[`KeyMetricsSetupApp should render correctly 1`] = `
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"
@@ -1492,6 +1494,7 @@ exports[`KeyMetricsSetupApp should show an error when the save fails 1`] = `
                   >
                     <div
                       class="googlesitekit-notice googlesitekit-notice--error"
+                      role="alert"
                     >
                       <div
                         class="googlesitekit-notice__icon"
@@ -1538,6 +1541,7 @@ exports[`KeyMetricsSetupApp should show an error when the save fails 1`] = `
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"
@@ -2037,6 +2041,7 @@ exports[`KeyMetricsSetupApp should show the analytics setup success toast notice
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"

assets/js/components/notifications/__snapshots__/GoogleTagGatewaySetupSuccessSubtleNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`GoogleTagGatewaySetupSuccessSubtleNotification should render correctly
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--success"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap

@@ -23,6 +23,7 @@ exports[`WPDashboardReportError should only render one error per module when the
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--error"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"
@@ -86,6 +87,7 @@ exports[`WPDashboardReportError should only render one error per module when the
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--error"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/ads/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`Ads EnhancedConversionsNotification should render the notification 1`]
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--info-alt"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/ads/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap

@@ -7,6 +7,7 @@ exports[`Ads EnhancedConversionsNotification should render the notice 1`] = `
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--info"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"

assets/js/modules/adsense/components/dashboard/__snapshots__/AdBlockingRecoverySetupSuccessNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`AdBlockingRecoverySetupSuccessNotification should render notification a
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--success"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/__snapshots__/AudienceCreationNotice.test.js.snap

@@ -199,6 +199,7 @@ exports[`AudienceCreationNotice should render the missing scope notice if the us
     >
       <div
         class="googlesitekit-notice googlesitekit-notice--warning"
+        role="alert"
       >
         <div
           class="googlesitekit-notice__content"

assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap

@@ -242,6 +242,7 @@ exports[`EnhancedMeasurementActivationBanner should render the success step when
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--success"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/analytics-4/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`Analytics EnhancedConversionsNotification should render the notificatio
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--info-alt"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/analytics-4/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap

@@ -7,6 +7,7 @@ exports[`Analytics EnhancedConversionsNotification should render the notice 1`]
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--info"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"

assets/js/modules/reader-revenue-manager/components/common/__snapshots__/PolicyViolationSettingsNotice.test.tsx.snap

@@ -7,6 +7,7 @@ exports[`PolicyViolationSettingsNotice should render error notice with extreme v
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--error googlesitekit-policy-violation-settings-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"
@@ -57,6 +58,7 @@ exports[`PolicyViolationSettingsNotice should render warning notice with pending
   >
     <div
       class="googlesitekit-notice googlesitekit-notice--warning googlesitekit-policy-violation-settings-notice"
+      role="alert"
     >
       <div
         class="googlesitekit-notice__icon"

assets/js/modules/reader-revenue-manager/components/dashboard/PolicyViolationNotification/__snapshots__/index.test.tsx.snap

@@ -19,6 +19,7 @@ exports[`PolicyViolationNotification should render error notification for immedi
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--error"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"
@@ -95,6 +96,7 @@ exports[`PolicyViolationNotification should render warning notification for pend
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--warning"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDContributionsNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`ProductIDContributionsNotification should render correctly 1`] = `
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--new"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDSubscriptionsNotification.test.js.snap

@@ -19,6 +19,7 @@ exports[`ProductIDSubscriptionsNotification should render correctly 1`] = `
           >
             <div
               class="googlesitekit-notice googlesitekit-notice--warning"
+              role="alert"
             >
               <div
                 class="googlesitekit-notice__icon"

assets/js/modules/reader-revenue-manager/components/setup/__snapshots__/SetupForm.test.js.snap

@@ -8,6 +8,7 @@ exports[`SetupForm should not silently fail when there is an error 1`] = `
     >
       <div
         class="googlesitekit-notice googlesitekit-notice--error"
+        role="alert"
       >
         <div
           class="googlesitekit-notice__icon"

assets/sass/components/email-reporting/_googlesitekit-user-settings-selection-panel.scss

@@ -41,7 +41,6 @@
 
 			// Ensure every notice after the first notice has a margin
 			// so the notices don't render with no gap.
-			//
 			// See: https://github.com/google/site-kit-wp/issues/12279
 			.googlesitekit-notice-container:nth-of-type(n + 2) {
 				margin-top: $grid-gap-phone;

includes/Core/Assets/Assets.php

@@ -14,6 +14,7 @@
 use Google\Site_Kit\Core\Modules\Module_Sharing_Settings;
 use Google\Site_Kit\Core\Permissions\Permissions;
 use Google\Site_Kit\Core\Storage\Options;
+use Google\Site_Kit\Core\Util\Date;
 use Google\Site_Kit\Core\Util\Feature_Flags;
 use WP_Dependencies;
 use WP_Post_Type;
@@ -795,7 +796,7 @@ private function get_inline_base_data() {
 			'webStoriesActive'  => defined( 'WEBSTORIES_VERSION' ),
 			'postTypes'         => $this->get_post_types(),
 			'storagePrefix'     => $this->get_storage_prefix(),
-			'referenceDate'     => apply_filters( 'googlesitekit_reference_date', null ),
+			'referenceDate'     => Date::reference_date(),
 			'productPostType'   => $this->get_product_post_type(),
 			'anyoneCanRegister' => (bool) get_option( 'users_can_register' ),
 			'isMultisite'       => is_multisite(),

includes/Core/Authentication/Clients/Client_Factory.php

@@ -63,6 +63,16 @@ public static function create_client( array $args ) {
 
 		$http_client        = $client->getHttpClient();
 		$http_client_config = self::get_http_client_config( $http_client->getConfig() );
+
+		/**
+		 * Filters the Guzzle HTTP client configuration used for Google API requests.
+		 *
+		 * @since n.e.x.t
+		 *
+		 * @param array $http_client_config Guzzle HTTP client configuration array.
+		 */
+		$http_client_config = apply_filters( 'googlesitekit_http_client_config', $http_client_config );
+
 		// In Guzzle 6+, the HTTP client is immutable, so only a new instance can be set.
 		$client->setHttpClient( new Client( $http_client_config ) );
 

includes/Core/Email_Reporting/Initiator_Task.php

@@ -14,6 +14,7 @@
 use DateTimeImmutable;
 use Google\Site_Kit\Core\Util\BC_Functions;
 use Google\Site_Kit\Core\User\Email_Reporting_Settings;
+use Google\Site_Kit\Core\Util\Date;
 
 /**
  * Handles initiator cron callbacks for email reporting.
@@ -61,14 +62,20 @@ public function __construct( Email_Reporting_Scheduler $scheduler, Subscribed_Us
 	 */
 	public function handle_callback_action( $frequency, $scheduled_timestamp = null ) {
 		$timestamp = (int) $scheduled_timestamp;
-
 		if ( $timestamp <= 0 ) {
-			$timestamp = time();
+			$timestamp = Date::now();
 		}
 
 		$this->scheduler->schedule_next_initiator( $frequency, $timestamp );
 
-		$batch_id = wp_generate_uuid4();
+		/**
+		 * Filter the unique ID to use for the current batch of emails.
+		 *
+		 * @since n.e.x.t
+		 *
+		 * @param string $batch_id The batch ID.
+		 */
+		$batch_id = apply_filters( 'googlesitekit_email_reporting_batch_id', wp_generate_uuid4() );
 		$user_ids = $this->subscribed_users_query->for_frequency( $frequency );
 
 		$reference_dates = self::build_reference_dates( $frequency, $timestamp );

includes/Core/Util/Date.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Class Google\Site_Kit\Core\Util\URL
+ * Class Google\Site_Kit\Core\Util\Date
  *
  * @package   Google\Site_Kit\Core\Util
  * @copyright 2023 Google LLC
@@ -19,6 +19,43 @@
  */
 class Date {
 
+	/**
+	 * Gets the reference date.
+	 *
+	 * @since 1.174.0
+	 *
+	 * @return string|null Reference date in 'Y-m-d' format or null.
+	 */
+	public static function reference_date() {
+		/**
+		 * Filter to allow setting a custom reference date for testing purposes.
+		 *
+		 * @since 1.174.0
+		 *
+		 * @return string|null Reference date in 'Y-m-d' format or null.
+		 */
+		return apply_filters( 'googlesitekit_reference_date', null );
+	}
+
+	/**
+	 * Gets the current time.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @return int Current time.
+	 */
+	public static function now() {
+		$reference_date = self::reference_date();
+		if ( $reference_date ) {
+			$time = strtotime( $reference_date );
+			if ( $time ) {
+				return $time;
+			}
+		}
+
+		return time();
+	}
+
 	/**
 	 * Parses a date range string into a start date and an end date.
 	 *