Merge pull request #395 from newfold-labs/enhance/sitegen-plugins

SiteGen: Plugin Installation

includes/RestApi/SiteGenController.php

@@ -32,10 +32,10 @@ class SiteGenController {
 	public function register_routes() {
 		\register_rest_route(
 			$this->namespace,
-			$this->rest_base . '/get-identifiers',
+			$this->rest_base . '/identifiers',
 			array(
 				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_valid_identifiers' ),
+				'callback'            => array( $this, 'get_enabled_identifiers' ),
 				'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
 			)
 		);
@@ -78,8 +78,8 @@ public function sitegen_meta_args() {
 	 *
 	 * @return array
 	 */
-	public function get_valid_identifiers() {
-		return array_keys( array_filter( SiteGenService::get_identifiers() ) );
+	public function get_enabled_identifiers() {
+		return array_keys( array_filter( SiteGenService::enabled_identifiers() ) );
 	}
 
 	/**
@@ -90,20 +90,20 @@ public function get_valid_identifiers() {
 	 * @return array|WP_Error
 	 */
 	public function generate_sitegen_meta( \WP_REST_Request $request ) {
+		if ( ! SiteGenService::is_enabled() ) {
+			return new \WP_Error(
+				'nfd_onboarding_error',
+				'SiteGen is Disabled.',
+				array( 'status' => 404 )
+			);
+		}
 
 		$site_info  = $request->get_param( 'site_info' );
 		$identifier = $request->get_param( 'identifier' );
 		$skip_cache = $request->get_param( 'skip_cache' );
 
-		if ( SiteGenService::is_enabled() ) {
-			// TODO Implement the main function and do computations if required.
-			return SiteGenService::instantiate_site_meta( $site_info, $identifier, $skip_cache );
-		}
+		// TODO Implement the main function and do computations if required.
+		return SiteGenService::instantiate_site_meta( $site_info, $identifier, $skip_cache );
 
-		return new \WP_Error(
-			'sitegen-error',
-			'SiteGen is Disabled.',
-			array( 'status' => 404 )
-		);
 	}
 }

includes/Services/PluginService.php

@@ -11,6 +11,8 @@
 use NewfoldLabs\WP\Module\Installer\Tasks\PluginActivationTask;
 use NewfoldLabs\WP\Module\Installer\Tasks\PluginDeactivationTask;
 use NewfoldLabs\WP\Module\Installer\Tasks\PluginInstallTask;
+use NewfoldLabs\WP\Module\Onboarding\Data\Data;
+use NewfoldLabs\WP\Module\Onboarding\Data\Services\SiteGenService;
 use NewfoldLabs\WP\Module\Onboarding\Data\Plugins;
 use NewfoldLabs\WP\Module\Onboarding\Data\SiteFeatures;
 
@@ -25,8 +27,18 @@ class PluginService {
 	 */
 	public static function initialize() {
 
-		// Get the initial list of plugins to be installed based on the plan.
-		$init_plugins = array_merge( Plugins::get_init(), SiteFeatures::get_init() );
+		$init_plugins = array();
+
+		$flow = Data::current_flow();
+		if ( 'sitegen' === $flow && SiteGenService::is_enabled() ) {
+			$init_plugins = SiteGenService::get_plugin_recommendations();
+			if ( is_wp_error( $init_plugins ) ) {
+				return $init_plugins;
+			}
+		} else {
+			// Get the initial list of plugins to be installed based on the plan.
+			$init_plugins = array_merge( Plugins::get_init(), SiteFeatures::get_init() );
+		}
 
 		foreach ( $init_plugins as $init_plugin ) {
 			$init_plugin_type = PluginInstaller::get_plugin_type( $init_plugin['slug'] );
@@ -37,14 +49,14 @@ public static function initialize() {
 					PluginInstallTaskManager::add_to_queue(
 						new PluginInstallTask(
 							$init_plugin['slug'],
-							true,
+							$init_plugin['activate'],
 							$init_plugin['priority']
 						)
 					);
 					continue;
 			}
 
-			if ( PluginInstaller::is_active( $init_plugin_path ) ) {
+			if ( ! $init_plugin['activate'] && PluginInstaller::is_active( $init_plugin_path ) ) {
 				PluginDeactivationTaskManager::add_to_queue(
 					new PluginDeactivationTask(
 						$init_plugin['slug']
@@ -120,24 +132,28 @@ public static function activate_init_plugins() {
 	/**
 	 * Sets up a Transient to activate plugins and filter_active_plugins
 	 *
-	 * @return boolean
+	 * @return void
 	 */
 	public static function configure_activation_transient() {
 		global $pagenow;
 
 		switch ( $pagenow ) {
 			case 'index.php':
-				// If the page is nfd-onboarding
-				if ( isset( $_GET['page'] ) && WP_Admin::$slug === \sanitize_text_field( $_GET['page'] ) ) {
+				// If the page is nfd-onboarding. Ignore lint since WP_Admin::$slug is a static string.
+				// phpcs:ignore
+				if ( isset( $_GET['page'] ) && ( WP_Admin::$slug === \sanitize_text_field( $_GET['page'] ) ) ) {
 					if ( '1' !== get_transient( Options::get_option_name( 'filter_active_plugins' ) ) ) {
 						set_transient( Options::get_option_name( 'filter_active_plugins' ), '1', 20 * MINUTE_IN_SECONDS );
 					}
 				}
 				break;
 			default:
 				if ( '1' === get_transient( Options::get_option_name( 'filter_active_plugins' ) ) ) {
-					delete_transient( Options::get_option_name( 'filter_active_plugins' ) );
-					self::activate_init_plugins();
+					$flow = Data::current_flow();
+					if ( 'sitegen' !== $flow ) {
+						delete_transient( Options::get_option_name( 'filter_active_plugins' ) );
+						self::activate_init_plugins();
+					}
 				}
 				break;
 		}

src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js

@@ -16,6 +16,10 @@ import {
 	getSiteGenIdentifiers,
 } from '../../../utils/api/siteGen';
 import Footer from '../../Footer';
+import { initialize as initializeSettings } from '../../../utils/api/settings';
+import { init as initializePlugins } from '../../../utils/api/plugins';
+import { init as initializeThemes } from '../../../utils/api/themes';
+import { trigger as cronTrigger } from '../../../utils/api/cronTrigger';
 
 // Wrapping the NewfoldInterfaceSkeleton with the HOC to make theme available
 const ThemedNewfoldInterfaceSkeleton = themeToggleHOC(
@@ -36,12 +40,17 @@ const SiteGen = () => {
 	}, [ newfoldBrand ] );
 	const location = useLocation();
 
-	const { currentData } = useSelect( ( select ) => {
-		return {
-			currentData:
-				select( nfdOnboardingStore ).getCurrentOnboardingData(),
-		};
-	} );
+	const { currentData, initialize, pluginInstallHash } = useSelect(
+		( select ) => {
+			return {
+				currentData:
+					select( nfdOnboardingStore ).getCurrentOnboardingData(),
+				initialize: select( nfdOnboardingStore ).getInitialize(),
+				pluginInstallHash:
+					select( nfdOnboardingStore ).getPluginInstallHash(),
+			};
+		}
+	);
 
 	const { setCurrentOnboardingData } = useDispatch( nfdOnboardingStore );
 
@@ -117,12 +126,24 @@ const SiteGen = () => {
 		};
 	};
 
+	useEffect( () => {
+		if ( initialize ) {
+			initializePlugins( pluginInstallHash );
+			setInterval( cronTrigger, 45000 );
+		}
+	}, [ initialize ] );
+
 	useEffect( () => {
 		syncStoreToDB();
 		generateSiteGenData();
 		handlePreviousStepTracking();
 	}, [ location.pathname ] );
 
+	useEffect( () => {
+		initializeThemes();
+		initializeSettings();
+	}, [] );
+
 	return (
 		<ThemeProvider>
 			<ThemedNewfoldInterfaceSkeleton

src/OnboardingSPA/components/StartOptions/index.js

@@ -7,18 +7,24 @@ import { store as nfdOnboardingStore } from '../../store';
 
 const StartOptions = ( { questionnaire, oldFlow, options } ) => {
 	const navigate = useNavigate();
-	const { brandConfig, migrationUrl } = useSelect( ( select ) => {
-		return {
-			brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
-			migrationUrl: select( nfdOnboardingStore ).getMigrationUrl(),
-		};
-	} );
+	const { brandConfig, migrationUrl, currentData } = useSelect(
+		( select ) => {
+			return {
+				brandConfig:
+					select( nfdOnboardingStore ).getNewfoldBrandConfig(),
+				migrationUrl: select( nfdOnboardingStore ).getMigrationUrl(),
+				currentData:
+					select( nfdOnboardingStore ).getCurrentOnboardingData(),
+			};
+		}
+	);
 	const {
 		updateAllSteps,
 		updateTopSteps,
 		updateRoutes,
 		updateDesignRoutes,
 		updateInitialize,
+		setCurrentOnboardingData,
 	} = useDispatch( nfdOnboardingStore );
 
 	const switchFlow = ( newFlow ) => {
@@ -35,8 +41,13 @@ const StartOptions = ( { questionnaire, oldFlow, options } ) => {
 		if ( SITEGEN_FLOW !== currentFlow ) {
 			window.nfdOnboarding.oldFlow = currentFlow;
 		}
+
 		window.nfdOnboarding.currentFlow = newFlow;
-		updateInitialize( true );
+		currentData.activeFlow = newFlow;
+		setCurrentOnboardingData( currentData );
+		if ( SITEGEN_FLOW !== newFlow ) {
+			updateInitialize( true );
+		}
 		navigate( data.steps[ 1 ].path );
 	};
 	const selectFlow = ( flow ) => {

src/OnboardingSPA/steps/SiteGen/Preview/index.js

@@ -32,6 +32,7 @@ const SiteGenPreview = () => {
 		setHeaderActiveView,
 		setDrawerActiveView,
 		setCurrentOnboardingData,
+		updateInitialize,
 	} = useDispatch( nfdOnboardingStore );
 
 	const { currentData, nextStep } = useSelect( ( select ) => {
@@ -77,6 +78,7 @@ const SiteGenPreview = () => {
 		setSidebarActiveView( false );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
+		updateInitialize( true );
 		loadData();
 	}, [] );
 

src/OnboardingSPA/utils/api/siteGen.js

@@ -6,7 +6,7 @@ import { onboardingRestURL } from './common';
 export async function getSiteGenIdentifiers() {
 	return await resolve(
 		apiFetch( {
-			url: onboardingRestURL( 'sitegen/get-identifiers' ),
+			url: onboardingRestURL( 'sitegen/identifiers' ),
 		} ).then()
 	);
 }