Improve fix

marmelab · Jan 3, 2022 · 2b18d08 · 2b18d08
1 parent d6bc43b
commit 2b18d08
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/packages/ra-core/src/auth/useLogoutIfAccessDenied.spec.tsx b/packages/ra-core/src/auth/useLogoutIfAccessDenied.spec.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState, useEffect } from 'react';
 import expect from 'expect';
-import { waitFor } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 
@@ -10,7 +10,6 @@ import AuthContext from './AuthContext';
 import useLogout from './useLogout';
 import useNotify from '../sideEffect/useNotify';
 import { AuthProvider } from '../types';
-import { renderWithRedux } from 'ra-test';
 
 let loggedIn = true;
 
@@ -63,7 +62,7 @@ useNotify.mockImplementation(() => notify);
 
 function renderInRouter(children) {
     const history = createMemoryHistory();
-    const api = renderWithRedux(<Router history={history}>{children}</Router>);
+    const api = render(<Router history={history}>{children}</Router>);
 
     return {
         ...api,

diff --git a/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts b/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
@@ -4,8 +4,6 @@ import useAuthProvider from './useAuthProvider';
 import useLogout from './useLogout';
 import { useNotify } from '../sideEffect';
 import { useHistory } from 'react-router';
-import { fetchEnd } from '../actions';
-import { useDispatch } from 'react-redux';
 
 let timer;
 
@@ -45,7 +43,6 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
     const logout = useLogout();
     const notify = useNotify();
     const history = useHistory();
-    const dispatch = useDispatch();
 
     const logoutIfAccessDenied = useCallback(
         (error?: any, disableNotification?: boolean) =>
@@ -96,13 +93,12 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
                     if (logoutUser) {
                         logout({}, redirectTo);
                     } else {
-                        dispatch(fetchEnd());
                         history.push(redirectTo);
                     }
 
                     return true;
                 }),
-        [authProvider, logout, notify, history, dispatch]
+        [authProvider, logout, notify, history]
     );
     return authProvider
         ? logoutIfAccessDenied

diff --git a/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts b/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts
@@ -89,7 +89,10 @@ export const performOptimisticQuery = ({
                         console.error(error);
                     }
                     return logoutIfAccessDenied(error).then(loggedOut => {
-                        if (loggedOut) return;
+                        if (loggedOut) {
+                            dispatch({ type: FETCH_END });
+                            return;
+                        }
                         dispatch({
                             type: `${action}_FAILURE`,
                             error: error.message ? error.message : error,

diff --git a/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts b/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts
@@ -71,7 +71,10 @@ export const performPessimisticQuery = ({
                     console.error(error);
                 }
                 return logoutIfAccessDenied(error).then(loggedOut => {
-                    if (loggedOut) return;
+                    if (loggedOut) {
+                        dispatch({ type: FETCH_END });
+                        return;
+                    }
                     dispatch({
                         type: `${action}_FAILURE`,
                         error: error.message ? error.message : error,

diff --git a/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts b/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts
@@ -129,7 +129,10 @@ export const performUndoableQuery = ({
                         console.error(error);
                     }
                     return logoutIfAccessDenied(error).then(loggedOut => {
-                        if (loggedOut) return;
+                        if (loggedOut) {
+                            dispatch({ type: FETCH_END });
+                            return;
+                        }
                         dispatch({
                             type: `${action}_FAILURE`,
                             error: error.message ? error.message : error,