Merge pull request #38 from dabapps/fix-page-count-defaulting

Use action meta page number

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dabapps/redux-api-collections",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Type-safe helpers for dealing with Rest-Framework backed collections in Typescript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/collections/reducers.ts

@@ -30,7 +30,7 @@ function updateCollectionItemsFromResponse<T extends IdKeyed>(
     ordering,
     reverseOrdering,
   } = action.meta;
-  const { count, next, results, page } = action.payload;
+  const { count, next, results } = action.payload;
 
   const oldCollectionItems = (collectionData[subgroup || ''] || { results: [] })
     .results;
@@ -44,7 +44,7 @@ function updateCollectionItemsFromResponse<T extends IdKeyed>(
     filters,
     next,
     ordering,
-    page: page || 1,
+    page: action.meta.page || action.payload.page || 1,
     results: newCollectionResults,
     immutableResults: useImmutable ? List<T>(newCollectionResults) : null,
     reverseOrdering,

tests/collections.ts

@@ -48,13 +48,14 @@ describe('Collections', () => {
     results: ReadonlyArray<any>,
     shouldAppend: boolean,
     count?: number,
+    metaPage?: number,
     next?: string
   ) {
     return {
-      meta: { tag, shouldAppend, subgroup },
+      meta: { tag, shouldAppend, subgroup, page: metaPage },
       payload: {
         count,
-        page: 1,
+        page: metaPage ? undefined : 1,
         next,
         results,
       },
@@ -319,6 +320,29 @@ describe('Collections', () => {
       expect(results[0].furLength).toBe(5);
     });
 
+    it('should update the page from the GET_COLLECTION request meta if the server does not return the page number', () => {
+      const data = collections.reducers.collectionsReducer(
+        undefined,
+        getCollectionSuccess(
+          'llamas',
+          '',
+          [
+            {
+              furLength: 5,
+              id: '1',
+              name: 'Drama',
+            },
+          ],
+          false,
+          12,
+          6
+        )
+      );
+      const subCollection = getCollectionByName(data, 'llamas');
+      expect(subCollection.page).toBe(6);
+      expect(subCollection.count).toBe(12);
+    });
+
     it('should add an item on ADD_TO_COLLECTION responses', () => {
       const data = collections.reducers.collectionsReducer(
         undefined,