Merge pull request #6789 from ampproject/remove/onboarding-technical-brackground

Skip Technical Background step if there is no dependency support

Author: westonruter

assets/src/onboarding-wizard/components/navigation-context-provider.js

@@ -7,6 +7,8 @@ import { createContext, useState, useContext, useMemo } from '@wordpress/element
  * External dependencies
  */
 import PropTypes from 'prop-types';
+import { HAS_DEPENDENCY_SUPPORT } from 'amp-settings'; // From WP inline script.
+
 /**
  * Internal dependencies
  */
@@ -31,17 +33,16 @@ export function NavigationContextProvider( { children, pages } ) {
 
 	const { theme_support: themeSupport } = editedOptions;
 
-	const adaptedPages = useMemo( () => pages.filter( ( page ) => {
-		if ( READER !== themeSupport && 'theme-selection' === page.slug ) {
-			return false;
-		}
+	const adaptedPages = useMemo( () => pages.filter( ( page ) => (
+		// Do not show the Technical Background step is there is no dependency support.
+		! ( 'technical-background' === page.slug && ! HAS_DEPENDENCY_SUPPORT ) &&
 
-		if ( isSkipped && 'site-scan' === page.slug ) {
-			return false;
-		}
+		// If Site Scan should be skipped, do not show the relevant step in the Wizard.
+		! ( 'site-scan' === page.slug && isSkipped ) &&
 
-		return true;
-	} ), [ isSkipped, pages, themeSupport ] );
+		// Theme Selection page should be only accessible for the Reader template mode.
+		! ( 'theme-selection' === page.slug && READER !== themeSupport )
+	) ), [ isSkipped, pages, themeSupport ] );
 
 	const activePageIndex = adaptedPages.findIndex( ( adaptedPage ) => adaptedPage.slug === currentPage.slug );
 

src/Admin/OnboardingWizardSubmenuPage.php

@@ -11,6 +11,7 @@
 use AMP_Options_Manager;
 use AMP_Validated_URL_Post_Type;
 use AMP_Validation_Manager;
+use AmpProject\AmpWP\DependencySupport;
 use AmpProject\AmpWP\DevTools\UserAccess;
 use AmpProject\AmpWP\Infrastructure\Delayed;
 use AmpProject\AmpWP\Infrastructure\Registerable;
@@ -72,19 +73,28 @@ final class OnboardingWizardSubmenuPage implements Delayed, Registerable, Servic
 	 */
 	private $loading_error;
 
+	/**
+	 * DependencySupport instance.
+	 *
+	 * @var DependencySupport
+	 */
+	private $dependency_support;
+
 	/**
 	 * OnboardingWizardSubmenuPage constructor.
 	 *
-	 * @param GoogleFonts   $google_fonts   An instance of the GoogleFonts service.
-	 * @param ReaderThemes  $reader_themes  An instance of the ReaderThemes class.
-	 * @param RESTPreloader $rest_preloader An instance of the RESTPreloader class.
-	 * @param LoadingError  $loading_error  An instance of the LoadingError class.
+	 * @param GoogleFonts       $google_fonts       An instance of the GoogleFonts service.
+	 * @param ReaderThemes      $reader_themes      An instance of the ReaderThemes class.
+	 * @param RESTPreloader     $rest_preloader     An instance of the RESTPreloader class.
+	 * @param LoadingError      $loading_error      An instance of the LoadingError class.
+	 * @param DependencySupport $dependency_support An instance of the DependencySupport class.
 	 */
-	public function __construct( GoogleFonts $google_fonts, ReaderThemes $reader_themes, RESTPreloader $rest_preloader, LoadingError $loading_error ) {
-		$this->google_fonts   = $google_fonts;
-		$this->reader_themes  = $reader_themes;
-		$this->rest_preloader = $rest_preloader;
-		$this->loading_error  = $loading_error;
+	public function __construct( GoogleFonts $google_fonts, ReaderThemes $reader_themes, RESTPreloader $rest_preloader, LoadingError $loading_error, DependencySupport $dependency_support ) {
+		$this->google_fonts       = $google_fonts;
+		$this->reader_themes      = $reader_themes;
+		$this->rest_preloader     = $rest_preloader;
+		$this->loading_error      = $loading_error;
+		$this->dependency_support = $dependency_support;
 	}
 
 	/**
@@ -250,6 +260,7 @@ public function enqueue_assets( $hook_suffix ) {
 				'screenshot'      => $theme->get_screenshot() ?: null,
 				'url'             => $theme->get( 'ThemeURI' ),
 			],
+			'HAS_DEPENDENCY_SUPPORT'             => $this->dependency_support->has_support(),
 			'USING_FALLBACK_READER_THEME'        => $this->reader_themes->using_fallback_theme(),
 			'SCANNABLE_URLS_REST_PATH'           => '/amp/v1/scannable-urls',
 			'SETTINGS_LINK'                      => $amp_settings_link,