Merge branch 'develop' into enhancement/12874-km-setup-screen-inline-error.

Author: hussain-t

assets/js/components/GoogleChart/constants.ts

@@ -0,0 +1,17 @@
+/**
+ * Site Kit by Google, Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const CHART_VERSION = '49';

assets/js/components/GoogleChart/index.js

@@ -52,6 +52,7 @@ import GatheringDataNotice, {
 import { useSelect, useDispatch } from 'googlesitekit-data';
 import GoogleChartErrorHandler from '@/js/components/GoogleChartErrorHandler';
 import DateMarker from './DateMarker';
+import { CHART_VERSION } from './constants';
 import { CORE_UI } from '@/js/googlesitekit/datastore/ui/constants';
 import useViewContext from '@/js/hooks/useViewContext';
 import { isSiteKitScreen } from '@/js/util/is-site-kit-screen';
@@ -402,7 +403,7 @@ export default function GoogleChart( props ) {
 					chartEvents={ combinedChartEvents }
 					chartLanguage={ getLocale() }
 					chartType={ chartType }
-					chartVersion="49"
+					chartVersion={ CHART_VERSION }
 					data={ filteredData }
 					loader={ loader }
 					height={ height }

assets/js/components/pdf-export/PDFExportOrchestrator.test.tsx

@@ -1,5 +1,5 @@
 /**
- * PDFExportOrchestrator tests.
+ * PDFExportOrchestrator component tests.
  *
  * Site Kit by Google, Copyright 2026 Google LLC
  *
@@ -26,6 +26,7 @@ import { pdf } from '@react-pdf/renderer';
  */
 import { VIEW_CONTEXT_MAIN_DASHBOARD } from '@/js/googlesitekit/constants';
 import { CORE_PDF } from '@/js/googlesitekit/datastore/pdf/constants';
+import { CORE_SITE } from '@/js/googlesitekit/datastore/site/constants';
 import { CORE_USER } from '@/js/googlesitekit/datastore/user/constants';
 import { CORE_WIDGETS } from '@/js/googlesitekit/widgets/datastore/constants';
 import { CONTEXT_MAIN_DASHBOARD_TRAFFIC } from '@/js/googlesitekit/widgets/default-contexts';
