This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 51a08e70cf66a6a5d7c53cfe3ec9e70112c1e855
Author: mintsweet <[email protected]>
AuthorDate: Mon Oct 23 16:46:24 2023 +1300

    feat(config-ui): integrate external code
---
 config-ui/src/app/routrer.tsx | 7 ++++++-
 config-ui/src/app/store.ts    | 6 ++++--
 config-ui/vite.config.ts      | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config-ui/src/app/routrer.tsx b/config-ui/src/app/routrer.tsx
index c3e86021b..250fe9cf0 100644
--- a/config-ui/src/app/routrer.tsx
+++ b/config-ui/src/app/routrer.tsx
@@ -31,6 +31,7 @@ import { Layout, loader as layoutLoader } from 
'@/routes/layout';
 import { Error, ErrorEnum } from '@/routes/error';
 import { Pipelines, Pipeline } from '@/routes/pipeline';
 import { ApiKeys } from '@/routes/api-keys';
+import { ExtraLayout } from '@next';
 
 export const router = createBrowserRouter([
   {
@@ -43,7 +44,11 @@ export const router = createBrowserRouter([
   },
   {
     path: '/',
-    element: <Layout />,
+    element: (
+      <ExtraLayout>
+        <Layout></Layout>
+      </ExtraLayout>
+    ),
     loader: layoutLoader,
     errorElement: <Error />,
     children: [
diff --git a/config-ui/src/app/store.ts b/config-ui/src/app/store.ts
index b838101b5..02180d094 100644
--- a/config-ui/src/app/store.ts
+++ b/config-ui/src/app/store.ts
@@ -17,11 +17,13 @@
  */
 
 import { configureStore, ThunkAction, Action } from '@reduxjs/toolkit';
-import connectionsSlice from '@/features/connections/slice';
+import connectionSlice from '@/features/connections/slice';
+import userSlice from '@next/user/slice';
 
 export const store = configureStore({
   reducer: {
-    connections: connectionsSlice,
+    connections: connectionSlice,
+    user: userSlice,
   },
 });
 
diff --git a/config-ui/vite.config.ts b/config-ui/vite.config.ts
index d8416b25e..7551faba1 100644
--- a/config-ui/vite.config.ts
+++ b/config-ui/vite.config.ts
@@ -40,6 +40,7 @@ export default defineConfig({
   resolve: {
     alias: {
       '@': path.join(__dirname, './src'),
+      '@next': path.join(__dirname, '../../frontend/src'),
     },
   },
 });

Reply via email to