diff --git a/src/containers/App/Content.tsx b/src/containers/App/Content.tsx
index 15f6f1fe34..7c4ea4cc36 100644
--- a/src/containers/App/Content.tsx
+++ b/src/containers/App/Content.tsx
@@ -196,13 +196,11 @@ function GetUser({children}: {children: React.ReactNode}) {
const {isLoading, error} = authenticationApi.useWhoamiQuery({database});
const {appTitle} = useAppTitle();
+ const errorProps = error ? {...uiFactory.clusterOrDatabaseAccessError} : undefined;
+
return (
-
+
{children}
diff --git a/src/containers/Clusters/Clusters.tsx b/src/containers/Clusters/Clusters.tsx
index 44552628e7..a9d598bf40 100644
--- a/src/containers/Clusters/Clusters.tsx
+++ b/src/containers/Clusters/Clusters.tsx
@@ -140,10 +140,13 @@ export function Clusters() {
const showBlockingError = isAccessError(query.error);
+ const errorProps = showBlockingError ? uiFactory.clusterOrDatabaseAccessError : undefined;
+
return (
diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
index 83afe7f437..67383785d4 100644
--- a/src/containers/Tenant/Tenant.tsx
+++ b/src/containers/Tenant/Tenant.tsx
@@ -106,6 +106,8 @@ export function Tenant(props: TenantProps) {
const showBlockingError = isAccessError(error);
+ const errorProps = showBlockingError ? uiFactory.clusterOrDatabaseAccessError : undefined;
+
const onCollapseSummaryHandler = () => {
dispatchSummaryVisibilityAction(PaneVisibilityActionTypes.triggerCollapse);
};
@@ -131,10 +133,7 @@ export function Tenant(props: TenantProps) {
titleTemplate={`%s — ${title} — ${appTitle}`}
/>
-
+