Refactored names for better understanding

newfold-labs · Aug 23, 2022 · c793c68 · c793c68
1 parent dd63813
commit c793c68
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 21 deletions.
diff --git a/src/OnboardingSPA/components/App/index.js b/src/OnboardingSPA/components/App/index.js
@@ -38,8 +38,8 @@ const App = () => {
 			isDrawerOpen: select(nfdOnboardingStore).isDrawerOpened(),
 			newfoldBrand: select(nfdOnboardingStore).getNewfoldBrand(),
 			onboardingFlow: select(nfdOnboardingStore).getOnboardingFlow(),
-			flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
-			socialData: select(nfdOnboardingStore).getCurrentOnboardingSocialData(),
+			flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
+			socialData: select(nfdOnboardingStore).getOnboardingSocialData(),
 			firstStep: select(nfdOnboardingStore).getFirstStep(),
 		};
 	}, []);

diff --git a/src/OnboardingSPA/components/ExitToWordPress/index.js b/src/OnboardingSPA/components/ExitToWordPress/index.js
@@ -34,7 +34,7 @@ const ExitToWordPress = ({
 	const { flowData } = useSelect(
 		(select) => {
 			return {
-				flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+				flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
 			};
 		},
 		[location.pathname]

diff --git a/src/OnboardingSPA/components/Header/step-navigation.js b/src/OnboardingSPA/components/Header/step-navigation.js
@@ -102,7 +102,7 @@ const StepNavigation = () => {
 			return {
 				nextStep: select(nfdOnboardingStore).getNextStep(),
 				previousStep: select(nfdOnboardingStore).getPreviousStep(),
-				flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+				flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
 			};
 		},
 		[location.pathname]

diff --git a/src/OnboardingSPA/components/SkipButton/index.js b/src/OnboardingSPA/components/SkipButton/index.js
@@ -22,7 +22,7 @@ const SkipButton = () => {
             return {
                 previousStep: select(nfdOnboardingStore).getPreviousStep(),
                 nextStep: select(nfdOnboardingStore).getNextStep(),
-                flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+                flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
             };
         },
         []

diff --git a/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js b/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js
@@ -37,8 +37,8 @@ const BasicInfoForm = () => {
 
     const { flowData, socialData } = useSelect((select) => {
         return {
-            flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
-            socialData: select(nfdOnboardingStore).getCurrentOnboardingSocialData()
+            flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
+            socialData: select(nfdOnboardingStore).getOnboardingSocialData()
         };
     }, []);
 

diff --git a/src/OnboardingSPA/pages/Steps/BasicInfo/index.js b/src/OnboardingSPA/pages/Steps/BasicInfo/index.js
@@ -17,7 +17,7 @@ const StepBasicInfo = () => {
 		(select) => {
 			return {
 				currentStep: select(nfdOnboardingStore).getCurrentStep(),
-				flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+				flowData: select(nfdOnboardingStore).getOnboardingFlowData()
 			};
 		},
 		[]

diff --git a/src/OnboardingSPA/pages/Steps/DesignThemes/index.js b/src/OnboardingSPA/pages/Steps/DesignThemes/index.js
@@ -11,7 +11,7 @@ const StepDesignThemes = () => {
 
 	const { flowData } = useSelect((select) => {
 		return {
-			flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+			flowData: select(nfdOnboardingStore).getOnboardingFlowData()
 		};
 	}, []);
 

diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js
@@ -37,7 +37,7 @@ const StepAddress = () => {
 	const navigate = useNavigate();
 
 	let flowData = useSelect((select) =>
-		select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+		select(nfdOnboardingStore).getOnboardingFlowData()
 	);
 
 	const settings = useWPSettings();

diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js
@@ -24,7 +24,7 @@ const StepProducts = () => {
 	} = useDispatch(nfdOnboardingStore);
 
 	let flowData = useSelect((select) =>
-		select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+		select(nfdOnboardingStore).getOnboardingFlowData()
 	);
 	let productInfo = flowData.storeDetails.productInfo;
 	useEffect(() => {

diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js
@@ -31,7 +31,7 @@ const StepTax = () => {
 	const navigate = useNavigate();
 
 	let flowData = useSelect((select) =>
-		select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+		select(nfdOnboardingStore).getOnboardingFlowData()
 	);
 
 	useEffect(() => {

diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js
@@ -26,7 +26,7 @@ const GetStartedExperience = () => {
 	const { enqueueRequest, flushQueue, setCurrentOnboardingFlowData } = useDispatch( nfdOnboardingStore );
 	const { flowData, currentStep } = useSelect( ( select ) => {
 		return {
-			flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+			flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
 			currentStep: select(nfdOnboardingStore).getCurrentStep(),
 		};
 	}, [] );

diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/index.js
@@ -23,7 +23,7 @@ const StepPrimarySetup = () => {
 		(select) => {
 			return {
 				currentStep: select(nfdOnboardingStore).getCurrentStep(),
-				flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+				flowData: select(nfdOnboardingStore).getOnboardingFlowData()
 			};
 		},
 		[]

diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js
@@ -26,7 +26,7 @@ const StepPrimarySetup = () => {
 	const { currentStep, flowData } = useSelect((select) => {
 		return {
 			currentStep: select(nfdOnboardingStore).getCurrentStep(),
-			flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData()
+			flowData: select(nfdOnboardingStore).getOnboardingFlowData()
 		};
 	}, []);
 

diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/index.js
@@ -26,7 +26,7 @@ const StepWelcome = () => {
 		(select) => {
 			return {
 				currentStep: select(nfdOnboardingStore).getCurrentStep(),
-				flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+				flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
 				brandName: select(nfdOnboardingStore).getNewfoldBrandName(),
 			};
 		},

diff --git a/src/OnboardingSPA/pages/Steps/TopPriority/index.js b/src/OnboardingSPA/pages/Steps/TopPriority/index.js
@@ -55,7 +55,7 @@ const StepTopPriority = ( props ) => {
 	const { currentStep, flowData } = useSelect( ( select ) => {
 		return {
 			currentStep: select(nfdOnboardingStore).getCurrentStep(),
-			flowData: select(nfdOnboardingStore).getCurrentOnboardingFlowData(),
+			flowData: select(nfdOnboardingStore).getOnboardingFlowData(),
 		};
 	}, [] );
 

diff --git a/src/OnboardingSPA/store/selectors.js b/src/OnboardingSPA/store/selectors.js
@@ -63,14 +63,24 @@ export function getHireExpertsUrl( state ) {
 	return hireExpertsUrl;
 }
 
+/**
+ * Gets the current complete Onboarding Data
+ *
+ * @param {*} state
+ * @return string
+ */
+export function getOnboardingData(state) {
+	return state?.data;
+}
+
 /**
  * Gets the current Onboarding Flow Data
  *
  * @param {*} state
  * @return string
  */
-export function getCurrentOnboardingFlowData( state ) {
-	return state.data.flowData;
+export function getOnboardingFlowData( state ) {
+	return state?.data?.flowData;
 }
 
 /**
@@ -79,8 +89,8 @@ export function getCurrentOnboardingFlowData( state ) {
  * @param {*} state
  * @return string
  */
-export function getCurrentOnboardingSocialData(state) {
-	return state.data.socialData;
+export function getOnboardingSocialData(state) {
+	return state?.data?.socialData;
 }