feat(Redirect): customRoutes now accept <Redirect /> (#2771)

* feat(Redirect): customRoutes now accept <Redirect /> Fix [#2767](#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
marmelab · Jan 28, 2019 · cc3d5ca · cc3d5ca
1 parent b60d233
commit cc3d5ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git 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
@@ -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}