Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jan 28, 2019
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1c6292
feat(Redirect): customRoutes now accept <Redirect />
Jan 15, 2019
9bc5f67
fix(customRoutes): Using cloneElement for customRoutes
Jan 15, 2019
93ce712
fix(customRoutes): Remove <Redirect /> unused imports. Fixed RoutesWi…
Jan 15, 2019
3f7ca37
fix(customRoutes): Remove ...route.props when cloning routes
Jan 15, 2019
b202f38
chore(clean): removed .idea and package-lock.json
Jan 16, 2019
ab818a2
chore(ignore): removed .idea and package-lock.json
Jan 17, 2019
f6af2a9
fix(CoreAdminRouter): do not force exact to true on resourcesRoutes
Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/react-admin.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

410 changes: 410 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

8,952 changes: 8,952 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 8 additions & 13 deletions packages/ra-core/src/CoreAdminRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,14 @@ 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, {
exact: true,
render: props =>
this.renderCustomRoutesWithoutLayout(
route,
props
)
}))}
<Route
path="/"
render={() =>
Expand Down
12 changes: 1 addition & 11 deletions packages/ra-core/src/RoutesWithLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down