fix: possible race condition while loading topic data

virtualidentityag · Apr 22, 2024 · e689b86 · e689b86
1 parent cc49e9b
commit e689b86
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/extensions/components/registration/Registration.tsx b/src/extensions/components/registration/Registration.tsx
@@ -79,7 +79,8 @@ export const Registration = () => {
 		disabledNextButton,
 		updateRegistrationData,
 		registrationData,
-		availableSteps
+		availableSteps,
+		loading
 	} = useContext(RegistrationContext);
 	const { consultant: preselectedConsultant } = useContext(UrlParamsContext);
 	const { tenant } = useContext(TenantContext);
@@ -235,6 +236,8 @@ export const Registration = () => {
 		[availableSteps, path, topicSlug]
 	);
 
+	if (loading) return null;
+
 	return (
 		<>
 			<StageLayout

diff --git a/src/globalState/provider/RegistrationProvider.tsx b/src/globalState/provider/RegistrationProvider.tsx
@@ -57,6 +57,7 @@ interface RegistrationContextInterface {
 	hasConsultantError?: boolean;
 	hasAgencyError?: boolean;
 	hasTopicError?: boolean;
+	loading?: boolean;
 }
 
 export const registrationSessionStorageKey = 'registrationData';
@@ -74,6 +75,7 @@ export function RegistrationProvider({ children }: PropsWithChildren<{}>) {
 
 	const { url } = useRouteMatch();
 
+	const [loading, setLoading] = useState<boolean>(true);
 	const [disabledNextButton, setDisabledNextButton] = useState<boolean>(true);
 	const [hasTopicError, setHasTopicError] = useState<boolean>(false);
 	const [hasAgencyError, setHasAgencyError] = useState<boolean>(false);
@@ -144,6 +146,7 @@ export function RegistrationProvider({ children }: PropsWithChildren<{}>) {
 		(async () => {
 			const registrationData =
 				getSessionStorageData() as RegistrationData;
+
 			if (registrationData.mainTopicId) {
 				registrationData.mainTopic = await apiGetTopicById(
 					registrationData.mainTopicId
@@ -161,6 +164,7 @@ export function RegistrationProvider({ children }: PropsWithChildren<{}>) {
 				);
 			}
 			setRegistrationData(registrationData);
+			setLoading(false);
 		})();
 	}, []);
 
@@ -237,7 +241,8 @@ export function RegistrationProvider({ children }: PropsWithChildren<{}>) {
 			availableSteps,
 			hasConsultantError,
 			hasAgencyError,
-			hasTopicError
+			hasTopicError,
+			loading
 		}),
 		[
 			availableSteps,
@@ -246,7 +251,8 @@ export function RegistrationProvider({ children }: PropsWithChildren<{}>) {
 			hasConsultantError,
 			hasTopicError,
 			registrationData,
-			updateRegistrationData
+			updateRegistrationData,
+			loading
 		]
 	);