This repository has been archived by the owner on Aug 21, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengine …
…into dev
- Loading branch information
Showing
9 changed files
with
199 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import React, { lazy, Suspense, useEffect, useState } from 'react' | ||
| import { useTranslation } from 'react-i18next' | ||
| import { Route, Routes, useLocation, useNavigate } from 'react-router-dom' | ||
|
|
||
| import { | ||
| AuthSettingsService, | ||
| AuthSettingsServiceReceptor, | ||
| useAuthSettingState | ||
| } from '@etherealengine/client-core/src/admin/services/Setting/AuthSettingService' | ||
| import { | ||
| ClientSettingsServiceReceptor, | ||
| useClientSettingState | ||
| } from '@etherealengine/client-core/src/admin/services/Setting/ClientSettingService' | ||
| import ErrorBoundary from '@etherealengine/client-core/src/common/components/ErrorBoundary' | ||
| import { AppLoadingServiceReceptor } from '@etherealengine/client-core/src/common/services/AppLoadingService' | ||
| import { AppServiceReceptor } from '@etherealengine/client-core/src/common/services/AppService' | ||
| import { DialogServiceReceptor } from '@etherealengine/client-core/src/common/services/DialogService' | ||
| import { MediaInstanceConnectionServiceReceptor } from '@etherealengine/client-core/src/common/services/MediaInstanceConnectionService' | ||
| import { ProjectServiceReceptor } from '@etherealengine/client-core/src/common/services/ProjectService' | ||
| import { | ||
| RouterServiceReceptor, | ||
| RouterState, | ||
| useRouter | ||
| } from '@etherealengine/client-core/src/common/services/RouterService' | ||
| import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' | ||
| import { FriendServiceReceptor } from '@etherealengine/client-core/src/social/services/FriendService' | ||
| import { InviteService, InviteServiceReceptor } from '@etherealengine/client-core/src/social/services/InviteService' | ||
| import { LocationServiceReceptor } from '@etherealengine/client-core/src/social/services/LocationService' | ||
| import { AuthService, AuthServiceReceptor } from '@etherealengine/client-core/src/user/services/AuthService' | ||
| import { AvatarServiceReceptor } from '@etherealengine/client-core/src/user/services/AvatarService' | ||
| import { addActionReceptor, getState, removeActionReceptor, useHookstate } from '@etherealengine/hyperflux' | ||
|
|
||
| import $404 from '../pages/404' | ||
| import $503 from '../pages/503' | ||
| import { CustomRoute, getCustomRoutes } from './getCustomRoutes' | ||
|
|
||
| const $admin = lazy(() => import('@etherealengine/client-core/src/admin/adminRoutes')) | ||
|
|
||
| function AdminRouterComp() { | ||
| const [customRoutes, setCustomRoutes] = useState(null as any as CustomRoute[]) | ||
| const clientSettingsState = useClientSettingState() | ||
| const authSettingsState = useAuthSettingState() | ||
| const location = useLocation() | ||
| const navigate = useNavigate() | ||
| const [routesReady, setRoutesReady] = useState(false) | ||
| const routerState = useHookstate(getState(RouterState)) | ||
| const route = useRouter() | ||
| const { t } = useTranslation() | ||
|
|
||
| InviteService.useAPIListeners() | ||
|
|
||
| useEffect(() => { | ||
| addActionReceptor(RouterServiceReceptor) | ||
| addActionReceptor(ClientSettingsServiceReceptor) | ||
| addActionReceptor(AuthSettingsServiceReceptor) | ||
| addActionReceptor(AuthServiceReceptor) | ||
| addActionReceptor(AvatarServiceReceptor) | ||
| addActionReceptor(InviteServiceReceptor) | ||
| addActionReceptor(LocationServiceReceptor) | ||
| addActionReceptor(DialogServiceReceptor) | ||
| addActionReceptor(AppLoadingServiceReceptor) | ||
| addActionReceptor(AppServiceReceptor) | ||
| addActionReceptor(ProjectServiceReceptor) | ||
| addActionReceptor(MediaInstanceConnectionServiceReceptor) | ||
| addActionReceptor(FriendServiceReceptor) | ||
|
|
||
| // Oauth callbacks may be running when a guest identity-provider has been deleted. | ||
| // This would normally cause doLoginAuto to make a guest user, which we do not want. | ||
| // Instead, just skip it on oauth callbacks, and the callback handler will log them in. | ||
| // The client and auth settigns will not be needed on these routes | ||
| if (!/auth\/oauth/.test(location.pathname)) { | ||
| AuthService.doLoginAuto() | ||
| AuthSettingsService.fetchAuthSetting() | ||
| } | ||
| getCustomRoutes().then((routes) => { | ||
| setCustomRoutes(routes) | ||
| }) | ||
|
|
||
| return () => { | ||
| removeActionReceptor(RouterServiceReceptor) | ||
| removeActionReceptor(ClientSettingsServiceReceptor) | ||
| removeActionReceptor(AuthSettingsServiceReceptor) | ||
| removeActionReceptor(AuthServiceReceptor) | ||
| removeActionReceptor(AvatarServiceReceptor) | ||
| removeActionReceptor(InviteServiceReceptor) | ||
| removeActionReceptor(LocationServiceReceptor) | ||
| removeActionReceptor(DialogServiceReceptor) | ||
| removeActionReceptor(AppServiceReceptor) | ||
| removeActionReceptor(AppLoadingServiceReceptor) | ||
| removeActionReceptor(ProjectServiceReceptor) | ||
| removeActionReceptor(MediaInstanceConnectionServiceReceptor) | ||
| removeActionReceptor(FriendServiceReceptor) | ||
| } | ||
| }, []) | ||
|
|
||
| useEffect(() => { | ||
| if (location.pathname !== routerState.pathname.value) { | ||
| route(location.pathname) | ||
| } | ||
| }, [location.pathname]) | ||
|
|
||
| useEffect(() => { | ||
| if (location.pathname !== routerState.pathname.value) { | ||
| navigate(routerState.pathname.value) | ||
| } | ||
| }, [routerState.pathname]) | ||
|
|
||
| useEffect(() => { | ||
| // For the same reason as above, we will not need to load the client and auth settings for these routes | ||
| if (/auth\/oauth/.test(location.pathname) && customRoutes) return setRoutesReady(true) | ||
| if (clientSettingsState.client.value.length && authSettingsState.authSettings.value.length && customRoutes) | ||
| return setRoutesReady(true) | ||
| }, [clientSettingsState.client.length, authSettingsState.authSettings.length, customRoutes]) | ||
|
|
||
| if (!routesReady) { | ||
| return ( | ||
| <ErrorBoundary> | ||
| <LoadingCircle message={t('common:loader.loadingRoutes')} /> | ||
| </ErrorBoundary> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <ErrorBoundary> | ||
| <Suspense fallback={<LoadingCircle message={t('common:loader.loadingAdmin')} />}> | ||
| <$admin /> | ||
| </Suspense> | ||
| </ErrorBoundary> | ||
| ) | ||
| } | ||
|
|
||
| export default AdminRouterComp |
Oops, something went wrong.