@@ -62,7 +61,7 @@ function App (props) {
{
+ getComponent={(component) => {
if (component == 'User') {
- return ModeSwitcherRouterAware;
+ return ModeSwitcher;
}
throw new Error('get the default');
}}
@@ -85,10 +84,10 @@ function App (props) {
-
+
-
+
@@ -99,8 +98,4 @@ function App (props) {
);
}
-export default withTranslation('Help')(App);
-
-App.propTypes = {
- t: PropTypes.func,
-};
+export default App;
diff --git a/component-starter-server/src/main/frontend/src/app/components/Component/Component.js b/component-starter-server/src/main/frontend/src/app/components/Component/Component.js
index 33bd6b3b24b51..909514521f46e 100644
--- a/component-starter-server/src/main/frontend/src/app/components/Component/Component.js
+++ b/component-starter-server/src/main/frontend/src/app/components/Component/Component.js
@@ -15,7 +15,7 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
-import { Redirect } from 'react-router';
+import { Navigate } from 'react-router';
import { Action } from '@talend/react-components/lib/Actions';
import ComponentEditForm from '../ComponentEditForm';
@@ -44,9 +44,9 @@ export default class Component extends React.Component {
const componentIndex = this.props.match.params.componentId;
return (
- {components => {
+ {(components) => {
if (componentIndex === 'last') {
- return ;
+ return ;
}
if (componentIndex === 0 && components.components.length === 0) {
components.addComponent();
@@ -64,7 +64,7 @@ export default class Component extends React.Component {
- {service =>
+ {(service) =>
service.tiles.map((col, index) => {
if (index < service.tiles.length - 2) {
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
index ee1e09ee9c674..9da9ee6147ab6 100644
--- 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, Switch } from 'react-router-dom';
+import { 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';
@@ -235,7 +235,7 @@ export default class OpenAPIWizard extends React.Component {
-
+
)}
/>
-
+
diff --git a/component-starter-server/src/main/frontend/src/app/components/OpenAPI/StepByStep.js b/component-starter-server/src/main/frontend/src/app/components/OpenAPI/StepByStep.js
index d6af288837b05..e873ef2274cad 100644
--- a/component-starter-server/src/main/frontend/src/app/components/OpenAPI/StepByStep.js
+++ b/component-starter-server/src/main/frontend/src/app/components/OpenAPI/StepByStep.js
@@ -15,7 +15,7 @@
*/
import React from 'react';
import classnames from 'classnames';
-import { withRouter, Link } from 'react-router-dom';
+import { Link } from 'react-router-dom';
import theme from '../SideMenu/SideMenu.scss';
@@ -23,17 +23,20 @@ function StepByStep(props) {
return (