fix: 🐛 reg. overlay after button click overlapped by stage

CaritasDeutschland · Oct 16, 2020 · 8ce418b · 8ce418b
1 parent 2081d2e
commit 8ce418b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/src/components/overlay/ts/Overlay.tsx b/src/components/overlay/ts/Overlay.tsx
@@ -54,10 +54,12 @@ export class Overlay extends React.Component<{
 	};
 
 	handleButtonClick(buttonFunction: string) {
+		const overlay = document.getElementById('overlay');
 		this.props.handleOverlay(buttonFunction);
 		if (
 			buttonFunction === OVERLAY_FUNCTIONS.CLOSE ||
-			buttonFunction === OVERLAY_FUNCTIONS.REDIRECT
+			(buttonFunction === OVERLAY_FUNCTIONS.REDIRECT &&
+				!overlay.classList.contains('overlay--keepBlur'))
 		) {
 			this.removeOverlayClasses();
 		}

diff --git a/src/components/registration/ts/Registration.tsx b/src/components/registration/ts/Registration.tsx
@@ -39,7 +39,6 @@ import {
 	AGENCY_FALLBACK_LINK,
 	getConsultingTypeFromRegistration,
 	isKreuzbundRegistration,
-	isOffenderRegistration,
 	isRehabilitationRegistration,
 	isU25Registration
 } from '../../../resources/ts/helpers/resorts';

diff --git a/src/pages/registration.html b/src/pages/registration.html
@@ -100,6 +100,6 @@
 			class="app"
 		></main>
 
-		<div id="overlay"></div>
+		<div id="overlay" class="overlay--keepBlur"></div>
 	</body>
 </html>
diff --git a/src/resources/ts/config.ts b/src/resources/ts/config.ts
@@ -55,8 +55,6 @@ export const config = {
 		sessionAssign: tld + '/service/users/sessions',
 		passwordReset: tld + '/service/users/password/change',
 		getMonitoring: tld + '/service/users/sessions',
-		registrationOffenderRedirect:
-			'/registration.straffaelligkeit.html?aid=',
 		registrationRehabilitationRedirect:
 			'/registration.kinder-reha.html?aid=',
 		registrationKreuzbundRedirect:

diff --git a/src/resources/ts/helpers/resorts.ts b/src/resources/ts/helpers/resorts.ts
@@ -9,8 +9,6 @@ export const getConsultingTypeFromRegistration = () => {
 
 export const isU25Registration = () =>
 	getConsultingTypeFromRegistration() === 1;
-export const isOffenderRegistration = () =>
-	getConsultingTypeFromRegistration() === 11;
 export const isRehabilitationRegistration = () =>
 	getConsultingTypeFromRegistration() === 13;
 export const isKreuzbundRegistration = () =>
@@ -81,7 +79,6 @@ export const POSTCODE_FALLBACK_LINK = {
 };
 
 export const AGENCY_FALLBACK_LINK = {
-	11: config.endpoints.registrationOffenderRedirect,
 	13: config.endpoints.registrationRehabilitationRedirect,
 	15: config.endpoints.registrationKreuzbundRedirect
 };