fix: router

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

Hide file tree

Showing 3 changed files with 21 additions and 34 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
@@ -33,7 +33,10 @@ import DatastoreList from '../DatastoreList';
 import DatasetList from '../DatasetList';
 import ComponentAddForm from '../ComponentAddForm';
 import Finish from '../Finish';
-import { GENERATOR_ZIP_URL } from '../../constants';
+import { GENERATOR_OPENAPI_ZIP_URL, GENERATOR_ZIP_URL } from '../../constants';
+import { OpenAPITrans } from '../OpenAPI/OpenAPI.component';
+
+const FinishZip = () => <Finish actionUrl={GENERATOR_ZIP_URL} openapi={false} />;
 
 function ModeSwitcher() {
 	const navigate = useNavigate();
@@ -99,15 +102,22 @@ function App() {
 											<Route exact path="/dataset" element={<DatasetList />} />
 											<Route path="/component/:componentId" element={<Component />} />
 											<Route path="/add-component" element={<ComponentAddForm />} />
+											<Route path="/export" element={<FinishZip />} />
+										</Route>
+
+										<Route path="/openapi" element={<OpenAPIWizard />}>
 											<Route
-												path="/export"
-												render={(props) => (
-													<Finish {...props} actionUrl={GENERATOR_ZIP_URL} openapi={false} />
-												)}
+												exact
+												path="/openapi/project"
+												element={<ProjectMetadata hideFacets={true} hideCategory={true} />}
+											/>
+											<Route exact path="/openapi/design" element={<OpenAPITrans />} />
+											<Route
+												exact
+												path="/openapi/export"
+												element={<Finish openapi={true} actionUrl={GENERATOR_OPENAPI_ZIP_URL} />}
 											/>
 										</Route>
-
-										<Route path="/openapi" element={<OpenAPIWizard />} />
 									</Routes>
 								</ComponentsContext.Provider>
 							</DatasetContext.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,20 +14,11 @@
  *  limitations under the License.
  */
 import React from 'react';
-import { Outlet, Route, Routes } from 'react-router-dom';
+import { Outlet } from 'react-router-dom';
 
 import theme from './Generator.module.scss';
 
-import ProjectMetadata from '../ProjectMetadata';
-import Component from '../Component';
-import ComponentAddForm from '../ComponentAddForm';
-
-import Finish from '../Finish';
 import SideMenu from '../SideMenu';
-import DatastoreList from '../DatastoreList';
-import DatasetList from '../DatasetList';
-
-import { GENERATOR_ZIP_URL } from '../../constants';
 
 export default function Generator() {
 	return (

diff --git a/component-starter-server/src/main/frontend/src/app/components/OpenAPI/OpenAPI.component.js b/component-starter-server/src/main/frontend/src/app/components/OpenAPI/OpenAPI.component.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 AceEditor from 'react-ace';
 import 'ace-builds/src-noconflict/mode-javascript';
 import 'ace-builds/src-noconflict/theme-chrome';
@@ -223,7 +223,7 @@ class OpenAPI extends React.Component {
 	}
 }
 
-const OpenAPITrans = withTranslation('Help')(OpenAPI);
+export const OpenAPITrans = withTranslation('Help')(OpenAPI);
 
 export default class OpenAPIWizard extends React.Component {
 	render() {
@@ -235,21 +235,7 @@ export default class OpenAPIWizard extends React.Component {
 					</div>
 					<div className={generatorTheme.content}>
 						<main>
-							<Routes>
-								<Route
-									exact
-									path="/openapi/project"
-									component={(props) => <ProjectMetadata hideFacets={true} hideCategory={true} />}
-								/>
-								<Route exact path="/openapi/design" component={OpenAPITrans} />
-								<Route
-									exact
-									path="/openapi/export"
-									render={(props) => (
-										<Finish {...props} openapi={true} actionUrl={GENERATOR_OPENAPI_ZIP_URL} />
-									)}
-								/>
-							</Routes>
+							<Outlet />
 						</main>
 					</div>
 				</div>