Removed building step

src/OnboardingSPA/chapters/sitegen.js

@@ -6,7 +6,6 @@ import { stepSiteGenSiteDetails } from '../steps/SiteGen/SiteDetails/step';
 import { stepSiteGenSiteLogo } from '../steps/SiteGen/SiteLogo/step';
 import { stepSiteGenSocialMedia } from '../steps/SiteGen/SocialMedia/step';
 import { stepSiteGenExperience } from '../steps/SiteGen/Experience/step';
-import { stepSiteGenBuilding } from '../steps/SiteGen/Building/step';
 import { stepSiteGenPreview } from '../steps/SiteGen/Preview/step';
 import { stepSiteGenEditor } from '../steps/SiteGen/Editor/step';
 
@@ -16,7 +15,6 @@ const steps = [
 	stepSiteGenSocialMedia,
 	stepSiteGenSiteLogo,
 	stepSiteGenExperience,
-	stepSiteGenBuilding,
 	stepSiteGenPreview,
 	stepSiteGenEditor,
 ];

src/OnboardingSPA/components/Loaders/SiteGenLoader/index.js

@@ -33,9 +33,10 @@ const SiteGenLoader = ( { autoNavigate = false } ) => {
 	}, [] );
 
 	useEffect( () => {
+		/* Divided the totalCount by 2 to complete the progress bar in the experience step */
 		const percentageValue =
 			( currentData?.sitegen?.siteGenMetaStatus?.currentStatus /
-				currentData?.sitegen?.siteGenMetaStatus?.totalCount ) *
+				( currentData?.sitegen?.siteGenMetaStatus?.totalCount / 2 ) ) *
 			100;
 		setPercentage( percentageValue );
 	}, [ currentData?.sitegen?.siteGenMetaStatus?.currentStatus ] );

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

