File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -196,13 +196,11 @@ function GetUser({children}: {children: React.ReactNode}) {
196
196
const { isLoading, error} = authenticationApi . useWhoamiQuery ( { database} ) ;
197
197
const { appTitle} = useAppTitle ( ) ;
198
198
199
+ const errorProps = error ? { ...uiFactory . clusterOrDatabaseAccessError } : undefined ;
200
+
199
201
return (
200
202
< LoaderWrapper loading = { isLoading } size = "l" >
201
- < PageError
202
- error = { error }
203
- { ...uiFactory . clusterOrDatabaseAccessError }
204
- errorPageTitle = { appTitle }
205
- >
203
+ < PageError error = { error } { ...errorProps } errorPageTitle = { appTitle } >
206
204
{ children }
207
205
</ PageError >
208
206
</ LoaderWrapper >
Original file line number Diff line number Diff line change @@ -140,10 +140,13 @@ export function Clusters() {
140
140
141
141
const showBlockingError = isAccessError ( query . error ) ;
142
142
143
+ const errorProps = showBlockingError ? uiFactory . clusterOrDatabaseAccessError : undefined ;
144
+
143
145
return (
144
146
< PageError
145
147
error = { showBlockingError ? query . error : undefined }
146
- { ...uiFactory . clusterOrDatabaseAccessError }
148
+ { ...errorProps }
149
+ errorPageTitle = { uiFactory . clustersPageTitle ?? i18n ( 'page_title' ) }
147
150
>
148
151
< div className = { b ( ) } >
149
152
< Helmet >
Original file line number Diff line number Diff line change @@ -106,6 +106,8 @@ export function Tenant(props: TenantProps) {
106
106
107
107
const showBlockingError = isAccessError ( error ) ;
108
108
109
+ const errorProps = showBlockingError ? uiFactory . clusterOrDatabaseAccessError : undefined ;
110
+
109
111
const onCollapseSummaryHandler = ( ) => {
110
112
dispatchSummaryVisibilityAction ( PaneVisibilityActionTypes . triggerCollapse ) ;
111
113
} ;
@@ -131,10 +133,7 @@ export function Tenant(props: TenantProps) {
131
133
titleTemplate = { `%s — ${ title } — ${ appTitle } ` }
132
134
/>
133
135
< LoaderWrapper loading = { initialLoading } >
134
- < PageError
135
- error = { showBlockingError ? error : undefined }
136
- { ...uiFactory . clusterOrDatabaseAccessError }
137
- >
136
+ < PageError error = { showBlockingError ? error : undefined } { ...errorProps } >
138
137
< TenantContextProvider
139
138
database = { database }
140
139
path = { path }
You can’t perform that action at this time.
0 commit comments