@@ -39,6 +40,13 @@ import {
 import { registerPDFFonts } from './pdf-fonts-react';
 import PDFExportOrchestrator from './PDFExportOrchestrator';
 
+// `@react-pdf/renderer` is auto-mocked via `__mocks__/@react-pdf/renderer.js`,
+// which exports `pdf` as a `jest.fn()` returning a stub `toBlob()`. That lets
+// the orchestrator's BUILDING stage resolve instantly so we can capture the
+// element handed to `pdf()`, all without loading fontkit (which needs Node APIs
+// JSDOM lacks). The mock also renders the report primitives as host elements,
+// so `DashboardReport`/`PDFFooter` import cleanly.
+
 // Stub the download trigger so the anchor click does not attempt a JSDOM
 // navigation; the filename helper stays real.
 jest.mock( './pdf-utils', () => ( {
@@ -55,14 +63,18 @@ function NullComponent() {
 }
 
 describe( 'PDFExportOrchestrator', () => {
+	const ADMIN_URL = 'http://example.com/wp-admin/';
 	let registry: ReturnType< typeof createTestRegistry >;
 	const OriginalAbortController = global.AbortController;
 	const originalCreateObjectURL = global.URL.createObjectURL;
 	const originalRevokeObjectURL = global.URL.revokeObjectURL;
 
 	beforeEach( () => {
 		registry = createTestRegistry();
-		provideSiteInfo( registry, { siteName: 'Example Site' } );
+		provideSiteInfo( registry, {
+			adminURL: ADMIN_URL,
+			siteName: 'Example Site',
+		} );
 		provideUserInfo( registry );
 		registry.dispatch( CORE_USER ).setReferenceDate( '2021-01-10' );
 		registry.dispatch( CORE_USER ).setDateRange( 'last-28-days' );
@@ -113,6 +125,31 @@ describe( 'PDFExportOrchestrator', () => {
 		} );
 	}
 
+	/**
+	 * Renders the orchestrator and resolves with the React element passed to
+	 * the mocked `pdf()` once the BUILDING stage runs.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @return The captured `DashboardReport` element.
+	 */
+	async function renderAndCaptureReport() {
+		const getData: jest.Mock = jest.fn( () =>
+			Promise.resolve( { data: { totalUsers: 100 } } )
+		);
+		registerPDFWidget( 'trafficArea', 'trafficWidget', getData );
+		registry.dispatch( CORE_PDF ).setSelection( {
+			contextSlugs: [ CONTEXT_MAIN_DASHBOARD_TRAFFIC ],
+			widgetSlugs: [],
+		} );
+
+		renderOrchestrator();
+
+		await waitFor( () => expect( pdf ).toHaveBeenCalled() );
+
+		return ( pdf as jest.Mock ).mock.calls[ 0 ][ 0 ];
+	}
+
 	// The orchestrator creates its own `AbortController` on mount and keeps it
 	// private. To read that controller's signal in a test, replace the global
 	// constructor with a subclass that records each new instance. The records
@@ -134,7 +171,35 @@ describe( 'PDFExportOrchestrator', () => {
 		return controllers;
 	}
 
-	it( 'loads the selected widget data with PDF-adjusted dates and builds the PDF', async () => {
+	it( 'should pass the resolved dashboard, help center, and privacy policy URLs to DashboardReport', async () => {
+		const reportElement = await renderAndCaptureReport();
+
+		expect( reportElement.props.dashboardURL ).toBe(
+			registry.select( CORE_SITE ).getGoLinkURL( 'dashboard' )
+		);
+		expect( reportElement.props.helpCenterURL ).toBe(
+			'https://sitekit.withgoogle.com/support/?doc=get-support'
+		);
+		expect( reportElement.props.privacyPolicyURL ).toBe(
+			'https://policies.google.com/privacy'
+		);
+	} );
+
+	it( 'should build each URL via getGoLinkURL with the expected handler key', async () => {
+		const reportElement = await renderAndCaptureReport();
+
+		expect( reportElement.props.dashboardURL ).toBe(
+			`${ ADMIN_URL }index.php?action=googlesitekit_go&to=dashboard`
+		);
+		expect( reportElement.props.helpCenterURL ).toBe(
+			'https://sitekit.withgoogle.com/support/?doc=get-support'
+		);
+		expect( reportElement.props.privacyPolicyURL ).toBe(
+			'https://policies.google.com/privacy'
+		);
+	} );
+
+	it( 'should load the selected widget data with PDF-adjusted dates and build the PDF', async () => {
 		const getData: jest.Mock = jest.fn( () =>
 			Promise.resolve( { data: { totalUsers: 100 } } )
 		);
@@ -161,7 +226,7 @@ describe( 'PDFExportOrchestrator', () => {
 		expect( pdf ).toHaveBeenCalledTimes( 1 );
 	} );
 
-	it( 'transitions to error and does not build a PDF when the only widget fails', async () => {
+	it( 'should transition to error and not build a PDF when the only widget fails', async () => {
 		const getData = jest.fn( () =>
 			Promise.reject( new Error( 'report failed' ) )
 		);
@@ -180,7 +245,7 @@ describe( 'PDFExportOrchestrator', () => {
 		expect( pdf ).not.toHaveBeenCalled();
 	} );
 
-	it( 'isolates a failing widget when another widget succeeds', async () => {
+	it( 'should isolate a failing widget when another widget succeeds', async () => {
 		const failing = jest.fn( () =>
 			Promise.reject( new Error( 'report failed' ) )
 		);
@@ -205,7 +270,7 @@ describe( 'PDFExportOrchestrator', () => {
 		expect( pdf ).toHaveBeenCalledTimes( 1 );
 	} );
 
-	it( 'passes the email reporting golink URL to the report document', async () => {
+	it( 'should pass the email reporting golink URL to the report document', async () => {
 		const getData: jest.Mock = jest.fn( () =>
 			Promise.resolve( { data: { totalUsers: 100 } } )
 		);
@@ -227,7 +292,7 @@ describe( 'PDFExportOrchestrator', () => {
 		);
 	} );
 
-	it( 'registers the PDF fonts before rendering the document', async () => {
+	it( 'should register the PDF fonts before rendering the document', async () => {
 		const getData: jest.Mock = jest.fn( () =>
 			Promise.resolve( { data: { totalUsers: 100 } } )
 		);
@@ -249,7 +314,7 @@ describe( 'PDFExportOrchestrator', () => {
 		).toBeLessThan( ( pdf as jest.Mock ).mock.invocationCallOrder[ 0 ] );
 	} );
 
-	it( 'transitions to error and does not build a PDF when font registration fails', async () => {
+	it( 'should transition to error and not build a PDF when font registration fails', async () => {
 		jest.mocked( registerPDFFonts ).mockImplementationOnce( () => {
 			throw new Error( 'font registration failed' );
 		} );

assets/js/components/pdf-export/PDFExportOrchestrator.tsx

@@ -205,8 +205,8 @@ const PDFExportOrchestrator: FC< PDFExportOrchestratorProps > = ( {
 		( select: Select ) => select( CORE_USER ).getDateRange(),
 		[]
 	);
-	const userName = useSelect(
-		( select: Select ) => select( CORE_USER ).getName(),
+	const dashboardURL = useSelect(
+		( select: Select ) => select( CORE_SITE ).getGoLinkURL( 'dashboard' ),
 		[]
 	);
 	// A golink with this key opens the Site Kit dashboard with the email
@@ -453,10 +453,6 @@ const PDFExportOrchestrator: FC< PDFExportOrchestratorProps > = ( {
 						} ),
 					} )
 				);
-
-				// Footer timestamp uses the real generation time, not the dashboard date range.
-				// eslint-disable-next-line sitekit/no-direct-date
-				const generatedAt = new Date().toLocaleString();
 				const filename = getPDFFilename(
 					referenceName,
 					typeof dateRange === 'string' ? dateRange : undefined
@@ -470,10 +466,9 @@ const PDFExportOrchestrator: FC< PDFExportOrchestratorProps > = ( {
 								? dateRange
 								: undefined
 						}
-						userName={
-							typeof userName === 'string' ? userName : undefined
-						}
-						generatedAt={ generatedAt }
+						dashboardURL={ dashboardURL || '' }
+						helpCenterURL="https://sitekit.withgoogle.com/support/?doc=get-support"
+						privacyPolicyURL="https://policies.google.com/privacy"
 						areas={ areas }
 						emailReportingSetupURL={ emailReportingSetupURL }
 					/>

assets/js/components/pdf-export/ensure-google-charts-loaded.test.ts

@@ -0,0 +1,123 @@
+/**
+ * Site Kit by Google, Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Internal dependencies
+ */
+import { CHART_VERSION } from '@/js/components/GoogleChart/constants';
+
+const LOADER_SELECTOR =
+	'script[src="https://www.gstatic.com/charts/loader.js"]';
+
+type EnsureGoogleChartsLoaded =
+	typeof import('./ensure-google-charts-loaded').default;
+
+function setGoogle( value: unknown ) {
+	( global as unknown as { google?: unknown } ).google = value;
+}
+
+function getLoaderScript(): Element | null {
+	return global.document.head.querySelector( LOADER_SELECTOR );
+}
+
+describe( 'ensureGoogleChartsLoaded', () => {
+	let ensureGoogleChartsLoaded: EnsureGoogleChartsLoaded;
+
+	beforeEach( async () => {
+		// The loader memoises an in-flight promise at module scope, so reset the
+		// module registry between tests to start from a clean cache each time.
+		jest.resetModules();
+		ensureGoogleChartsLoaded = (
+			await import( './ensure-google-charts-loaded' )
+		 ).default;
+		setGoogle( undefined );
+	} );
+
+	afterEach( () => {
+		getLoaderScript()?.remove();
+		setGoogle( undefined );
+	} );
+
+	it( 'should resolve immediately when Google Charts is already available', async () => {
+		setGoogle( { visualization: { DataTable: function DataTable() {} } } );
+
+		await expect( ensureGoogleChartsLoaded() ).resolves.toBeUndefined();
+
+		expect( getLoaderScript() ).toBeNull();
+	} );
+
+	it( 'should inject the loader script and load the corechart package when not present', async () => {
+		const load = jest.fn( () => Promise.resolve() );
+
+		const promise = ensureGoogleChartsLoaded();
+
+		const script = getLoaderScript();
+		expect( script ).not.toBeNull();
+
+		// Simulate the CDN loader becoming available, then fire the load event.
+		setGoogle( { charts: { load } } );
+		script?.dispatchEvent( new Event( 'load' ) );
+
+		await expect( promise ).resolves.toBeUndefined();
+		expect( load ).toHaveBeenCalledWith( CHART_VERSION, {
+			packages: [ 'corechart' ],
+		} );
+	} );
+
+	it( 'should reuse a single in-flight promise across repeat calls', async () => {
+		const load = jest.fn( () => Promise.resolve() );
+
+		const first = ensureGoogleChartsLoaded();
+		const second = ensureGoogleChartsLoaded();
+
+		// Same promise reference and only one script injected.
+		expect( first ).toBe( second );
+		expect(
+			global.document.head.querySelectorAll( LOADER_SELECTOR )
+		).toHaveLength( 1 );
+
+		setGoogle( { charts: { load } } );
+		getLoaderScript()?.dispatchEvent( new Event( 'load' ) );
+
+		await Promise.all( [ first, second ] );
+		expect( load ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	it( 'should reject when the loader script fails to load', async () => {
+		const promise = ensureGoogleChartsLoaded();
+
+		const script = getLoaderScript();
+		expect( script ).not.toBeNull();
+
+		script?.dispatchEvent( new Event( 'error' ) );
+
+		await expect( promise ).rejects.toThrow(
+			/failed to load the Google Charts loader script/i
+		);
+	} );
+
+	it( 'should throw when an incompatible Google Charts version is already present', async () => {
+		// `google.charts` exists but `load` is not a function — another plugin's
+		// incompatible build.
+		setGoogle( { charts: {} } );
+
+		await expect( ensureGoogleChartsLoaded() ).rejects.toThrow(
+			/google\.charts\.load/i
+		);
+
+		expect( getLoaderScript() ).toBeNull();
+	} );
+} );