Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

refactor(router): Adaptation to new versions of routing node types

haitaoo077e626f91f6
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index 92e9da21..e1c48a4f 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -1,7 +1,7 @@
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider, createBrowserRouter } from 'react-router-dom';
import './i18n/init';
-import { routes, createBrowserRouter } from '@/router';
+import routes from '@/router';
function App() {
const router = createBrowserRouter(routes);
diff --git a/ui/src/router/index.tsx b/ui/src/router/index.tsx
index b7eeabff..20f1b520 100644
--- a/ui/src/router/index.tsx
+++ b/ui/src/router/index.tsx
@@ -1,14 +1,14 @@
import { Suspense, lazy } from 'react';
-import { RouteObject, createBrowserRouter } from 'react-router-dom';
+import { RouteObject } from 'react-router-dom';
import Layout from '@/pages/Layout';
import ErrorBoundary from '@/pages/50X';
import baseRoutes, { RouteNode } from '@/router/routes';
import RouteGuard from '@/router/RouteGuard';
-const routes: RouteObject[] = [];
+const routes: RouteNode[] = [];
-const routeWrapper = (routeNodes: RouteNode[], root: RouteObject[]) => {
+const routeWrapper = (routeNodes: RouteNode[], root: RouteNode[]) => {
routeNodes.forEach((rn) => {
if (rn.page === 'pages/Layout') {
rn.element = rn.guard ? (
@@ -49,4 +49,4 @@ const routeWrapper = (routeNodes: RouteNode[], root: RouteObject[]) => {
routeWrapper(baseRoutes, routes);
-export { routes, createBrowserRouter };
+export default routes as RouteObject[];
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index 1b6b4bbf..1d124e71 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -1,9 +1,13 @@
-import type { RouteObject } from 'react-router-dom';
+import type { IndexRouteObject, NonIndexRouteObject } from 'react-router-dom';
import { guard } from '@/utils';
import type { TGuardFunc } from '@/utils/guard';
-export type RouteNode = RouteObject & {
+type IndexRouteNode = Omit<IndexRouteObject, 'children'>;
+type NonIndexRouteNode = Omit<NonIndexRouteObject, 'children'>;
+type UnionRouteNode = IndexRouteNode | NonIndexRouteNode;
+
+export type RouteNode = UnionRouteNode & {
page: string;
children?: RouteNode[];
/**
@@ -113,7 +117,6 @@ const routes: RouteNode[] = [
children: [
{
index: true,
- // @ts-ignore
page: 'pages/Users/Settings/Profile',
},
{
@@ -239,7 +242,6 @@ const routes: RouteNode[] = [
children: [
{
index: true,
- // @ts-ignore
page: 'pages/Admin/Dashboard',
},
{
@@ -332,7 +334,6 @@ const routes: RouteNode[] = [
children: [
{
path: 'tos',
- // @ts-ignore
page: 'pages/Legal/Tos',
},
{