update to use the new initialize structure, return false when not a v…

…alid category, move skip check to a better place in code
newfold-labs · May 26, 2023 · d32de03 · d32de03
1 parent 0d9b79c
commit d32de03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/includes/Services/EventService.php b/includes/Services/EventService.php
@@ -75,7 +75,7 @@ public static function validate( $event ) {
 		}
 
 		if ( ! isset( $event['category'] ) || ! self::validate_category( $event['category'] ) ) {
-			$event['category'] = Events::get_category();
+			return false;
 		}
 
 		return $event;

diff --git a/src/OnboardingSPA/components/SkipButton/index.js b/src/OnboardingSPA/components/SkipButton/index.js
@@ -46,10 +46,10 @@ const SkipButton = ( { callback = false } ) => {
 				if ( socialDataResp ) {
 					setOnboardingSocialData( socialDataResp );
 				}
+				await HiiveAnalytics.dispatchEvents();
 			}
 			setFlow( currentData );
 		}
-		await HiiveAnalytics.dispatchEvents();
 		// Redirect to Admin Page for normal customers
 		// and Bluehost Dashboard for ecommerce customers
 		const exitLink = exitToWordpressForEcommerce()

diff --git a/src/onboarding.js b/src/onboarding.js
@@ -11,9 +11,15 @@ import { onboardingRestURL } from './OnboardingSPA/utils/api/common';
 if ( runtimeDataExists ) {
 	domReady( () => {
 		HiiveAnalytics.initialize( {
-			defaultUrl: onboardingRestURL( 'events' ),
-			batchUrl: onboardingRestURL( 'events/batch' ),
-			debounceTime: 3000,
+			urls: {
+				single: onboardingRestURL( 'events' ),
+				batch: onboardingRestURL( 'events/batch' ),
+			},
+			settings: {
+				debounce: {
+					time: 3000,
+				},
+			},
 		} );
 
 		initializeNFDOnboarding(