Merge branch 'Onlineberatung:develop' into develop

virtualidentityag · Jan 28, 2024 · 6e05dde · 6e05dde
2 parents eafc842 + 96a53e1
commit 6e05dde
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 2 deletions.
diff --git a/.env.sample b/.env.sample
@@ -23,6 +23,10 @@ CSRF_WHITELIST_HEADER_FOR_LOCAL_DEVELOPMENT=X-WHITELIST-HEADER
 # Disable 2FA
 REACT_APP_DISABLE_2FA_DUTY=0
 
+### Registration
+# Enable fallback loader for direct link registration where slug could not be matched (0/1)
+FRONTEND_REGISTRATION_DIRECTLINK_FALLBACKLOADER_ENABLED=
+
 ### Weblate
 # Weblate host
 FRONTEND_WEBLATE_HOST=

diff --git a/proxy/config.js b/proxy/config.js
@@ -12,5 +12,16 @@ module.exports = {
 			disabled: process.env.FRONTEND_TRANSLATION_CACHE_DISABLED || true,
 			time: process.env.FRONTEND_TRANSLATION_CACHE_TIME || 30
 		}
+	},
+	registration: {
+		directlink: {
+			fallbackLoader: {
+				enabled: !!parseInt(
+					process.env
+						.FRONTEND_REGISTRATION_DIRECTLINK_FALLBACKLOADER_ENABLED ||
+						'1'
+				)
+			}
+		}
 	}
 };
diff --git a/src/components/sessionHeader/GroupChatHeader/index.tsx b/src/components/sessionHeader/GroupChatHeader/index.tsx
@@ -165,7 +165,7 @@ export const GroupChatHeader = ({
 					)}
 				</div>
 
-				{!isActive && isConsultant && (
+				{(!isActive || isJoinGroupChatView) && isConsultant && (
 					<Link
 						to={groupChatInfoLink}
 						className="sessionMenu__item--desktop sessionMenu__button"
@@ -178,6 +178,7 @@ export const GroupChatHeader = ({
 				)}
 
 				{isActive &&
+					!isJoinGroupChatView &&
 					isConsultant &&
 					releaseToggles.featureVideoGroupChatsEnabled && (
 						<div

diff --git a/src/globalState/interfaces/AppConfig/AppConfigInterface.ts b/src/globalState/interfaces/AppConfig/AppConfigInterface.ts
@@ -30,6 +30,13 @@ export interface AppConfigInterface extends AppSettingsInterface {
 		};
 	};
 	groupChat?: GroupChatConfig;
+	registration?: {
+		directlink?: {
+			fallbackLoader?: {
+				enabled?: boolean;
+			};
+		};
+	};
 }
 
 interface ReleaseToggles {

diff --git a/src/utils/useUrlParamsLoader.tsx b/src/utils/useUrlParamsLoader.tsx
@@ -87,6 +87,32 @@ export default function useUrlParamsLoader() {
 							)
 						) {
 							consultingType = null;
+
+							// Fallback logic for special client because slug is not unique. So try reversed logicc
+							if (
+								settings?.registration?.directlink
+									?.fallbackLoader?.enabled &&
+								consultingTypeSlug
+							) {
+								const loadConsultingType = async (id) => {
+									const ct = await apiGetConsultingType({
+										consultingTypeId: id
+									});
+									return ct.slug === consultingTypeSlug
+										? ct
+										: null;
+								};
+
+								for (const {
+									consultingType: ctId
+								} of consultant.agencies) {
+									const res = await loadConsultingType(ctId);
+									if (res) {
+										consultingType = res;
+										break;
+									}
+								}
+							}
 						}
 					}
 				}
@@ -131,7 +157,8 @@ export default function useUrlParamsLoader() {
 		consultantId,
 		topicIdOrName,
 		settings.multitenancyWithSingleDomainEnabled,
-		settings.urls.toRegistration
+		settings.urls.toRegistration,
+		settings?.registration?.directlink?.fallbackLoader?.enabled
 	]);
 
 	useEffect(() => {