fix: router routes

Talend · Jul 11, 2024 · 304383a · 304383a
1 parent e3eacfe
commit 304383a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/component-starter-server/src/main/frontend/src/app/components/App/App.js b/component-starter-server/src/main/frontend/src/app/components/App/App.js
@@ -25,8 +25,15 @@ import DatastoreContext from '../../DatastoreContext';
 import DatasetContext from '../../DatasetContext';
 import ComponentsContext from '../../ComponentsContext';
 import ProjectContext from '../../ProjectContext';
+import Component from '../Component';
 
 import theme from './App.module.scss';
+import ProjectMetadata from '../ProjectMetadata';
+import DatastoreList from '../DatastoreList';
+import DatasetList from '../DatasetList';
+import ComponentAddForm from '../ComponentAddForm';
+import Finish from '../Finish';
+import { GENERATOR_ZIP_URL } from '../../constants';
 
 function ModeSwitcher() {
 	const navigate = useNavigate();
@@ -85,7 +92,21 @@ function App() {
 							<DatasetContext.Provider>
 								<ComponentsContext.Provider>
 									<Routes>
-										<Route path="/" element={<Generator />} />
+										<Route path="/" element={<Generator />}>
+											<Route exact path="/" element={<ProjectMetadata />} />
+											<Route exact path="/project" element={<ProjectMetadata />} />
+											<Route exact path="/datastore" element={<DatastoreList />} />
+											<Route exact path="/dataset" element={<DatasetList />} />
+											<Route path="/component/:componentId" element={<Component />} />
+											<Route path="/add-component" element={<ComponentAddForm />} />
+											<Route
+												path="/export"
+												render={(props) => (
+													<Finish {...props} actionUrl={GENERATOR_ZIP_URL} openapi={false} />
+												)}
+											/>
+										</Route>
+
 										<Route path="/openapi" element={<OpenAPIWizard />} />
 									</Routes>
 								</ComponentsContext.Provider>

diff --git a/component-starter-server/src/main/frontend/src/app/components/Generator/Generator.js b/component-starter-server/src/main/frontend/src/app/components/Generator/Generator.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 import React from 'react';
-import { Route, Routes } from 'react-router-dom';
+import { Outlet, Route, Routes } from 'react-router-dom';
 
 import theme from './Generator.module.scss';
 
@@ -38,20 +38,7 @@ export default function Generator() {
 				</div>
 				<div className={theme.content}>
 					<main>
-						<Routes>
-							<Route exact path="/" element={<ProjectMetadata />} />
-							<Route exact path="/project" element={<ProjectMetadata />} />
-							<Route exact path="/datastore" element={<DatastoreList />} />
-							<Route exact path="/dataset" element={<DatasetList />} />
-							<Route path="/component/:componentId" element={<Component />} />
-							<Route path="/add-component" element={<ComponentAddForm />} />
-							<Route
-								path="/export"
-								render={(props) => (
-									<Finish {...props} actionUrl={GENERATOR_ZIP_URL} openapi={false} />
-								)}
-							/>
-						</Routes>
+						<Outlet />
 					</main>
 				</div>
 			</div>