release: new version

- New Onboarding experience
- Remove legacy notice for the Neve theme

Author: abaicus

docker-compose.ci.yml

@@ -3,7 +3,7 @@ version: '3.3'
 
 services:
   mysql:
-    image: mysql:5.7
+    image: mariadb:latest
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: wordpress

includes/Admin.php

@@ -72,7 +72,6 @@ public function init() {
 		add_action( 'after_switch_theme', array( $this, 'get_previous_theme' ) );
 		add_filter( 'neve_dashboard_page_data', array( $this, 'localize_sites_library' ) );
 		add_action( 'admin_menu', array( $this, 'register' ) );
-		add_filter( 'submenu_file', array( $this, 'hide_onboarding' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ) );
 		add_filter( 'ti_tpc_editor_data', array( $this, 'add_tpc_editor_data' ), 20 );
 		add_action( 'admin_init', array( $this, 'activation_redirect' ) );
@@ -398,7 +397,15 @@ public function activation_redirect() {
 		}
 
 		delete_option( 'tpc_maybe_run_onboarding' );
-		wp_safe_redirect( admin_url( 'admin.php?page=neve-onboarding' ) );
+		wp_safe_redirect(
+			add_query_arg(
+				array(
+					'page' => 'neve-onboarding',
+					'show' => 'welcome',
+				),
+				admin_url( 'admin.php' )
+			)
+		);
 		exit();
 	}
 
@@ -514,10 +521,6 @@ public function register() {
 		}
 
 		$this->register_starter_sites_page();
