Changes to ensure refresh doesn't bypass things

newfold-labs · May 17, 2024 · 90c6d40 · 90c6d40
1 parent c945894
commit 90c6d40
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/OnboardingSPA/components/ErrorState/Step/SiteGen/index.js b/src/OnboardingSPA/components/ErrorState/Step/SiteGen/index.js
@@ -27,6 +27,7 @@ import {
 	HEADER_SITEGEN,
 	pluginDashboardPage,
 } from '../../../../../constants';
+import { setFlow } from '../../../../utils/api/flow';
 
 const SiteGenStepErrorState = () => {
 	const navigate = useNavigate();
@@ -105,8 +106,9 @@ const SiteGenStepErrorState = () => {
 		navigate( data.steps[ 1 ].path );
 	};
 
-	const handleRetry = () => {
+	const handleRetry = async () => {
 		updateSiteGenErrorStatus( false );
+		await setFlow( currentData );
 	};
 
 	const handleGoBack = () => {

diff --git a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
@@ -261,6 +261,15 @@ const SiteGen = () => {
 			return;
 		}
 
+		// If retries are exhausted don't make requests
+		if (
+			currentData.sitegen?.siteGenErrorMeta?.retryCount >=
+			currentData.sitegen?.siteGenErrorMeta?.maxRetryCount
+		) {
+			updateSiteGenErrorStatus( true );
+			return;
+		}
+
 		setIsGeneratingSiteMeta( true );
 
 		if ( ! window.nfdOnboarding?.siteGenTimerInterval ) {