Update validation model with auto-accepted (instead of forcibly sanitized) and statuses for new-accepted/new-rejected

assets/css/amp-validation-error-taxonomy.css

@@ -159,6 +159,27 @@ details[open] .details-attributes__summary::after, details.single-error-detail[o
 	margin-left: 10px;
 }
 
+body.taxonomy-amp_validation_error .wp-list-table .new th,
+body.taxonomy-amp_validation_error .wp-list-table .new td {
+	background-color: #fef7f1;
+}
+
+body.taxonomy-amp_validation_error .wp-list-table .new th.check-column {
+	border-left: 4px solid #d54e21;
+}
+
+body.taxonomy-amp_validation_error .wp-list-table .new th.check-column input {
+	margin-left: 4px;
+}
+
+.row-actions .amp_validation_error_accept > a {
+	color: #006505;
+}
+
+.row-actions .amp_validation_error_reject > a {
+	color: #a00;
+}
+
 .notice.accept-reject-error {
 	display: flex;
 }

assets/css/amp-validation-single-error-url.css

@@ -116,5 +116,5 @@ table.striped > tbody > tr.even {
 }
 
 .wp-list-table th.column-status {
-	width: 15%;
+	width: 20%;
 }

assets/js/amp-block-validation.js

@@ -145,7 +145,7 @@ var ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 		 * @return {void}
 		 */
 		handleValidationErrorsStateChange: function handleValidationErrorsStateChange() {
-			var currentPost, validationErrors, blockValidationErrors, noticeElement, noticeMessage, blockErrorCount, ampValidity, hasActuallyUnacceptedError;
+			var currentPost, validationErrors, blockValidationErrors, noticeElement, noticeMessage, blockErrorCount, ampValidity;
 
 			if ( ! module.isAMPEnabled() ) {
 				if ( ! module.lastStates.noticesAreReset ) {
@@ -161,15 +161,18 @@ var ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 				return;
 			}
 
-			hasActuallyUnacceptedError = false;
 			currentPost = wp.data.select( 'core/editor' ).getCurrentPost();
 			ampValidity = currentPost[ module.data.ampValidityRestField ] || {};
+
+			// Show all validation errors which have not been explicitly acknowledged as accepted.
 			validationErrors = _.map(
 				_.filter( ampValidity.results, function( result ) {
-					if ( result.status !== 1 /* ACCEPTED */ ) {
-						hasActuallyUnacceptedError = true;
-					}
-					return result.term_status !== 1; // ACCEPTED
+					// @todo Show VALIDATION_ERROR_ACK_REJECTED_STATUS differently since moderated?
+					return (
+						0 /* \AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS */ === result.status ||
+						1 /* \AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_ACCEPTED_STATUS */ === result.status ||
+						2 /* \AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_REJECTED_STATUS */ === result.status // eslint-disable-line no-magic-numbers
+					);
 				} ),
 				function( result ) {
 					return result.error;
@@ -192,8 +195,8 @@ var ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 
 			noticeMessage = wp.i18n.sprintf(
 				wp.i18n._n(
-					'There is %s issue from AMP validation.',
-					'There are %s issues from AMP validation.',
+					'There is %s issue from AMP validation which needs review.',
+					'There are %s issues from AMP validation which need review.',
 					validationErrors.length,
 					'amp'
 				),
@@ -239,10 +242,10 @@ var ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 			}
 
 			noticeMessage += ' ';
-			if ( hasActuallyUnacceptedError && ! module.data.isCanonical ) {
-				noticeMessage += wp.i18n.__( 'Non-accepted validation errors prevent AMP from being served, and the user will be redirected to the non-AMP version.', 'amp' );
+			if ( module.data.isCanonical ) {
+				noticeMessage += wp.i18n.__( 'Non-accepted validation errors prevent AMP from being served.', 'amp' );
 			} else {
-				noticeMessage += wp.i18n.__( 'The invalid markup will be automatically sanitized to ensure a valid AMP response is served.', 'amp' );
+				noticeMessage += wp.i18n.__( 'Non-accepted validation errors prevent AMP from being served, and the user will be redirected to the non-AMP version.', 'amp' );
 			}
 
 			noticeElement = wp.element.createElement( 'p', {}, [

assets/js/amp-invalid-url-post-edit-screen.js

@@ -346,7 +346,7 @@ var ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unuse
 		acceptButton.addEventListener( 'click', function() {
 			Array.prototype.forEach.call( document.querySelectorAll( 'select.amp-validation-error-status' ), function( select ) {
 				if ( select.closest( 'tr' ).querySelector( '.check-column input[type=checkbox]' ).checked ) {
-					select.value = 1;
+					select.value = '3';
 					component.updateSelectIcon( select );
 					component.addBeforeUnloadPrompt();
 				}
@@ -357,7 +357,7 @@ var ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unuse
 		rejectButton.addEventListener( 'click', function() {
 			Array.prototype.forEach.call( document.querySelectorAll( 'select.amp-validation-error-status' ), function( select ) {
 				if ( select.closest( 'tr' ).querySelector( '.check-column input[type=checkbox]' ).checked ) {
-					select.value = 2; // @todo Update to 3 when merging with <https://github.com/Automattic/amp-wp/pull/1429>.
+					select.value = '2';
 					component.updateSelectIcon( select );
 					component.addBeforeUnloadPrompt();
 				}

assets/src/amp-validation-error-detail-toggle.js

@@ -64,7 +64,26 @@ function addToggleListener() {
 	} );
 }
 
+/**
+ * Adds classes to the rows for the amp_validation_error term list table.
+ *
+ * This is needed because \WP_Terms_List_Table::single_row() does not allow for additional
+ * attributes to be added to the <tr> element.
+ */
+function addTermListTableRowClasses() {
+	const rows = [ ...document.querySelectorAll( '#the-list > tr' ) ];
+	rows.forEach( ( row ) => {
+		const statusText = row.querySelector( '.column-status > .status-text' );
+		if ( statusText ) {
+			row.classList.toggle( 'new', statusText.classList.contains( 'new' ) );
+			row.classList.toggle( 'accepted', statusText.classList.contains( 'accepted' ) );
+			row.classList.toggle( 'rejected', statusText.classList.contains( 'rejected' ) );
+		}
+	} );
+}
+
 domReady( () => {
 	addToggleButtons();
 	addToggleListener();
+	addTermListTableRowClasses();
 } );

includes/class-amp-cli.php

@@ -263,6 +263,69 @@ public function validate_site( $args, $assoc_args ) {
 		WP_CLI::line( sprintf( __( 'For more details, please see: %s', 'amp' ), $url_more_details ) );
 	}
 
+	/**
+	 * Reset all validation data on a site.
+	 *
+	 * This deletes all amp_invalid_url posts and all amp_validation_error terms.
+	 *
+	 * ## OPTIONS
+	 *
+	 * [--yes]
+	 * : Proceed to empty the site validation data without a confirmation prompt.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp amp reset-site-validation --yes
+	 *
+	 * @subcommand reset-site-validation
+	 * @param array $args       Positional args. Unused.
+	 * @param array $assoc_args Associative args.
+	 * @throws Exception If an error happens.
+	 */
+	public function reset_site_validation( $args, $assoc_args ) {
+		unset( $args );
+		global $wpdb;
+		WP_CLI::confirm( 'Are you sure you want to empty all amp_invalid_url posts and amp_validation_error taxonomy terms?', $assoc_args );
+
+		// Delete all posts.
+		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = %s", AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG ) );
+		$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s", AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG );
+		$posts = new WP_CLI\Iterators\Query( $query, 10000 );
+
+		$progress = WP_CLI\Utils\make_progress_bar(
+			/* translators: %d is the number of posts */
+			sprintf( __( 'Deleting %d amp_invalid_url posts...', 'amp' ), $count ),
+			$count
+		);
+		while ( $posts->valid() ) {
+			$post_id = $posts->current()->ID;
+			$posts->next();
+			wp_delete_post( $post_id, true );
+			$progress->tick();
+		}
+		$progress->finish();
+
+		// Delete all terms. Note that many terms should get deleted when their post counts go to zero above.
+		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( * ) FROM $wpdb->term_taxonomy WHERE taxonomy = %s", AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG ) );
+		$query = $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = %s", AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG );
+		$terms = new WP_CLI\Iterators\Query( $query, 10000 );
+
+		$progress = WP_CLI\Utils\make_progress_bar(
+			/* translators: %d is the number of terms */
+			sprintf( __( 'Deleting %d amp_taxonomy_error terms...', 'amp' ), $count ),
+			$count
+		);
+		while ( $terms->valid() ) {
+			$term_id = $terms->current()->term_id;
+			$terms->next();
+			wp_delete_term( $term_id, AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG );
+			$progress->tick();
+		}
+		$progress->finish();
+
+		WP_CLI::success( 'All AMP validation data has been removed.' );
+	}
+
 	/**
 	 * Gets the total number of URLs to validate.
 	 *
@@ -586,7 +649,7 @@ public static function validate_and_store_url( $url, $type ) {
 			$validation_errors,
 			function( $error ) {
 				$validation_status = AMP_Validation_Error_Taxonomy::get_validation_error_sanitization( $error );
-				return AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACCEPTED_STATUS !== $validation_status['term_status'];
+				return AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_ACCEPTED_STATUS !== $validation_status['term_status'];
 			}
 		) );
 

includes/class-amp-theme-support.php

@@ -1697,11 +1697,15 @@ public static function prepare_response( $response, $args = array() ) {
 
 		self::ensure_required_markup( $dom, array_keys( $amp_scripts ) );
 
-		if ( ! AMP_Validation_Manager::should_validate_response() && $blocking_error_count > 0 && ! self::is_customize_preview_iframe() ) {
-
-			// Note the canonical check will not currently ever be met because dirty AMP is not yet supported; all validation errors will forcibly be sanitized.
+		if ( $blocking_error_count > 0 && ! AMP_Validation_Manager::should_validate_response() ) {
+			/*
+			 * In native AMP, strip html@amp attribute to prevent GSC from complaining about a validation error
+			 * already surfaced inside of WordPress. This is intended to not serve dirty AMP, but rather a
+			 * non-AMP document (intentionally not valid AMP) that contains the AMP runtime and AMP components.
+			 */
 			if ( amp_is_canonical() ) {
 				$dom->documentElement->removeAttribute( 'amp' );
+				$dom->documentElement->removeAttribute( '⚡️' );
 
 				/*
 				 * Make sure that document.write() is disabled to prevent dynamically-added content (such as added
@@ -1712,7 +1716,7 @@ public static function prepare_response( $response, $args = array() ) {
 					$script->appendChild( $dom->createTextNode( 'document.addEventListener( "DOMContentLoaded", function() { document.write = function( text ) { throw new Error( "[AMP-WP] Prevented document.write() call with: "  + text ); }; } );' ) );
 					$head->appendChild( $script );
 				}
-			} else {
+			} elseif ( ! self::is_customize_preview_iframe() ) {
 				$response = esc_html__( 'Redirecting to non-AMP version.', 'amp' );
 
 				if ( $cache_response ) {

includes/options/class-amp-options-manager.php

@@ -23,15 +23,15 @@ class AMP_Options_Manager {
 	 * @var array
 	 */
 	protected static $defaults = array(
-		'theme_support'           => 'disabled',
-		'supported_post_types'    => array( 'post' ),
-		'analytics'               => array(),
-		'force_sanitization'      => true,
-		'accept_tree_shaking'     => true,
-		'disable_admin_bar'       => false,
-		'all_templates_supported' => true,
-		'supported_templates'     => array( 'is_singular' ),
-		'enable_response_caching' => true,
+		'theme_support'            => 'disabled',
+		'supported_post_types'     => array( 'post' ),
+		'analytics'                => array(),
+		'auto_accept_sanitization' => true,
+		'accept_tree_shaking'      => true,
+		'disable_admin_bar'        => false,
+		'all_templates_supported'  => true,
+		'supported_templates'      => array( 'is_singular' ),
+		'enable_response_caching'  => true,
 	);
 
 	/**
@@ -126,9 +126,9 @@ public static function validate_options( $new_options ) {
 			$options['theme_support'] = $new_options['theme_support'];
 		}
 
-		$options['force_sanitization']  = ! empty( $new_options['force_sanitization'] );
-		$options['accept_tree_shaking'] = ! empty( $new_options['accept_tree_shaking'] );
-		$options['disable_admin_bar']   = ! empty( $new_options['disable_admin_bar'] );
+		$options['auto_accept_sanitization'] = ! empty( $new_options['auto_accept_sanitization'] );
+		$options['accept_tree_shaking']      = ! empty( $new_options['accept_tree_shaking'] );
+		$options['disable_admin_bar']        = ! empty( $new_options['disable_admin_bar'] );
 
 		// Validate post type support.
 		$options['supported_post_types'] = array();

includes/options/class-amp-options-menu.php

@@ -257,20 +257,37 @@ public function render_validation_handling() {
 				<div class="notice notice-info notice-alt inline">
 					<p><?php esc_html_e( 'Your install is configured via a theme or plugin to automatically sanitize any AMP validation error that is encountered.', 'amp' ); ?></p>
 				</div>
-				<input type="hidden" name="<?php echo esc_attr( AMP_Options_Manager::OPTION_NAME . '[force_sanitization]' ); ?>" value="<?php echo AMP_Options_Manager::get_option( 'force_sanitization' ) ? 'on' : ''; ?>">
+				<input type="hidden" name="<?php echo esc_attr( AMP_Options_Manager::OPTION_NAME . '[auto_accept_sanitization]' ); ?>" value="<?php echo AMP_Options_Manager::get_option( 'auto_accept_sanitization' ) ? 'on' : ''; ?>">
 			<?php else : ?>
-				<div class="amp-force-sanitize-canonical notice notice-info notice-alt inline">
-					<p><?php esc_html_e( 'All validation errors are forcibly accepted when in native mode.', 'amp' ); ?></p>
+				<div class="amp-auto-accept-sanitize-canonical notice notice-info notice-alt inline">
+					<p><?php esc_html_e( 'All new validation errors are automatically accepted when in native mode.', 'amp' ); ?></p>
 				</div>
-				<div class="amp-force-sanitize">
+				<div class="amp-auto-accept-sanitize">
 					<p>
-						<label for="force_sanitization">
-							<input id="force_sanitization" type="checkbox" name="<?php echo esc_attr( AMP_Options_Manager::OPTION_NAME . '[force_sanitization]' ); ?>" <?php checked( AMP_Options_Manager::get_option( 'force_sanitization' ) ); ?>>
-							<?php esc_html_e( 'Automatically accept sanitization for any AMP validation error that is encountered.', 'amp' ); ?>
+						<label for="auto_accept_sanitization">
+							<input id="auto_accept_sanitization" type="checkbox" name="<?php echo esc_attr( AMP_Options_Manager::OPTION_NAME . '[auto_accept_sanitization]' ); ?>" <?php checked( AMP_Options_Manager::get_option( 'auto_accept_sanitization' ) ); ?>>
+							<?php esc_html_e( 'Automatically accept sanitization for any newly encountered AMP validation errors.', 'amp' ); ?>
 						</label>
 					</p>
 					<p class="description">
 						<?php esc_html_e( 'This will ensure your responses are always valid AMP but some important content may get stripped out (e.g. scripts).', 'amp' ); ?>
+						<?php
+						echo wp_kses_post(
+							sprintf(
+								/* translators: %s is URL to validation errors screen */
+								__( 'Existing validation errors which you have already rejected will not be modified (you may want to consider <a href="%s">bulk-accepting them</a>).', 'amp' ),
+								esc_url(
+									add_query_arg(
+										array(
+											'taxonomy'  => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
+											'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+										),
+										admin_url( 'edit-tags.php' )
+									)
+								)
+							)
+						)
+						?>
 					</p>
 				</div>
 			<?php endif; ?>
@@ -302,20 +319,20 @@ public function render_validation_handling() {
 				};
 
 				var updateTreeShakingHiddenClass = function() {
-					var checkbox = $( '#force_sanitization' );
+					var checkbox = $( '#auto_accept_sanitization' );
 					$( '.amp-tree-shaking' ).toggleClass( 'hidden', checkbox.prop( 'checked' ) && 'native' !== getThemeSupportMode() );
 				};
 
 				var updateHiddenClasses = function() {
 					var themeSupportMode = getThemeSupportMode();
-					$( '.amp-force-sanitize' ).toggleClass( 'hidden', 'native' === themeSupportMode );
+					$( '.amp-auto-accept-sanitize' ).toggleClass( 'hidden', 'native' === themeSupportMode );
 					$( '.amp-validation-field' ).toggleClass( 'hidden', 'disabled' === themeSupportMode );
-					$( '.amp-force-sanitize-canonical' ).toggleClass( 'hidden', 'native' !== themeSupportMode );
+					$( '.amp-auto-accept-sanitize-canonical' ).toggleClass( 'hidden', 'native' !== themeSupportMode );
 					updateTreeShakingHiddenClass();
 				};
 
 				$( 'input[type=radio][name="amp-options[theme_support]"]' ).change( updateHiddenClasses );
-				$( '#force_sanitization' ).change( updateTreeShakingHiddenClass );
+				$( '#auto_accept_sanitization' ).change( updateTreeShakingHiddenClass );
 
 				updateHiddenClasses();
 			})( jQuery );