publish v5.6.0

devvmh · Mar 17, 2018 · 99958f0 · 99958f0
1 parent 4d9b622
commit 99958f0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/dist/redux-crud-store.js b/dist/redux-crud-store.js
@@ -3222,7 +3222,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      return Object.assign({}, state, _defineProperty({}, id, {
 	        fetchTime: action.meta.fetchTime,
 	        error: null,
-	        record: action.payload
+	        record: 'data' in action.payload ? action.payload.data : action.payload
 	      }));
 	    case _actionTypes.DELETE_SUCCESS:
 	      newState = Object.assign({}, state);
@@ -3262,7 +3262,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      var otherInfo = 'data' in originalPayload ? Object.assign({}, originalPayload) : {};
 	      delete otherInfo.data;
 	      if (!Array.isArray(payload)) {
-	        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n        \n          Here are the contents of your action:');
+	        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n\n          Here are the contents of your action:');
 	        (0, _devMessage2.default)(JSON.stringify(action));
 	      }
 	      var ids = payload.map(function (elt) {

diff --git a/dist/redux-crud-store.min.js b/dist/redux-crud-store.min.js
diff --git a/es/reducers.js b/es/reducers.js
@@ -109,7 +109,7 @@ function byIdReducerImpl() {
       return Object.assign({}, state, _defineProperty({}, id, {
         fetchTime: action.meta.fetchTime,
         error: null,
-        record: action.payload
+        record: 'data' in action.payload ? action.payload.data : action.payload
       }));
     case _actionTypes.DELETE_SUCCESS:
       newState = Object.assign({}, state);
@@ -149,7 +149,7 @@ function collectionReducerImpl() {
       var otherInfo = 'data' in originalPayload ? Object.assign({}, originalPayload) : {};
       delete otherInfo.data;
       if (!Array.isArray(payload)) {
-        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n        \n          Here are the contents of your action:');
+        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n\n          Here are the contents of your action:');
         (0, _devMessage2.default)(JSON.stringify(action));
       }
       var ids = payload.map(function (elt) {

diff --git a/lib/reducers.js b/lib/reducers.js
@@ -109,7 +109,7 @@ function byIdReducerImpl() {
       return Object.assign({}, state, _defineProperty({}, id, {
         fetchTime: action.meta.fetchTime,
         error: null,
-        record: action.payload
+        record: 'data' in action.payload ? action.payload.data : action.payload
       }));
     case _actionTypes.DELETE_SUCCESS:
       newState = Object.assign({}, state);
@@ -149,7 +149,7 @@ function collectionReducerImpl() {
       var otherInfo = 'data' in originalPayload ? Object.assign({}, originalPayload) : {};
       delete otherInfo.data;
       if (!Array.isArray(payload)) {
-        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n        \n          Here are the contents of your action:');
+        (0, _devMessage2.default)('\n          Payload is not an array! Your server response for a FETCH action\n          should be in one of the following forms:\n\n          { data: [ ... ] }\n\n          or\n\n          [ ... ]\n\n          Here are the contents of your action:');
         (0, _devMessage2.default)(JSON.stringify(action));
       }
       var ids = payload.map(function (elt) {

diff --git a/lib/reducers.js.flow b/lib/reducers.js.flow
@@ -109,7 +109,7 @@ function byIdReducerImpl(state = byIdInitialState, action) {
         [id]: {
           fetchTime: action.meta.fetchTime,
           error: null,
-          record: action.payload
+          record: ('data' in action.payload) ? action.payload.data : action.payload
         }
       })
     case DELETE_SUCCESS:
@@ -156,7 +156,7 @@ function collectionReducerImpl(state = collectionInitialState, action) {
           or
 
           [ ... ]
-        
+
           Here are the contents of your action:`)
         devMessage(JSON.stringify(action))
       }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-crud-store",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "Store of server-side models for Redux single page applications",
   "main": "lib/index.js",
   "jsnext:main": "es/index.js",