Merge pull request #56 from easeq/master

0.7.13

Author: easeq

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.7.12",
+    "version": "0.7.13",
     "description": "React-Redux data table",
     "main": "lib/index.js",
     "module": "es/index.js",
@@ -20,7 +20,7 @@
         "test:watch": "nwb test-react --server"
     },
     "peerDependencies": {
-        "lodash": ">=4.17.11",
+        "lodash": ">=4.17.13",
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
         "rxjs": "^6.4.0",
@@ -44,7 +44,7 @@
         "axios": "^0.19.0",
         "axios-observable": "^1.1.1",
         "bootstrap": "^4.3.1",
-        "lodash": ">=4.17.11",
+        "lodash": ">=4.17.13",
         "nwb": "0.23.x",
         "path-to-regexp": "^3.0.0",
         "react": "^16.8.6",

package.json

@@ -4,6 +4,7 @@ import { ofType } from 'redux-observable';
 import { Observable, of, pipe } from 'rxjs';
 import objectAssignDeep from 'object-assign-deep';
 import { concatMap, mergeMap, map, takeUntil, filter, catchError } from 'rxjs/operators';
+import { throwError } from 'rxjs';
 import { createNotification, NOTIFICATION_TYPE_SUCCESS, NOTIFICATION_TYPE_ERROR } from 'react-redux-notify';
 import {
     receiveData,
@@ -58,9 +59,9 @@ export const fetchDataEpic = ( action$, state$, { api }) => action$.pipe(
                 return { response, data };
             }),
             map((payload) => receiveData({ name, payload })),
-            catchError((error) => of(
+            catchError((error) =>  of(
+                createNotification({ type: NOTIFICATION_TYPE_ERROR, message: error.message }),
                 cancelRequest({ name }),
-                createNotification({ type: NOTIFICATION_TYPE_ERROR, message: error.message })
             )),
             takeUntil(action$.pipe(
                 ofType(REQUEST_DATA_CANCEL),
@@ -91,8 +92,8 @@ export const deleteDataEpic = ( action$, state$, { api }) => action$.pipe(
                 );
             }),
             catchError((error) => of(
+                createNotification({ type: NOTIFICATION_TYPE_ERROR, message: error.message }),
                 cancelRequest({ name }),
-                createNotification({ type: NOTIFICATION_TYPE_ERROR, message: error.message })
             ))
         );
     })