Merge pull request #33 from GetAmbassador/46_update_redux_clerk_fetch…

…_reducer_to_merge_items_instead_of_overwriting_them Update redux-clerk fetch reducer to merge items instead of overwriting them
GetAmbassador · Mar 15, 2017 · 3107292 · 3107292
2 parents d554d63 + a21a9bb
commit 3107292
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/reducers/fetch.js b/src/reducers/fetch.js
@@ -46,7 +46,7 @@ export const success = (state, action) => {
 
       // Merge new raw data with existing raw data
       const normalizedData = normalize(action.uidField, Immutable.fromJS(responseData))
-      map.set('raw', state.get('raw').merge(normalizedData))
+      map.set('raw', map.get('raw').mergeDeep(normalizedData))
     }
 
     // Update instance array with new data

diff --git a/test/reducers/fetch.js b/test/reducers/fetch.js
@@ -56,16 +56,16 @@ describe('Reducers::Fetch', () => {
     let previousState
 
     beforeEach(() => {
-      previousState = Immutable.fromJS({
-        raw: {
-          123: { uid: 123, test: '123' },
-          234: { uid: 234, test: '234' }
-        },
-        instances: {
+      previousState = Map({
+        raw: Map([
+          [123, Map({ uid: 123, test: '123', field_old: 'test' })],
+          [234, Map({ uid: 234, test: '234' })]
+        ]),
+        instances: Immutable.fromJS({
           test1: {
             data: [123, 234]
           }
-        }
+        })
       })
     })
 
@@ -74,15 +74,15 @@ describe('Reducers::Fetch', () => {
         uidField: 'uid',
         instance: 'test1',
         responseData: [
-          { uid: 123, test: 'name' },
+          { uid: 123, test: 'name', field_new: 'test' },
           { uid: 345, test: '345' }
         ],
         options: {}
       }
 
       const expectedResult = {
         raw: {
-          123: { uid: 123, test: 'name' },
+          123: { uid: 123, test: 'name', field_old: 'test', field_new: 'test' },
           234: { uid: 234, test: '234' },
           345: { uid: 345, test: '345' }
         },
@@ -106,7 +106,7 @@ describe('Reducers::Fetch', () => {
 
       const expectedResult = {
         raw: {
-          123: { uid: 123, test: 'name' },
+          123: { uid: 123, test: 'name', field_old: 'test' },
           234: { uid: 234, test: '234' }
         },
         instances: {
@@ -134,7 +134,7 @@ describe('Reducers::Fetch', () => {
 
       const expectedResult = {
         raw: {
-          123: { uid: 123, test: '123' },
+          123: { uid: 123, test: '123', field_old: 'test' },
           234: { uid: 234, test: '234' },
           345: { uid: 345, test: '345' },
           456: { uid: 456, test: '456' }
@@ -165,7 +165,7 @@ describe('Reducers::Fetch', () => {
 
       const expectedResult = {
         raw: {
-          123: { uid: 123, test: '123' },
+          123: { uid: 123, test: '123', field_old: 'test' },
           234: { uid: 234, test: '234' },
           345: { uid: 345, test: '345' },
           456: { uid: 456, test: '456' }