Merge pull request #7044 from marmelab/fix-progress-indicator

Fix loading indicator not updated on permissions error when logoutUser is false
marmelab · Jan 3, 2022 · c71cd3e · c71cd3e
2 parents 850b859 + 2b18d08
commit c71cd3e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts b/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
@@ -43,6 +43,7 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
     const logout = useLogout();
     const notify = useNotify();
     const history = useHistory();
+
     const logoutIfAccessDenied = useCallback(
         (error?: any, disableNotification?: boolean) =>
             authProvider

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,