This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 93244ee50 [INLONG-7384][Dashboard] Login page error (#7385)
93244ee50 is described below
commit 93244ee509a3b7297700c8ee57995e31af6e29d6
Author: Daniel <[email protected]>
AuthorDate: Fri Feb 17 10:03:33 2023 +0800
[INLONG-7384][Dashboard] Login page error (#7385)
---
inlong-dashboard/package-lock.json | 12 ++++++------
inlong-dashboard/src/App.tsx | 15 ++++++++++-----
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/inlong-dashboard/package-lock.json
b/inlong-dashboard/package-lock.json
index 60ae9f553..9bf14ce47 100644
--- a/inlong-dashboard/package-lock.json
+++ b/inlong-dashboard/package-lock.json
@@ -10177,9 +10177,9 @@
}
},
"json5": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
- "integrity":
"sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity":
"sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
"dev": true
},
"jsonfile": {
@@ -10427,9 +10427,9 @@
"dev": true
},
"loader-utils": {
- "version": "2.0.2",
- "resolved":
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity":
"sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.4",
+ "resolved":
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity":
"sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
diff --git a/inlong-dashboard/src/App.tsx b/inlong-dashboard/src/App.tsx
index e0008a893..95cfc5840 100644
--- a/inlong-dashboard/src/App.tsx
+++ b/inlong-dashboard/src/App.tsx
@@ -97,8 +97,8 @@ const App = () => {
}, [history, location, setCurrentMenu]);
return (
- <Switch>
- <Suspense fallback={<AppLoading />}>
+ <Suspense fallback={<AppLoading />}>
+ <Switch>
{useLogin && (
<Route
exact
@@ -112,13 +112,18 @@ const App = () => {
<AppLayout>
<Switch>
{Object.keys(redirectRoutes).map(path => (
- <Route exact path={path} render={() => <Redirect
to={redirectRoutes[path]} />} />
+ <Route
+ exact
+ key={path}
+ path={path}
+ render={() => <Redirect to={redirectRoutes[path]} />}
+ />
))}
{renderRoutes(routes)}
</Switch>
</AppLayout>
- </Suspense>
- </Switch>
+ </Switch>
+ </Suspense>
);
};