Merge pull request marmelab#3927 from marmelab/fix-missing-core-const…

…ants [RFR] Fix missing core constants
gvillo · Nov 4, 2019 · 0872558 · 0872558
2 parents 6eaa991 + 26feead
commit 0872558
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/packages/ra-core/src/core/components.ts b/packages/ra-core/src/core/components.ts
@@ -0,0 +1,17 @@
+import CoreAdmin from './CoreAdmin';
+import CoreAdminContext from './CoreAdminContext';
+import CoreAdminRouter from './CoreAdminRouter';
+import CoreAdminUI from './CoreAdminUI';
+import createAdminStore from './createAdminStore';
+import RoutesWithLayout from './RoutesWithLayout';
+import Resource from './Resource';
+
+export {
+    CoreAdmin,
+    CoreAdminContext,
+    CoreAdminRouter,
+    CoreAdminUI,
+    createAdminStore,
+    RoutesWithLayout,
+    Resource,
+};
diff --git a/packages/ra-core/src/core/index.ts b/packages/ra-core/src/core/index.ts
@@ -1,18 +1,4 @@
-import CoreAdmin from './CoreAdmin';
-import CoreAdminContext from './CoreAdminContext';
-import CoreAdminRouter from './CoreAdminRouter';
-import CoreAdminUI from './CoreAdminUI';
-import createAdminStore from './createAdminStore';
-import RoutesWithLayout from './RoutesWithLayout';
-import Resource from './Resource';
-
-export {
-    CoreAdmin,
-    CoreAdminContext,
-    CoreAdminRouter,
-    CoreAdminUI,
-    createAdminStore,
-    RoutesWithLayout,
-    Resource,
-};
 export * from './dataFetchActions';
+export * from './components';
+// there seems to be a bug in TypeScript: this only works if the exports are in this order.
+// Swapping the two exports leads to the core module missing the dataFetchActions constants
diff --git a/packages/ra-core/src/dataProvider/useDataProvider.ts b/packages/ra-core/src/dataProvider/useDataProvider.ts
@@ -274,6 +274,7 @@ const performUndoableQuery = ({
                         warnBeforeClosingWindow
                     );
                 }
+                console.error(error);
                 return logoutIfAccessDenied(error).then(loggedOut => {
                     if (loggedOut) return;
                     dispatch({
@@ -354,8 +355,9 @@ const performQuery = ({
             onSuccess && onSuccess(response);
             return response;
         })
-        .catch(error =>
-            logoutIfAccessDenied(error).then(loggedOut => {
+        .catch(error => {
+            console.error(error);
+            return logoutIfAccessDenied(error).then(loggedOut => {
                 if (loggedOut) return;
                 dispatch({
                     type: `${action}_FAILURE`,
@@ -372,8 +374,8 @@ const performQuery = ({
                 dispatch({ type: FETCH_ERROR, error });
                 onFailure && onFailure(error);
                 throw error;
-            })
-        );
+            });
+        });
 };
 
 interface QueryFunctionParams {