-
-		if ( $this->should_load_onboarding() ) {
-			$this->register_onboarding_page();
-		}
 	}
 
 	private function register_starter_sites_page( $in_appearance = false ) {
@@ -528,12 +531,12 @@ private function register_starter_sites_page( $in_appearance = false ) {
 
 		$starter_site_data = array(
 			'page_title' => __( 'Starter Sites', 'templates-patterns-collection' ),
-			'menu_title' => $this->get_prefix_for_menu_item() . __( 'Starter Sites', 'templates-patterns-collection' ),
-			'capability' => 'activate_plugins',
-			'menu_slug'  => $this->page_slug,
+			'menu_title' => $this->get_prefix_for_menu_item() . __( 'Onboarding', 'templates-patterns-collection' ),
+			'capability' => 'install_plugins',
+			'menu_slug'  => 'neve-onboarding',
 			'callback'   => array(
 				$this,
-				'render_starter_sites',
+				'render_onboarding',
 			),
 		);
 
@@ -553,25 +556,6 @@ private function register_starter_sites_page( $in_appearance = false ) {
 		$this->add_theme_page_for_tiob( $starter_site_data, 2 );
 	}
 
-	/**
-	 * Registers the onboarding page. Used for Neve onboarding, but hidden in the admin.
-	 *
-	 * @return void
-	 */
-	private function register_onboarding_page() {
-		$onboarding_data = array(
-			'page_title' => __( 'Onboarding', 'templates-patterns-collection' ),
-			'menu_title' => $this->get_prefix_for_menu_item() . __( 'Onboarding', 'templates-patterns-collection' ),
-			'capability' => 'install_plugins',
-			'menu_slug'  => 'neve-onboarding',
-			'callback'   => array(
-				$this,
-				'render_onboarding',
-			),
-		);
-		$this->add_theme_page_for_tiob( $onboarding_data, 4 );
-	}
-
 	/**
 	 * Legacy template cloud pages.
 	 *
@@ -636,29 +620,13 @@ public function register_legacy_template_cloud_pages() {
 		}
 		$this->register_starter_sites_page();
 
-		if ( $this->should_load_onboarding() ) {
-			$this->register_onboarding_page();
-		}
-
 		if ( $this->is_library_disabled() ) {
 			return false;
 		}
 		$this->add_subpage_for_tiob( $library_data );
 		$this->add_subpage_for_tiob( $settings_data );
 	}
 
-	/**
-	 * Hide the onboarding item from Neve menu.
-	 *
-	 * @param $submenu_file string The submenu file.
-	 *
-	 * @return string
-	 */
-	public function hide_onboarding( $submenu_file ) {
-		remove_submenu_page( 'neve-welcome', 'neve-onboarding' );
-		return $submenu_file;
-	}
-
 	/**
 	 * Map license plan from Neve if available.
 	 *
@@ -672,19 +640,6 @@ private function neve_license_plan() {
 		return $category > -1 && isset( $category_mapping[ $category ] ) ? $category_mapping[ $category ] : -1;
 	}
 
-	/**
-	 * Check if current subscription is agency
-	 * or if we have a valid license for the standalone product.
-	 *
-	 * @return bool
-	 */
-	private function is_agency_plan() {
-		$plan = $this->neve_license_plan();
-		$plan = License::get_license_tier( $plan );
-
-		return $plan === 3;
-	}
-
 	/**
 	 * Render method for the starter sites page.
 	 */
@@ -738,7 +693,7 @@ public function enqueue() {
 			return;
 		}
 
-		if ( $this->should_load_onboarding() && strpos( $screen->id, '_page_neve-onboarding' ) ) {
+		if ( strpos( $screen->id, '_page_neve-onboarding' ) ) {
 
 			wp_enqueue_media();
 
@@ -816,57 +771,57 @@ private function get_localization() {
 		}
 
 		return array(
-			'version'             => TIOB_VERSION,
-			'nonce'               => wp_create_nonce( 'wp_rest' ),
-			'assets'              => TIOB_URL . 'assets/',
-			'upgradeURL'          => $upgrade_url,
-			'upgradeURLTpc'       => $upgrade_url_tpc,
-			'siteUrl'             => trailingslashit( get_site_url() ),
-			'strings'             => array(
+			'version'                       => TIOB_VERSION,
+			'nonce'                         => wp_create_nonce( 'wp_rest' ),
+			'assets'                        => TIOB_URL . 'assets/',
+			'upgradeURL'                    => $upgrade_url,
+			'upgradeURLTpc'                 => $upgrade_url_tpc,
+			'siteUrl'                       => trailingslashit( get_site_url() ),
+			'strings'                       => array(
 				/* translators: %s - Theme name */
 				'starterSitesTabDescription' => __( 'Choose from multiple unique demos, specially designed for you, that can be installed with a single click. You just need to choose your favorite, and we will take care of everything else.', 'templates-patterns-collection' ),
 			),
-			'cleanupAllowed'      => ( ! empty( get_transient( Active_State::STATE_NAME ) ) ) ? 'yes' : 'no',
-			'onboarding'          => array(),
-			'hasFileSystem'       => WP_Filesystem(),
-			'themesURL'           => admin_url( 'themes.php' ),
-			'themeAction'         => $this->get_theme_action(),
-			'brandedTheme'        => $this->get_whitelabel_name(),
-			'hideStarterSites'    => $this->is_starter_sites_disabled(),
-			'hideMyLibrary'       => $this->is_library_disabled(),
-			'fontParings'         => $this->font_pairs_neve,
-			'endpoint'            => ( defined( 'TPC_TEMPLATES_CLOUD_ENDPOINT' ) ) ? TPC_TEMPLATES_CLOUD_ENDPOINT : self::get_templates_cloud_endpoint(),
-			'params'              => array(
+			'cleanupAllowed'                => ( ! empty( get_transient( Active_State::STATE_NAME ) ) ) ? 'yes' : 'no',
+			'onboarding'                    => array(),
+			'hasFileSystem'                 => WP_Filesystem(),
+			'themesURL'                     => admin_url( 'themes.php' ),
+			'themeAction'                   => $this->get_theme_action(),
+			'brandedTheme'                  => $this->get_whitelabel_name(),
+			'hideStarterSites'              => $this->is_starter_sites_disabled(),
+			'hideMyLibrary'                 => $this->is_library_disabled(),
+			'fontParings'                   => $this->font_pairs_neve,
+			'endpoint'                      => ( defined( 'TPC_TEMPLATES_CLOUD_ENDPOINT' ) ) ? TPC_TEMPLATES_CLOUD_ENDPOINT : self::get_templates_cloud_endpoint(),
+			'params'                        => array(
 				'site_url'   => get_site_url(),
 				'license_id' => License::get_license_data()->key,
 			),
-			'upsellNotifications' => $this->get_upsell_notifications(),
-			'isValidLicense'      => $this->has_valid_addons(),
-			'licenseTIOB'         => License::get_license_data(),
-			'emailSubscribe'      => array(
+			'upsellNotifications'           => $this->get_upsell_notifications(),
+			'isValidLicense'                => $this->has_valid_addons(),
+			'licenseTIOB'                   => License::get_license_data(),
+			'emailSubscribe'                => array(
 				'ajaxURL'    => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'nonce'      => wp_create_nonce( 'skip_subscribe_nonce' ),
 				'skipStatus' => $this->get_skip_subscribe_status() ? 'yes' : 'no',
 				'email'      => ( ! empty( $user->user_email ) ) ? $user->user_email : '',
 			),
-			'onboardingDone'      => array(
+			'onboardingDone'                => array(
 				'ajaxURL' => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'nonce'   => wp_create_nonce( 'onboarding_done_nonce' ),
 			),
-			'feedback'            => array(
+			'feedback'                      => array(
 				'count'     => get_option( self::IMPORTED_TEMPLATES_COUNT_OPT, 0 ),
 				'dismissed' => get_option( self::FEEDBACK_DISMISSED_OPT, false ),
 			),
-			'onboardingUpsell'    => array(
+			'onboardingUpsell'              => array(
 				'dashboard'    => tsdk_translate_link( tsdk_utmify( 'https://store.themeisle.com/', 'onboarding_upsell' ), 'query' ),
 				'contact'      => tsdk_translate_link( tsdk_utmify( 'https://themeisle.com/contact/', 'onboarding_upsell' ), 'query' ),
 				'upgrade'      => tsdk_translate_link( tsdk_utmify( 'https://themeisle.com/themes/neve/upgrade/', 'onboarding_upsell' ), 'query' ),
 				'upgradeToast' => tsdk_translate_link( tsdk_utmify( 'https://themeisle.com/themes/neve/upgrade/', 'onboarding_toast' ), 'query' ),
 			),
-			'onboardingAllowed'   => $this->should_load_onboarding(),
-			'onboardingRedirect'  => admin_url( 'admin.php?page=neve-onboarding' ),
-			'tiobSettings'        => admin_url( 'admin.php?page=tiob-plugin#settings' ),
-			'links'               => array(
+			'onboardingAllowed'             => $this->should_load_onboarding(),
+			'onboardingRedirect'            => admin_url( 'admin.php?page=neve-onboarding' ),
+			'tiobSettings'                  => admin_url( 'admin.php?page=tiob-plugin#settings' ),
+			'links'                         => array(
 				array(
 					'label'       => __( 'Support', 'templates-patterns-collection' ),
 					'is_external' => true,
@@ -888,12 +843,15 @@ private function get_localization() {
 					'is_button' => true,
 				),
 			),
-			'isFSETheme'          => self::is_fse_theme(),
-			'newTCNotice'         => array(
+			'isFSETheme'                    => self::is_fse_theme(),
+			'newTCNotice'                   => array(
 				'show'    => get_option( self::TC_NEW_NOTICE_DISMISSED, 'no' ) !== 'yes' && self::has_legacy_template_cloud(),
 				'ajaxURL' => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'nonce'   => wp_create_nonce( 'dismiss_new_tc_notice' ),
 			),
+			'onboardingPluginCompatibility' => array(
+				'hyve-lite' => is_php_version_compatible( '8.1' ),
+			),
 		);
 	}
 
@@ -1183,32 +1141,6 @@ public function localize_sites_library( $array ) {
 
 		$array['onboarding'] = $api;
 
-		// Do not display the notification if starter sites are disabled
-		if ( $this->is_starter_sites_disabled() ) {
-			return $array;
-		}
-
-		// Previously the library was visited check was stored in a transient. To ensure the notification is not displayed anymore once the user has visited the library
-		// the transient was moved to an option and here we check that if the transient is set and we also update the option.
-		$visited_transient = (bool) get_transient( self::VISITED_LIBRARY_OPT );
-		$page_was_visited  = get_option( self::VISITED_LIBRARY_OPT, false );
-		if ( $visited_transient && $page_was_visited === false ) {
-			update_option( self::VISITED_LIBRARY_OPT, 'yes' );
-			$page_was_visited = 'yes';
-		}
-		if ( $this->is_agency_plan() && $page_was_visited !== 'yes' ) {
-
-			$array['notifications']['template-cloud'] = array(
-				'text' => __( 'Great news!  Now you can export your own custom designs to the cloud and then reuse them on other sites.', 'templates-patterns-collection' ),
-				'cta'  => sprintf(
-					// translators: %s: Templates Cloud
-					__( 'Open %s', 'templates-patterns-collection' ),
-					'Templates Cloud'
-				),
-				'url'  => ( $this->neve_theme_has_support( 'theme_dedicated_menu' ) ? 'admin.php' : 'themes.php' ) . '?page=' . $this->page_slug . '&dismiss_notice=yes#library',
-			);
-		}
-
 		return $array;
 	}
 

includes/Importers/Plugin_Importer.php

@@ -54,6 +54,7 @@ class Plugin_Importer {
 		'restrict-content'                 => 'restrictcontent.php',
 		'pods'                             => 'init.php',
 		'wp-full-stripe-free'              => 'wp-full-stripe.php',
+		'wp-cloudflare-page-cache'         => 'wp-cloudflare-super-page-cache.php',
 	);
 
 	public function __construct() {

onboarding/src/Components/CategoryButtons.js

@@ -2,17 +2,33 @@
 import { useSelect, useDispatch } from '@wordpress/data';
 import classnames from 'classnames';
 import { track } from '../utils/rest';
+import { useMemo, useEffect } from '@wordpress/element';
 
 const CategoryButtons = ( { categories, style } ) => {
 	const data = useSelect( ( select ) => ( {
 		category: select( 'ti-onboarding' ).getCurrentCategory(),
 		query: select( 'ti-onboarding' ).getSearchQuery(),
 		trackingId: select( 'ti-onboarding' ).getTrackingId(),
 		step: select( 'ti-onboarding' ).getCurrentStep(),
+		sitesMetadata: select( 'ti-onboarding' ).getSites(),
+		editor: select( 'ti-onboarding' ).getCurrentEditor(),
 	} ) );
 
 	const { setOnboardingStep, setCategory } = useDispatch( 'ti-onboarding' );
 
+	const availableCategories = useMemo(() => {
+		return Object.keys(categories).filter((key) => 
+			// Show "All" and "Free" categories after user selection.
+			data.category || (key !== 'all' && key !== 'free')
+		).filter((key) => {
+			// Hide "Free" is there is not free template available on the selected editor.
+			if ( key !== 'free' ) {
+				return true;
+			}
+			return Object.values(data.sitesMetadata.sites?.[data.editor])?.some( (s) => ! s?.upsell);
+		});
+	}, [categories, data.category, data.sitesMetadata, data.editor]);
+
 	const onClick = ( newCategory ) => {
 		setCategory( newCategory );
 
@@ -36,22 +52,31 @@ const CategoryButtons = ( { categories, style } ) => {
 		}
 	};
 
+	/**
+	 * Default the category to 'all' when the current category is unavailable.
+	 */
+	useEffect(() => {
+		if (data.category && !availableCategories.includes(data.category)) {
+			setCategory('all');
+		}
+	}, [data.category, availableCategories, setCategory]);
+
 	return (
 		<div className="ob-cat-wrap" style={ style }>
-			{ Object.keys( categories ).map( ( key, index ) => {
+			{ availableCategories.map( ( catSlug ) => {
 				const classes = classnames( {
 					cat: true,
-					[ key ]: true,
-					active: key === data.category,
+					[ catSlug ]: true,
+					active: catSlug === data.category,
 				} );
 
 				return (
 					<button
 						className={ classes }
-						key={ index }
-						onClick={ () => onClick( key ) }
+						key={ catSlug }
+						onClick={ () => onClick( catSlug ) }
 					>
-						{ categories[ key ] }
+						{ categories[ catSlug ] }
 					</button>
 				);
 			} ) }