-
-
-
-
-
-
-
-
- Open Dashboard
-
-
-
-
-
-
- Switch Tenant
-
-
-
-
+ {selectedTenant ? (
+ <>
+
+
+
+
+
+
+
+
+ Open Dashboard
+
+
+
+ {onSwitchTenant &&
+
+
+ Switch Tenant
+
+
+ }
+
+
+ ) : (
+ <>
+
+
+ No tenant available
+
+
+
+
+
+ You need a tenant to access the dashboard.
+
+
+
+
+
+ Create a tenant in the dashboard
+
+
+
+
+
+ )}
{user && (
{
- selectedTenant: TenantData;
+ selectedTenant?: TenantData | null;
tenants: TenantData[];
onBack?: React.MouseEventHandler;
onSelectTenant?: (tenant: TenantData) => void;
@@ -112,7 +112,9 @@ function TenantMenuContent({
name={tenant.name}
flag={tenant.flag}
locality={tenant.locality}
- isSelected={tenant.name === selectedTenant.name}
+ isSelected={
+ selectedTenant ? tenant.name === selectedTenant.name : false
+ }
loginUrl={tenant.loginUrl}
/>
diff --git a/ui/src/lib/one-trust.ts b/ui/src/lib/one-trust.ts
index 95c9759fd..0853a6d78 100644
--- a/ui/src/lib/one-trust.ts
+++ b/ui/src/lib/one-trust.ts
@@ -30,7 +30,6 @@ export function initOneTrust(): void {
window.OptanonWrapper = () => {
if (window.OnetrustActiveGroups) {
const consents = window.OnetrustActiveGroups.split(',').filter((c) => c);
- console.log('consents from OnetrustActiveGroups:', consents);
// load allowed scripts based on consents
loadAllowedScripts(new Set(consents.map((group) => `C000${group}`)));
}
@@ -49,8 +48,6 @@ export function initOneTrust(): void {
return;
}
- console.log('Preloading scripts based on existing consents:', consentsMap);
-
loadAllowedScripts(consentsMap);
}
@@ -60,7 +57,6 @@ function parseConsentCookie() {
// If no OptanonConsent cookie is found, we cannot preload analytics
// once the user gives consent, the OneTrust callback will handle loading
if (!optanonConsent) {
- console.log('No OptanonConsent cookie found on preload');
return null;
}
@@ -71,7 +67,6 @@ function parseConsentCookie() {
.find((s) => s.includes('groups='));
if (!groups) {
- console.log('No consent groups found in OptanonConsent cookie on preload');
return null;
}
@@ -107,23 +102,14 @@ function loadAllowedScripts(consents: Set
) {
const consentsRequired = s.className
.replace('consent-required:', '')
.split('-');
- const hasConsented = consentsRequired.every((cr) => consents.has(cr));
-
- if (!hasConsented) {
- console.log(
- `Script ${s.id} not loaded, requires consents:`,
- consentsRequired,
- );
- }
- return hasConsented;
+ return consentsRequired.every((cr) => consents.has(cr));
});
// Re-inject scripts now with js type
scriptsWithConsent.forEach((s) => {
s.remove(); // remove the text/plain script tag
s.setAttribute('type', 'text/javascript');
- console.log(`Loading script ${s.id}`);
document.head.appendChild(s); // re-append to head to execute
});
}