Handle homepage failure

newfold-labs · Apr 8, 2024 · b66c868 · b66c868
1 parent 0066d44
commit b66c868
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 86 deletions.
diff --git a/src/OnboardingSPA/components/Loaders/SiteGenLoader/index.js b/src/OnboardingSPA/components/Loaders/SiteGenLoader/index.js
@@ -11,13 +11,17 @@ const SiteGenLoader = ( { customNavPercentage, watcher = null } ) => {
 	const [ percentage, setPercentage ] = useState( 0 );
 	const [ status, setStatus ] = useState( content.status[ statusIdx ].title );
 
-	const { currentData, nextStep } = useSelect( ( select ) => {
-		return {
-			currentData:
-				select( nfdOnboardingStore ).getCurrentOnboardingData(),
-			nextStep: select( nfdOnboardingStore ).getNextStep(),
-		};
-	} );
+	const { currentData, nextStep, isGeneratingHomepages } = useSelect(
+		( select ) => {
+			return {
+				currentData:
+					select( nfdOnboardingStore ).getCurrentOnboardingData(),
+				nextStep: select( nfdOnboardingStore ).getNextStep(),
+				isGeneratingHomepages:
+					select( nfdOnboardingStore ).isGeneratingHomepages(),
+			};
+		}
+	);
 
 	useEffect( () => {
 		const statusTimer = setInterval( () => {
@@ -42,15 +46,15 @@ const SiteGenLoader = ( { customNavPercentage, watcher = null } ) => {
 	}, [ currentData?.sitegen?.siteGenMetaStatus?.currentStatus ] );
 
 	useEffect( () => {
-		if ( percentage === customNavPercentage ) {
+		if ( percentage === customNavPercentage && ! isGeneratingHomepages ) {
 			if ( nextStep ) {
 				if ( watcher !== null && watcher === false ) {
 					return;
 				}
 				navigate( nextStep.path );
 			}
 		}
-	}, [ percentage, watcher ] );
+	}, [ percentage, watcher, isGeneratingHomepages ] );
 
 	return (
 		<div className={ 'nfd-sg-loader' }>

diff --git a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
@@ -87,6 +87,7 @@ const SiteGen = () => {
 		setCurrentOnboardingData,
 		updateSiteGenErrorStatus,
 		setActiveChapter,
+		setIsGeneratingHomepages,
 	} = useDispatch( nfdOnboardingStore );
 
 	const { getEditedEntityRecord } = useSelect( ( select ) => {
@@ -219,18 +220,23 @@ const SiteGen = () => {
 		) {
 			// Once all requests are completed use cache to get data
 			currentData.sitegen.skipCache = false;
+			setIsGeneratingSiteMeta( false );
 			// Increase count after site meta calls to ensure systematic call of homepages
-			currentData.sitegen.siteGenMetaStatus.totalCount += 1;
 			// Get the homepages and set that in flow
+			setIsGeneratingHomepages( true );
 			const response = await getHomepages(
 				currentData.sitegen.siteDetails.prompt
 			);
 
-			if ( response.body ) {
-				currentData.sitegen.homepages.data = response.body;
-				currentData.sitegen.siteGenMetaStatus.currentStatus += 1;
-				setIsGeneratingSiteMeta( false );
+			if ( response.error ) {
+				updateSiteGenErrorStatus( true );
+				setIsGeneratingHomepages( false );
+				setCurrentOnboardingData( currentData );
+				return;
 			}
+
+			currentData.sitegen.homepages.data = response.body;
+			setIsGeneratingHomepages( false );
 		}
 		// Sync the current request changed to State
 		setCurrentOnboardingData( currentData );

diff --git a/src/OnboardingSPA/steps/SiteGen/Preview/index.js b/src/OnboardingSPA/steps/SiteGen/Preview/index.js
@@ -75,7 +75,6 @@ const SiteGenPreview = () => {
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
 		updateInitialize( true );
-		setIsHeaderNavigationEnabled( false );
 	}, [] );
 
 	useEffect( () => {
@@ -85,6 +84,7 @@ const SiteGenPreview = () => {
 		) {
 			loadHomepages();
 			loadGlobalStyles();
+			setIsHeaderNavigationEnabled( false );
 		}
 		prevSiteGenErrorStatus.current = siteGenErrorStatus;
 	}, [ siteGenErrorStatus ] );

diff --git a/src/OnboardingSPA/store/actions.js b/src/OnboardingSPA/store/actions.js
@@ -292,24 +292,10 @@ export function resetNavError() {
 	};
 }
 
-export const setHomepagesData = ( homepagesData ) => {
+export const setIsGeneratingHomepages = ( isGeneratingHomepages ) => {
 	return {
-		type: 'SET_HOMEPAGES_DATA',
-		homepagesData,
-	};
-};
-
-export const setActiveHomepage = ( activeHomepage ) => {
-	return {
-		type: 'SET_ACTIVE_HOMEPAGE',
-		activeHomepage,
-	};
-};
-
-export const toggleFavorite = ( slug ) => {
-	return {
-		type: 'TOGGLE_FAVORITE',
-		slug,
+		type: 'SET_IS_GENERATING_HOMEPAGES',
+		isGeneratingHomepages,
 	};
 };
 

diff --git a/src/OnboardingSPA/store/reducer.js b/src/OnboardingSPA/store/reducer.js
@@ -162,6 +162,7 @@ export function drawer(
 
 	return state;
 }
+
 export function data( state = {}, action ) {
 	switch ( action.type ) {
 		case 'SET_CURRENT_DATA':
@@ -178,42 +179,23 @@ export function data( state = {}, action ) {
 					...action.socialData,
 				},
 			};
-		case 'SET_HOMEPAGES_DATA':
-			return {
-				...state,
-				flowData: {
-					...state.flowData,
-					sitegen: {
-						...state.flowData.sitegen,
-						homepages: action.homepagesData,
-					},
-				},
-			};
 
-		case 'SET_ACTIVE_HOMEPAGE':
+		case 'SET_SITEGEN_AI_ERROR_STATUS':
 			return {
 				...state,
 				flowData: {
 					...state.flowData,
 					sitegen: {
 						...state.flowData.sitegen,
-						homepages: {
-							...state.flowData.sitegen.homepages,
-							active: action.activeHomepage,
-						},
+						siteGenErrorStatus: action.siteGenErrorStatus,
 					},
 				},
 			};
-		case 'SET_SITEGEN_AI_ERROR_STATUS':
+
+		case 'SET_IS_GENERATING_HOMEPAGES':
 			return {
 				...state,
-				flowData: {
-					...state.flowData,
-					sitegen: {
-						...state.flowData.sitegen,
-						siteGenErrorStatus: action.siteGenErrorStatus,
-					},
-				},
+				isGeneratingHomepages: action.isGeneratingHomepages,
 			};
 	}
 

diff --git a/src/OnboardingSPA/store/selectors.js b/src/OnboardingSPA/store/selectors.js
@@ -431,36 +431,8 @@ export function getCurrentUserDetails( state ) {
 	return currentUserInfo;
 }
 
-/**
- * Gets homepages
- *
- * @param {*} state
- * @return {Object} homepages
- */
-export const getHomepagesData = ( state ) => {
-	return state.data.flowData.sitegen.homepages;
-};
-
-/**
- * Gets actove homepage
- *
- * @param {*} state
- * @return {Object} active
- */
-
-export const getActiveHomepage = ( state ) => {
-	return state.data.flowData.sitegen.homepages.active;
-};
-
-/**
- * Gets all homepage
- *
- * @param {*} state
- * @return {Object} data
- */
-
-export const getAllHomepages = ( state ) => {
-	return state.data.flowData.sitegen.homepages.data;
+export const isGeneratingHomepages = ( state ) => {
+	return state.data.isGeneratingHomepages;
 };
 
 export function getCustomizeSidebarData( state ) {