@@ -35,7 +35,7 @@ import React from "react";
3535import { createRoot } from "react-dom/client" ;
3636import { Helmet } from "react-helmet" ;
3737import { connect , Provider } from "react-redux" ;
38- import { Redirect , Router , Switch } from "react-router-dom" ;
38+ import { Redirect , Route , Router , Switch } from "react-router-dom" ;
3939import type { AppState } from "redux/reducers" ;
4040import { fetchConfigAction } from "redux/reduxActions/configActions" ;
4141import { fetchUserAction } from "redux/reduxActions/userActions" ;
@@ -311,15 +311,10 @@ class AppIndex extends React.Component<AppIndexProps, any> {
311311 component = { LazyPublicAppEditor }
312312 />
313313
314- < SimpleSubscriptionContextProvider >
315- < LazyRoute
316- fallback = "layout"
317- path = { APP_EDITOR_URL }
318- component = { LazyAppEditor }
319- />
320- < LazyRoute
321- fallback = "layout"
322- path = { [
314+ < Route
315+ path = {
316+ [
317+ APP_EDITOR_URL ,
323318 USER_PROFILE_URL ,
324319 NEWS_URL ,
325320 ORG_HOME_URL ,
@@ -335,11 +330,41 @@ class AppIndex extends React.Component<AppIndexProps, any> {
335330 SETTING_URL ,
336331 MARKETPLACE_URL ,
337332 ADMIN_APP_URL
338- ] }
339- // component={ApplicationListPage}
340- component = { LazyApplicationHome }
341- />
342- </ SimpleSubscriptionContextProvider >
333+ ]
334+ }
335+ >
336+ < SimpleSubscriptionContextProvider >
337+ < Switch >
338+ < LazyRoute
339+ fallback = "layout"
340+ path = { APP_EDITOR_URL }
341+ component = { LazyAppEditor }
342+ />
343+ < LazyRoute
344+ fallback = "layout"
345+ path = { [
346+ USER_PROFILE_URL ,
347+ NEWS_URL ,
348+ ORG_HOME_URL ,
349+ ALL_APPLICATIONS_URL ,
350+ DATASOURCE_CREATE_URL ,
351+ DATASOURCE_EDIT_URL ,
352+ DATASOURCE_URL ,
353+ SUPPORT_URL ,
354+ QUERY_LIBRARY_URL ,
355+ FOLDERS_URL ,
356+ FOLDER_URL ,
357+ TRASH_URL ,
358+ SETTING_URL ,
359+ MARKETPLACE_URL ,
360+ ADMIN_APP_URL
361+ ] }
362+ // component={ApplicationListPage}
363+ component = { LazyApplicationHome }
364+ />
365+ </ Switch >
366+ </ SimpleSubscriptionContextProvider >
367+ </ Route >
343368 < LazyRoute exact path = { ADMIN_AUTH_URL } component = { LazyUserAuthComp } />
344369 < LazyRoute path = { USER_AUTH_URL } component = { LazyUserAuthComp } />
345370 < LazyRoute
0 commit comments