From cc3d5caad0e7a34ce9b8b163ff44fa68028193ee Mon Sep 17 00:00:00 2001
From: Dimitri KOPRIWA <kopx@free.fr>
Date: Mon, 28 Jan 2019 22:53:09 +0700
Subject: [PATCH] feat(Redirect): customRoutes now accept <Redirect /> (#2771)

* feat(Redirect): customRoutes now accept <Redirect />

Fix [#2767](https://github.com/marmelab/react-admin/issues/2767)

* fix(customRoutes): Using cloneElement for customRoutes

* fix(customRoutes): Remove <Redirect /> unused imports. Fixed RoutesWithLayout not rendering customRoutes as an array

* fix(customRoutes): Remove ...route.props when cloning routes

* chore(clean): removed .idea and package-lock.json

* chore(ignore): removed .idea and package-lock.json

* fix(CoreAdminRouter): do not force exact to true on resourcesRoutes
---
 packages/ra-core/src/CoreAdminRouter.js  | 20 +++++++-------------
 packages/ra-core/src/RoutesWithLayout.js | 12 +-----------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/packages/ra-core/src/CoreAdminRouter.js b/packages/ra-core/src/CoreAdminRouter.js
index af39cbd0b9a..848b478b3bd 100644
--- a/packages/ra-core/src/CoreAdminRouter.js
+++ b/packages/ra-core/src/CoreAdminRouter.js
@@ -135,19 +135,13 @@ export class CoreAdminRouter extends Component {
                 <Switch>
                     {customRoutes
                         .filter(route => route.props.noLayout)
-                        .map((route, index) => (
-                            <Route
-                                key={index}
-                                exact={route.props.exact}
-                                path={route.props.path}
-                                render={props =>
-                                    this.renderCustomRoutesWithoutLayout(
-                                        route,
-                                        props
-                                    )
-                                }
-                            />
-                        ))}
+                        .map((route) => cloneElement(route, {
+                          render: props =>
+                            this.renderCustomRoutesWithoutLayout(
+                              route,
+                              props
+                            )
+                        }))}
                     <Route
                         path="/"
                         render={() =>
diff --git a/packages/ra-core/src/RoutesWithLayout.js b/packages/ra-core/src/RoutesWithLayout.js
index af619c7675e..1166687cc75 100644
--- a/packages/ra-core/src/RoutesWithLayout.js
+++ b/packages/ra-core/src/RoutesWithLayout.js
@@ -16,17 +16,7 @@ const RoutesWithLayout = ({
 
     return (
         <Switch>
-            {customRoutes &&
-                customRoutes.map((route, index) => (
-                    <Route
-                        key={index}
-                        exact={route.props.exact}
-                        path={route.props.path}
-                        component={route.props.component}
-                        render={route.props.render}
-                        children={route.props.children} // eslint-disable-line react/no-children-prop
-                    />
-                ))}
+            {customRoutes && customRoutes.map((route) => cloneElement(route))}
             {Children.map(children, child => (
                 <Route
                     key={child.props.name}