fix: core profiler plugins list race condition

rjchow · rjchow · commit e609b101c48c · 2023-06-15T15:42:26.000+10:00
diff --git a/plugins/woocommerce-admin/client/core-profiler/index.tsx b/plugins/woocommerce-admin/client/core-profiler/index.tsx
@@ -364,6 +364,16 @@ const updateOnboardingProfileOption = (
 	} );
 };
 
+const spawnUpdateOnboardingProfileOption = assign( {
+	spawnUpdateOnboardingProfileOptionRef: (
+		context: CoreProfilerStateMachineContext
+	) =>
+		spawn(
+			() => updateOnboardingProfileOption( context ),
+			'update-onboarding-profile'
+		),
+} );
+
 const updateBusinessLocation = ( countryAndState: string ) => {
 	return dispatch( OPTIONS_STORE_NAME ).updateOptions( {
 		woocommerce_default_country: countryAndState,
@@ -389,7 +399,7 @@ const assignUserProfile = assign( {
 
 const updateBusinessInfo = async (
 	_context: CoreProfilerStateMachineContext,
-	event: BusinessInfoEvent
+	event: AnyEventObject
 ) => {
 	const refreshedOnboardingProfile = ( await resolveSelect(
 		OPTIONS_STORE_NAME
@@ -518,6 +528,7 @@ const coreProfilerMachineActions = {
 	handleOnboardingProfileOption,
 	assignOnboardingProfile,
 	persistBusinessInfo,
+	spawnUpdateOnboardingProfileOption,
 	redirectToWooHome,
 };
 
@@ -530,6 +541,7 @@ const coreProfilerMachineServices = {
 	getOnboardingProfileOption,
 	getPlugins,
 	browserPopstateHandler,
+	updateBusinessInfo,
 };
 export const coreProfilerStateMachineDefinition = createMachine( {
 	id: 'coreProfiler',
@@ -772,16 +784,9 @@ export const coreProfilerStateMachineDefinition = createMachine( {
 					] ),
 				},
 				postUserProfile: {
-					invoke: {
-						src: ( context ) => {
-							return updateOnboardingProfileOption( context );
-						},
-						onDone: {
-							target: '#businessInfo',
-						},
-						onError: {
-							target: '#businessInfo',
-						},
+					entry: [ 'spawnUpdateOnboardingProfileOption' ],
+					always: {
+						target: '#businessInfo',
 					},
 				},
 			},
@@ -938,11 +943,19 @@ export const coreProfilerStateMachineDefinition = createMachine( {
 					],
 					on: {
 						BUSINESS_INFO_COMPLETED: {
+							target: 'postBusinessInfo',
+							actions: [ 'recordTracksBusinessInfoCompleted' ],
+						},
+					},
+				},
+				postBusinessInfo: {
+					invoke: {
+						src: 'updateBusinessInfo',
+						onDone: {
+							target: '#plugins',
+						},
+						onError: {
 							target: '#plugins',
-							actions: [
-								'persistBusinessInfo',
-								'recordTracksBusinessInfoCompleted',
-							],
 						},
 					},
 				},
@@ -1337,8 +1350,8 @@ export const CoreProfilerController = ( {
 	);
 
 	const navigationProgress = currentNodeMeta?.progress;
-	const CurrentComponent =
-		currentNodeMeta?.component ?? ( () => <ProfileSpinner /> ); // If no component is defined for the state then its a loading state
+
+	const CurrentComponent = currentNodeMeta?.component;
 
 	const currentNodeCssLabel =
 		state.value instanceof Object
@@ -1364,13 +1377,15 @@ export const CoreProfilerController = ( {
 			<div
 				className={ `woocommerce-profile-wizard__container woocommerce-profile-wizard__step-${ currentNodeCssLabel }` }
 			>
-				{
+				{ CurrentComponent ? (
 					<CurrentComponent
 						navigationProgress={ navigationProgress }
 						sendEvent={ send }
 						context={ state.context }
 					/>
-				}
+				) : (
+					<ProfileSpinner />
+				) }
 			</div>
 		</>
 	);
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/BusinessInfo.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/BusinessInfo.tsx
@@ -91,6 +91,7 @@ export const BusinessInfo = ( {
 		onboardingProfile: {
 			is_store_country_set: isStoreCountrySet,
 			industry: industryFromOnboardingProfile,
+			business_choice: businessChoiceFromOnboardingProfile,
 		},
 	} = context;
 
@@ -152,7 +153,9 @@ export const BusinessInfo = ( {
 	const selectCountryLabel = __( 'Select country/region', 'woocommerce' );
 	const selectIndustryQuestionLabel =
 		selectIndustryMapping[
-			businessChoice || 'im_just_starting_my_business'
+			businessChoice ||
+				businessChoiceFromOnboardingProfile ||
+				'im_just_starting_my_business'
 		];
 
 	const [ dismissedGeolocationNotice, setDismissedGeolocationNotice ] =
diff --git a/plugins/woocommerce/changelog/fix-core-profiler-plugins-race-condition b/plugins/woocommerce/changelog/fix-core-profiler-plugins-race-condition
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Fixed race condition in core profiler's plugin list fetching and also minor spinner fixes
