@@ -8,17 +8,10 @@ import {
8
8
FederatedComponentProps ,
9
9
SolutionUI ,
10
10
} from '@scality/module-federation' ;
11
- import React , {
12
- useEffect ,
13
- useLayoutEffect ,
14
- useMemo ,
15
- useTransition ,
16
- useRef ,
17
- useState ,
18
- } from 'react' ;
11
+ import React , { useEffect , useMemo } from 'react' ;
19
12
import { ErrorBoundary } from 'react-error-boundary' ;
20
13
import { QueryClient } from 'react-query' ;
21
- import { BrowserRouter , Route , Routes , useLocation } from 'react-router' ;
14
+ import { BrowserRouter , Route , Routes } from 'react-router' ;
22
15
23
16
import { loadShare } from '@module-federation/enhanced/runtime' ;
24
17
import { useQuery } from 'react-query' ;
@@ -242,23 +235,21 @@ function InternalApp() {
242
235
} ) ;
243
236
244
237
return (
245
- < BrowserRouter >
246
- < ShellHistoryProvider >
247
- < FirstTimeLoginProvider >
248
- < NotificationCenterProvider >
249
- { ( status === 'idle' || status === 'loading' ) && (
250
- < Loader size = "massive" centered = { true } aria-label = "loading" />
251
- ) }
252
- { status === 'error' && < ErrorPage500 data-cy = "sc-error-page500" /> }
253
- { status === 'success' && (
254
- < SolutionsNavbar >
255
- < InternalRouter />
256
- </ SolutionsNavbar >
257
- ) }
258
- </ NotificationCenterProvider >
259
- </ FirstTimeLoginProvider >
260
- </ ShellHistoryProvider >
261
- </ BrowserRouter >
238
+ < ShellHistoryProvider >
239
+ < FirstTimeLoginProvider >
240
+ < NotificationCenterProvider >
241
+ { ( status === 'idle' || status === 'loading' ) && (
242
+ < Loader size = "massive" centered = { true } aria-label = "loading" />
243
+ ) }
244
+ { status === 'error' && < ErrorPage500 data-cy = "sc-error-page500" /> }
245
+ { status === 'success' && (
246
+ < SolutionsNavbar >
247
+ < InternalRouter />
248
+ </ SolutionsNavbar >
249
+ ) }
250
+ </ NotificationCenterProvider >
251
+ </ FirstTimeLoginProvider >
252
+ </ ShellHistoryProvider >
262
253
) ;
263
254
}
264
255
@@ -272,7 +263,9 @@ export function WithInitFederationProviders({
272
263
< UIListProvider discoveryURL = { shellConfig . discoveryUrl } >
273
264
< ConfigurationProvider >
274
265
< AuthConfigProvider >
275
- < AuthProvider > { children } </ AuthProvider >
266
+ < BrowserRouter >
267
+ < AuthProvider > { children } </ AuthProvider >
268
+ </ BrowserRouter >
276
269
</ AuthConfigProvider >
277
270
</ ConfigurationProvider >
278
271
</ UIListProvider >
0 commit comments