From 79719c5c0ef3caeaa5b883ecbcb6b4b59750afa3 Mon Sep 17 00:00:00 2001 From: ES Date: Sat, 13 Jul 2019 08:56:48 +0530 Subject: [PATCH 1/3] Fixed issue: notification not dispatched on request error. (fixes #52) --- src/epics.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/epics.js b/src/epics.js index 332ff15..b532136 100644 --- a/src/epics.js +++ b/src/epics.js @@ -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 }) )) ); }) From 2605a2b8d80f11a5cac951787af1aa6ac68166f8 Mon Sep 17 00:00:00 2001 From: ES Date: Sat, 13 Jul 2019 08:57:37 +0530 Subject: [PATCH 2/3] Updated lodash - security vulnerability fix --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5d2da7..830d96c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7704,9 +7704,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true }, "lodash.camelcase": { diff --git a/package.json b/package.json index 5b5cb77..f075d23 100644 --- a/package.json +++ b/package.json @@ -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", From 638945af78b24cfa03aba4efc8a8b221286ef878 Mon Sep 17 00:00:00 2001 From: ES Date: Sat, 13 Jul 2019 08:58:03 +0530 Subject: [PATCH 3/3] 0.7.13 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 830d96c..ea40e3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@flipbyte/redux-datatable", - "version": "0.7.12", + "version": "0.7.13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f075d23..66504bc 100644 --- a/package.json +++ b/package.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",