diff --git a/packages/components-faraday/src/components/Admin/AdminRoute.js b/packages/components-faraday/src/components/Admin/AdminRoute.js index f86291a497dd61ccd42e2e43e461be3ac5597ebf..4b95cac85c1e8f52f6384f7fad2c47d8d25c0cb1 100644 --- a/packages/components-faraday/src/components/Admin/AdminRoute.js +++ b/packages/components-faraday/src/components/Admin/AdminRoute.js @@ -2,7 +2,7 @@ import React from 'react' import { get } from 'lodash' import { compose } from 'recompose' import { connect } from 'react-redux' -import { Redirect, withRouter } from 'react-router-dom' +import { Redirect, withRouter, Route } from 'react-router-dom' import { AuthenticatedComponent } from 'pubsweet-client' const AdminRoute = ({ @@ -13,9 +13,14 @@ const AdminRoute = ({ }) => { const isAdmin = get(currentUser, 'user.admin') return ( - <AuthenticatedComponent> - {isAdmin ? <Component {...rest} /> : <Redirect to="/" />} - </AuthenticatedComponent> + <Route + {...rest} + render={props => ( + <AuthenticatedComponent> + {isAdmin ? <Component {...props} /> : <Redirect to="/" />} + </AuthenticatedComponent> + )} + /> ) } diff --git a/packages/components-faraday/src/components/AppBar/AppBar.js b/packages/components-faraday/src/components/AppBar/AppBar.js index 0a414d5fb7cd8dc7867e2efd35dc4b371754109c..6487709111b0448388cafc40e44c0647dbbfbe59 100644 --- a/packages/components-faraday/src/components/AppBar/AppBar.js +++ b/packages/components-faraday/src/components/AppBar/AppBar.js @@ -32,7 +32,7 @@ const AppBar = ({ <Dropdown> <DropdownOption>Settings</DropdownOption> {currentUser.admin && ( - <DropdownOption onClick={goTo('admin')}> + <DropdownOption onClick={goTo('/admin')}> Admin dashboard </DropdownOption> )} diff --git a/packages/xpub-faraday/app/routes.js b/packages/xpub-faraday/app/routes.js index 9d8ad3bcb3298fc2196c793e18fa6a33f9f85c58..97bf5d7826502c5c8e9fbee4f648e006dfcaef93 100644 --- a/packages/xpub-faraday/app/routes.js +++ b/packages/xpub-faraday/app/routes.js @@ -1,5 +1,4 @@ import React from 'react' -// import { withProps } from 'recompose' import { Route, Switch } from 'react-router-dom' import { AuthenticatedComponent } from 'pubsweet-client' import Login from 'pubsweet-component-login/LoginContainer'