Cleanup

src/components/theme/App/App.jsx

@@ -8,7 +8,7 @@ import jwtDecode from 'jwt-decode';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { asyncConnect, Helmet } from '@plone/volto/helpers';
+import { asyncConnect, Helmet, withRouter } from '@plone/volto/helpers';
 import { Segment } from 'semantic-ui-react';
 import { Outlet } from 'react-router-dom';
 import { Slide, ToastContainer, toast } from 'react-toastify';
@@ -273,9 +273,10 @@ export default compose(
  // },
  // ]),
  injectIntl,
+ withRouter,
  connect(
  (state, props) => ({
- pathname: state.router.location.pathname,
+ pathname: props.location.pathname,
  token: state.userSession.token,
  userId: state.userSession.token
  ? jwtDecode(state.userSession.token).sub

src/components/theme/Login/Login.jsx

@@ -314,8 +314,8 @@ export default compose(
  loading: state.userSession.login.loading,
  token: state.userSession.token,
  returnUrl:
- qs.parse(state.router.location.search).return_url ||
- state.router.location.pathname
+ qs.parse(props.location.search).return_url ||
+ props.location.pathname
  .replace(/\/login$/, '')
  .replace(/\/logout$/, '') ||
  '/',

src/components/theme/Logout/Logout.jsx

@@ -56,7 +56,7 @@ class Logout extends Component {
 
 export default connect(
  (state, props) => ({
- query: qs.parse(state.router.location.search),
+ query: qs.parse(props.location.search),
  }),
  { logout, purgeMessages },
 )(Logout);

src/components/theme/View/View.jsx

@@ -267,8 +267,8 @@ class View extends Component {
 }
 
 export default compose(
- withRouter,
  injectIntl,
+ withRouter,
  connect(
  (state, props) => ({
  actions: state.actions.actions,
@@ -277,11 +277,10 @@ export default compose(
  error: state.content.get.error,
  apiError: state.apierror.error,
  connectionRefused: state.apierror.connectionRefused,
- pathname: state.router.location.pathname,
- location: state.router.location,
+ pathname: props.location.pathname,
  versionId:
- qs.parse(state.router.location.search) &&
- qs.parse(state.router.location.search).version,
+ qs.parse(props.location.search) &&
+ qs.parse(props.location.search).version,
  }),
  {
  listActions,

src/server.jsx

@@ -134,7 +134,7 @@ function setupServer(req, res, next) {
  });
 
  // Create a new Redux store instance
- const [store] = configureStore(initialState, history, api);
+ const store = configureStore(initialState, history, api);
 
  persistAuthToken(store, req);