MUIR-277: align pagination with new Search API

marklogic-community · Aug 3, 2018 · 94c1678 · 94c1678
1 parent 9dba20f
commit 94c1678
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/src/actions/index.js b/src/actions/index.js
@@ -63,17 +63,30 @@ export default config => {
         payload: { query: searchQuery, ...optionalArgs }
       });
 
-      // TODO: send a request directly to middle-tier
-      // with query options, queryText, combined query object as object
-      return searchAPI.search(searchQuery, optionalArgs).then(
-        data => dispatch(receiveSuccessfulSearch(data, optionalArgs)),
-        error => {
-          dispatch({
-            type: types.SEARCH_FAILURE,
-            payload: { error: error.message, ...optionalArgs }
-          });
-        }
-      );
+      // TODO: consider changing shape of state instead of modifying
+      // shape of query here
+      const { page, pageLength, ...muirSearchQuery } = searchQuery;
+      return searchAPI
+        .search(
+          {
+            ...muirSearchQuery,
+            options: {
+              start:
+                pageLength && page ? pageLength * (page - 1) + 1 : undefined,
+              pageLength: pageLength
+            }
+          },
+          optionalArgs
+        )
+        .then(
+          data => dispatch(receiveSuccessfulSearch(data, optionalArgs)),
+          error => {
+            dispatch({
+              type: types.SEARCH_FAILURE,
+              payload: { error: error.message, ...optionalArgs }
+            });
+          }
+        );
     };
   };
 

diff --git a/src/integration.test.js b/src/integration.test.js
@@ -265,7 +265,7 @@ describe('search', () => {
         .then(() => {
           expect(selectors.getPage(store.getState())).toEqual(2);
           expect(mockSearch).toHaveBeenCalledWith(
-            expect.objectContaining({ page: 2 }),
+            expect.objectContaining({ options: { pageLength: 10, start: 11 } }),
             expect.anything()
           );
           done();