From dd73efe18db175ab0cc61d357c7c610d3b81f0e1 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Tue, 15 Aug 2023 19:24:09 +0200 Subject: [PATCH] Chore: Remove createRoute utility for auth routes --- .../admin/admin/src/pages/App/constants.js | 2 +- .../core/admin/admin/src/pages/App/index.js | 22 +++++++------------ .../admin/ee/admin/pages/App/constants.js | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/core/admin/admin/src/pages/App/constants.js b/packages/core/admin/admin/src/pages/App/constants.js index cba1c9eb6e..7848875350 100644 --- a/packages/core/admin/admin/src/pages/App/constants.js +++ b/packages/core/admin/admin/src/pages/App/constants.js @@ -1,4 +1,4 @@ export const SET_APP_RUNTIME_STATUS = 'StrapiAdmin/APP/SET_APP_RUNTIME_STATUS'; export const SET_ADMIN_PERMISSIONS = 'StrapiAdmin/App/SET_ADMIN_PERMISSIONS'; -export const ROUTES_CE = []; +export const AUTH_ROUTES_CE = []; diff --git a/packages/core/admin/admin/src/pages/App/index.js b/packages/core/admin/admin/src/pages/App/index.js index 38f1a1e05a..a7fbd59ee7 100644 --- a/packages/core/admin/admin/src/pages/App/index.js +++ b/packages/core/admin/admin/src/pages/App/index.js @@ -1,9 +1,3 @@ -/** - * - * App.js - * - */ - import * as React from 'react'; import { SkipToContent } from '@strapi/design-system'; @@ -24,9 +18,8 @@ import PrivateRoute from '../../components/PrivateRoute'; import { ADMIN_PERMISSIONS_CE } from '../../constants'; import useConfigurations from '../../hooks/useConfigurations'; import { useEnterprise } from '../../hooks/useEnterprise'; -import { createRoute } from '../../utils/createRoute'; -import { ROUTES_CE, SET_ADMIN_PERMISSIONS } from './constants'; +import { AUTH_ROUTES_CE, SET_ADMIN_PERMISSIONS } from './constants'; const AuthPage = React.lazy(() => import(/* webpackChunkName: "Admin-AuthPage" */ '../AuthPage').then((module) => ({ @@ -77,9 +70,9 @@ export function App() { } ); - const routes = useEnterprise( - ROUTES_CE, - async () => (await import('../../../../ee/admin/pages/App/constants')).ROUTES_EE, + const authRoutes = useEnterprise( + AUTH_ROUTES_CE, + async () => (await import('../../../../ee/admin/pages/App/constants')).AUTH_ROUTES_EE, { defaultValue: [], } @@ -201,8 +194,6 @@ export function App() { } }, [telemetryProperties, uuid]); - const authRoutes = routes.map(({ to, Component, exact }) => createRoute(Component, to, exact)); - const trackingContext = React.useMemo( () => ({ uuid, @@ -220,7 +211,10 @@ export function App() { {formatMessage({ id: 'skipToContent' })} - {authRoutes} + {authRoutes.map(({ to, Component, exact }) => ( + + ))} + ( diff --git a/packages/core/admin/ee/admin/pages/App/constants.js b/packages/core/admin/ee/admin/pages/App/constants.js index ee674703a7..475224c010 100644 --- a/packages/core/admin/ee/admin/pages/App/constants.js +++ b/packages/core/admin/ee/admin/pages/App/constants.js @@ -1,6 +1,6 @@ import { AuthResponse } from '../AuthResponse'; -export const ROUTES_EE = [ +export const AUTH_ROUTES_EE = [ { Component: () => ({ default: AuthResponse }), to: '/auth/login/:authResponse',