Merge pull request #587 from newfold-labs/fix/old-flow-in-events

Remove `flow` param for Events API requests
newfold-labs · Jun 27, 2024 · 4ec7be5 · 4ec7be5
2 parents c41b076 + bf15e58
commit 4ec7be5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml
@@ -8,6 +8,7 @@ on:
     types: [opened, edited, reopened, ready_for_review]
     paths:
       - '**.php'
+      - '!build/**/*.php'
   workflow_dispatch:
 
 concurrency:

diff --git a/src/OnboardingSPA/utils/api/common.js b/src/OnboardingSPA/utils/api/common.js
@@ -5,10 +5,10 @@ import {
 	migrateRestBase,
 } from '../../../constants';
 
-export const onboardingRestURL = ( api ) => {
+export const onboardingRestURL = ( api, includeFlow = true ) => {
 	return (
 		`${ onboardingRestBase }/${ api }` +
-		( window.nfdOnboarding?.currentFlow
+		( includeFlow && window.nfdOnboarding?.currentFlow
 			? `&flow=${ window.nfdOnboarding.currentFlow }`
 			: '' )
 	);

diff --git a/src/onboarding.js b/src/onboarding.js
@@ -27,8 +27,8 @@ if ( runtimeDataExists ) {
 		HiiveAnalytics.initialize( {
 			namespace: CATEGORY,
 			urls: {
-				single: onboardingRestURL( 'events' ),
-				batch: onboardingRestURL( 'events/batch' ),
+				single: onboardingRestURL( 'events', false ),
+				batch: onboardingRestURL( 'events/batch', false ),
 			},
 			settings: {
 				debounce: {

diff --git a/tests/cypress/integration/wp-module-support/EventsApi.cy.js b/tests/cypress/integration/wp-module-support/EventsApi.cy.js
@@ -1,6 +1,6 @@
 export const APIList = {
-	events_api_general_onb: '/index.php?rest_route=%2Fnewfold-onboarding%2Fv1%2Fevents%2Fbatch&flow=wp-setup&_locale=user',
-	events_api_ecomm: '/index.php?rest_route=%2Fnewfold-onboarding%2Fv1%2Fevents%2Fbatch&flow=ecommerce&_locale=user'
+	events_api_general_onb: '/index.php?rest_route=%2Fnewfold-onboarding%2Fv1%2Fevents%2Fbatch&_locale=user',
+	events_api_ecomm: '/index.php?rest_route=%2Fnewfold-onboarding%2Fv1%2Fevents%2Fbatch&_locale=user'
 };
 
 export const EventsAPI = ( events_name, card_val, api_name ) => {