Add ampFirst prop to SiteScanContextProvider and set as false on sett…

…ings screen
ampproject · Oct 11, 2021 · 9b3f951 · 9b3f951
1 parent 37c3026
commit 9b3f951
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/assets/src/components/site-scan-context-provider/index.js b/assets/src/components/site-scan-context-provider/index.js
@@ -137,13 +137,15 @@ const initialState = {
  * @param {string}  props.scannableUrlsRestPath       The REST path for interacting with the scannable URL resources.
  * @param {string}  props.validateNonce               The AMP validate nonce.
  * @param {string}  props.validateQueryVar            The AMP validate query variable name.
+ * @param {boolean} props.ampFirst                    Whether scanning should be done with Standard mode being forced.
  */
 export function SiteScanContextProvider( {
 	children,
 	fetchCachedValidationErrors = false,
 	scannableUrlsRestPath,
 	validateNonce,
 	validateQueryVar,
+	ampFirst = false,
 } ) {
 	const { setAsyncError } = useAsyncError();
 	const [ state, dispatch ] = useReducer( siteScanReducer, initialState );
@@ -244,15 +246,18 @@ export function SiteScanContextProvider( {
 
 			try {
 				const { url } = scannableUrls[ currentlyScannedUrlIndex ];
+				const args = {
+					[ validateQueryVar ]: {
+						nonce: validateNonce,
+						omit_stylesheets: true,
+						cache,
+					},
+				};
+				if ( ampFirst ) {
+					args[ 'amp-first' ] = true;
+				}
 				const validationResults = await apiFetch( {
-					url: addQueryArgs( url, {
-						'amp-first': true,
-						[ validateQueryVar ]: {
-							nonce: validateNonce,
-							omit_stylesheets: true,
-							cache,
-						},
-					} ),
+					url: addQueryArgs( url, args ),
 				} );
 
 				if ( true === hasUnmounted.current ) {
@@ -276,7 +281,7 @@ export function SiteScanContextProvider( {
 				setAsyncError( e );
 			}
 		} )();
-	}, [ cache, currentlyScannedUrlIndex, scannableUrls, setAsyncError, status, validateNonce, validateQueryVar ] );
+	}, [ cache, currentlyScannedUrlIndex, scannableUrls, setAsyncError, status, validateNonce, validateQueryVar, ampFirst ] );
 
 	return (
 		<SiteScan.Provider
@@ -305,4 +310,5 @@ SiteScanContextProvider.propTypes = {
 	scannableUrlsRestPath: PropTypes.string,
 	validateNonce: PropTypes.string,
 	validateQueryVar: PropTypes.string,
+	ampFirst: PropTypes.bool,
 };
diff --git a/assets/src/onboarding-wizard/index.js b/assets/src/onboarding-wizard/index.js
@@ -90,6 +90,7 @@ export function Providers( { children } ) {
 												scannableUrlsRestPath={ SCANNABLE_URLS_REST_PATH }
 												validateNonce={ VALIDATE_NONCE }
 												validateQueryVar={ VALIDATE_QUERY_VAR }
+												ampFirst={ true }
 											>
 												{ children }
 											</SiteScanContextProvider>

diff --git a/assets/src/settings-page/index.js b/assets/src/settings-page/index.js
@@ -99,6 +99,7 @@ function Providers( { children } ) {
 											scannableUrlsRestPath={ SCANNABLE_URLS_REST_PATH }
 											validateNonce={ VALIDATE_NONCE }
 											validateQueryVar={ VALIDATE_QUERY_VAR }
+											ampFirst={ false }
 										>
 											{ children }
 										</SiteScanContextProvider>