@@ -119,12 +119,7 @@ const SiteGen = () => {
 
 	async function generateSiteGenData() {
 		// Start the API Requests when the loader is shown.
-		if (
-			! (
-				location.pathname.includes( 'experience' ) ||
-				location.pathname.includes( 'building' )
-			)
-		) {
+		if ( ! location.pathname.includes( 'experience' ) ) {
 			return;
 		}
 		let identifiers = await getSiteGenIdentifiers();
@@ -134,9 +129,6 @@ const SiteGen = () => {
 		if ( location.pathname.includes( 'experience' ) ) {
 			identifiers = identifiers.slice( 0, midIndex );
 			currentData.sitegen.siteGenMetaStatus.currentStatus = 0;
-		} else if ( location.pathname.includes( 'building' ) ) {
-			identifiers = identifiers.slice( midIndex );
-			currentData.sitegen.siteGenMetaStatus.currentStatus = midIndex;
 		}
 		setCurrentOnboardingData( currentData );
 		const siteInfo = {
@@ -181,7 +173,10 @@ const SiteGen = () => {
 	}, [ location.pathname ] );
 
 	useEffect( () => {
-		if ( prevSiteGenErrorStatus.current === true && siteGenErrorStatus === false ) {
+		if (
+			prevSiteGenErrorStatus.current === true &&
+			siteGenErrorStatus === false
+		) {
 			generateSiteGenData();
 			syncStoreToDB();
 		}

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

@@ -6,12 +6,17 @@ import { cloneDeep, isEmpty } from 'lodash';
 
 import CommonLayout from '../../../components/Layouts/Common';
 import { store as nfdOnboardingStore } from '../../../store';
-import { HEADER_SITEGEN } from '../../../../constants';
+import { HEADER_SITEGEN, MAX_RETRIES_SITE_GEN } from '../../../../constants';
 import { SiteGenPreviewSelectableCard } from '../../../components/LivePreview';
 import getContents from './contents';
 import HeartAnimation from './heartAnimation';
 import RegeneratingSiteCard from './regeneratingCard';
-import { getHomepages, regenerateHomepage } from '../../../utils/api/siteGen';
+import {
+	getHomepages,
+	regenerateHomepage,
+	generateSiteGenMeta,
+	getSiteGenIdentifiers,
+} from '../../../utils/api/siteGen';
 import { getGlobalStyles } from '../../../utils/api/themes';
 import SitegenAiStateHandler from '../../../components/StateHandlers/SitegenAi';
 
@@ -20,7 +25,9 @@ const SiteGenPreview = () => {
 	const [ homepages, setHomepages ] = useState( false );
 	const [ isRegenerating, setIsRegenerating ] = useState( false );
 	const [ isPreviewLoading, setIsPreviewLoading ] = useState( false );
+	const [ isMetaApiSuccess, setIsMetaApiSuccess ] = useState( false );
 	const [ globalStyles, setGlobalStyles ] = useState( false );
+	const [ failedApi, setFailedApi ] = useState( [] );
 
 	const prevSiteGenErrorStatus = useRef();
 
@@ -56,17 +63,107 @@ const SiteGenPreview = () => {
 		updateInitialize( true );
 	}, [ currentData ] );
 
+	useEffect( () => {
+		generateSiteGenData();
+	}, [] );
+
+	useEffect( () => {
+		if ( isMetaApiSuccess ) {
+			loadHomepages();
+			loadGlobalStyles();
+		}
+	}, [ isMetaApiSuccess ] );
+
 	useEffect( () => {
 		if (
 			prevSiteGenErrorStatus.current === true &&
 			siteGenErrorStatus === false
 		) {
-			loadHomepages();
-			loadGlobalStyles();
+			if ( ! isMetaApiSuccess ) {
+				generateSiteGenData();
+			} else {
+				loadHomepages();
+				loadGlobalStyles();
+			}
 		}
 		prevSiteGenErrorStatus.current = siteGenErrorStatus;
 	}, [ siteGenErrorStatus ] );
 
+	async function performSiteGenMetaGeneration(
+		siteInfo,
+		identifier,
+		skipCache,
+		retryCount = 1
+	) {
+		try {
+			const data = await generateSiteGenMeta(
+				siteInfo,
+				identifier,
+				skipCache
+			);
+			if ( data.body !== null ) {
+				currentData.sitegen.siteGenMetaStatus.currentStatus += 1;
+				if (
+					currentData.sitegen.siteGenMetaStatus.currentStatus ===
+					currentData.sitegen.siteGenMetaStatus.totalCount
+				) {
+					currentData.sitegen.skipCache = false;
+					setIsMetaApiSuccess( true );
+				}
+				setCurrentOnboardingData( currentData );
+			}
+		} catch ( err ) {
+			if ( retryCount < MAX_RETRIES_SITE_GEN ) {
+				performSiteGenMetaGeneration(
+					siteInfo,
+					identifier,
+					skipCache,
+					retryCount + 1
+				);
+			} else {
+				setFailedApi( ( prevState ) => {
+					if ( ! prevState.includes( identifier ) ) {
+						return [ ...prevState, identifier ];
+					}
+					return prevState;
+				} );
+				currentData.sitegen.siteGenErrorStatus = true;
+				updateSiteGenErrorStatus( true );
+				setIsPreviewLoading( false );
+			}
+		}
+	}
+
+	async function generateSiteGenData() {
+		setIsPreviewLoading( true );
+		// Start the API Requests when the loader is shown.
+
+		let identifiers;
+		if ( Array.isArray( failedApi ) && failedApi.length > 0 ) {
+			identifiers = failedApi;
+			setFailedApi( [] );
+		} else {
+			identifiers = await getSiteGenIdentifiers();
+			identifiers = identifiers.body;
+
+			const midIndex = Math.floor( identifiers.length / 2 );
+			identifiers = identifiers.slice( midIndex, identifiers.length );
+			currentData.sitegen.siteGenMetaStatus.currentStatus = midIndex;
+		}
+
+		setCurrentOnboardingData( currentData );
+		const siteInfo = {
+			site_description: currentData.sitegen?.siteDetails?.prompt,
+		};
+
+		const skipCache = currentData.sitegen?.skipCache;
+
+		// Iterate over Identifiers and fire Requests!
+		identifiers.forEach( ( identifier ) => {
+			performSiteGenMetaGeneration( siteInfo, identifier, skipCache );
+		} );
+	}
+
 	const loadHomepages = async () => {
 		setIsPreviewLoading( true );
 		if ( ! isEmpty( currentData.sitegen.homepages.data ) ) {
@@ -104,11 +201,6 @@ const SiteGenPreview = () => {
 		setGlobalStyles( globalStylesResponse.body );
 	};
 
-	useEffect( () => {
-		loadHomepages();
-		loadGlobalStyles();
-	}, [] );
-
 	const handlePreview = ( slug ) => {
 		if ( ! ( slug in homepages ) ) {
 			return false;

src/OnboardingSPA/styles/app.scss

@@ -86,7 +86,6 @@
 @import "../steps/SiteGen/SiteLogo/stylesheet";
 @import "../steps/SiteGen/SocialMedia/stylesheet";
 @import "../steps/SiteGen/Welcome/stylesheet";
-@import "../steps/SiteGen/Building/stylesheet";
 @import "../steps/SiteGen/Editor/stylesheet";
 @import "../steps/SiteGen/Editor/Header/stylesheet";