#794

app/components/activity/ActivityPage.jsx

 import React from 'react'
 import { withRouter } from 'react-router'
 import { Query } from 'react-apollo'
-import { createBrowserHistory } from 'history'
 import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 import { H1 } from '@pubsweet/ui'
@@ -63,10 +62,7 @@ const ActivityPageContainer = ({ currentUser, history, match, ...props }) => (
         )
       }
       if (!data) {
-        const { pathname, search } = props.location
-        createBrowserHistory({ forceRefresh: true }).push(
-          `/login?next=${pathname}${search}`,
-        )
+        history.go()
         return null
       }
       if (currentUser.admin) {

app/components/dashboard/AdminDashboard.jsx

@@ -169,9 +169,7 @@ const Dashboard = ({ currentUser }) => (
         )
       }
       if (!data) {
-        createBrowserHistory({ forceRefresh: true }).push(
-          '/login?next=/admin-dashboard',
-        )
+        createBrowserHistory({ forceRefresh: true }).go()
         return null
       }
       return (

app/components/dashboard/MyManuscripts.jsx

@@ -5,7 +5,6 @@ import { H2 as HTwo, Link } from '@pubsweet/ui'
 import { th } from '@pubsweet/ui-toolkit'
 import { pageSize, states } from 'config'
 import URLSearchParams from 'url-search-params'
-import { createBrowserHistory } from 'history'
 import { Loading, LoadingIcon, Notification, Toggle, Pagination } from '../ui'
 import {
   USER_MANUSCRIPTS,
@@ -46,7 +45,7 @@ const MyManuscripts = ({ currentUser, errors, history }) => (
         )
       }
       if (!data) {
-        createBrowserHistory({ forceRefresh: true }).push('')
+        history.go()
         return null
       }
       // get the total number of manuscripts to decide whether the toggles are required

app/components/dashboard/MyQueue.jsx

@@ -5,7 +5,6 @@ import styled from 'styled-components'
 import URLSearchParams from 'url-search-params'
 import { th } from '@pubsweet/ui-toolkit'
 import { Action, H2 as HTwo } from '@pubsweet/ui'
-import { createBrowserHistory } from 'history'
 import { pageSize } from 'config'
 import { Loading, LoadingIcon, Notification, Pagination, Toggle } from '../ui'
 import { ADMIN_MANUSCRIPTS } from './operations'
@@ -72,7 +71,7 @@ class MyQueue extends React.Component {
             )
           }
           if (!data) {
-            createBrowserHistory({ forceRefresh: true }).push('/login')
+            history.go()
             return null
           }
           const mine = []

app/components/manage-site/MetricsPage.jsx

@@ -3,7 +3,6 @@ import { Query } from 'react-apollo'
 import styled from 'styled-components'
 import { Action, H3, Link } from '@pubsweet/ui'
 import { th } from '@pubsweet/ui-toolkit'
-import { createBrowserHistory } from 'history'
 import { METRICS, COUNT_PREPRINTS, WEEK_METRICS, STATS } from './operations'
 import { Loading, LoadingIcon, Table, Toggle } from '../ui'
 import ManagementBase from './ManagementBase'
@@ -178,9 +177,7 @@ class Metrics extends React.Component {
               )
             }
             if (!data) {
-              createBrowserHistory({ forceRefresh: true }).push(
-                '/login?next=/admin-metrics',
-              )
+              this.props.history.go()
               return null
             }
 

app/components/review-wizard/ReviewPage.jsx

@@ -26,10 +26,7 @@ const ReviewPage = ({ match, ...props }) => (
         )
       }
       if (!data) {
-        const { pathname, search } = props.location
-        createBrowserHistory({ forceRefresh: true }).push(
-          `/login?next=${pathname}${search}`,
-        )
+        createBrowserHistory({ forceRefresh: true }).go()
         return null
       }
       if (!data.manuscript) {

app/components/submission-wizard/CreatePage.jsx

@@ -544,10 +544,7 @@ const CreatePage = ({ match, ...props }) => (
         )
       }
       if (!data) {
-        const { pathname, search } = props.location
-        createBrowserHistory({ forceRefresh: true }).push(
-          `/login?next=${pathname}${search}`,
-        )
+        createBrowserHistory({ forceRefresh: true }).go()
         return null
       }
       if (!data.manuscript) {

app/components/submission-wizard/SubmitPage.jsx

@@ -60,10 +60,7 @@ const SubmitPage = ({ match, currentUser, ...props }) => (
         )
       }
       if (!data) {
-        const { pathname, search } = props.location
-        createBrowserHistory({ forceRefresh: true }).push(
-          `/login?next=${pathname}${search}`,
-        )
+        createBrowserHistory({ forceRefresh: true }).go()
         return null
       }
       if (!data.manuscript) {