Merge pull request #3385 from marmelab/fix-with-dataprovider-callback

[RFR] Ensure dataProvider callback sideeffect is called when using withDataProvider
marmelab · Jul 7, 2019 · 4d71274 · 4d71274
2 parents a246449 + 55fa38e
commit 4d71274
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/packages/ra-core/src/util/withDataProvider.ts b/packages/ra-core/src/util/withDataProvider.ts
@@ -13,6 +13,9 @@ interface DispatchProps {
 const mapDispatchToProps = (dispatch): DispatchProps => ({
     dataProvider: (type, resource: string, payload: any, meta: any = {}) =>
         new Promise((resolve, reject) => {
+            const onSuccess = get(meta, 'onSuccess', {});
+            const onFailure = get(meta, 'onFailure', {});
+
             const action = {
                 type: 'CUSTOM_FETCH',
                 payload,
@@ -21,15 +24,28 @@ const mapDispatchToProps = (dispatch): DispatchProps => ({
                     resource,
                     fetch: type,
                     onSuccess: {
-                        ...get(meta, 'onSuccess', {}),
-                        callback: ({ payload: response }) => resolve(response),
+                        ...onSuccess,
+                        callback: ({ payload: response }) => {
+                            if (onSuccess.callback) {
+                                onSuccess.callback(response);
+                            }
+
+                            resolve(response);
+                        },
                     },
                     onFailure: {
                         ...get(meta, 'onFailure', {}),
-                        callback: ({ error }) =>
-                            reject(
-                                new Error(error.message ? error.message : error)
-                            ),
+                        callback: ({ error }) => {
+                            const sanitizedError = new Error(
+                                error.message ? error.message : error
+                            );
+
+                            if (onFailure.callback) {
+                                onFailure.callback(sanitizedError);
+                            }
+
+                            reject(sanitizedError);
+                        },
                     },
                 },
             };