Merge pull request #3 from felire/pagination

new pagination handle
felire · Jan 15, 2020 · 9bee581 · 9bee581
2 parents f10a85d + 7e770c9
commit 9bee581
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/completers/completeReducer/index.js b/src/completers/completeReducer/index.js
@@ -13,7 +13,8 @@ function completeReducer(reducerDescription) {
   if (
     !reducerDescription ||
     ((!reducerDescription.primaryActions || !reducerDescription.primaryActions.length) &&
-      (!reducerDescription.modalActions || !reducerDescription.modalActions.length))
+      (!reducerDescription.modalActions || !reducerDescription.modalActions.length) &&
+      (!reducerDescription.paginationActions || !reducerDescription.paginationActions.length))
   ) {
     throw new Error('Reducer description is incomplete, should contain at least an actions field to complete');
   }

diff --git a/src/injections/baseThunkAction/index.js b/src/injections/baseThunkAction/index.js
@@ -22,7 +22,7 @@ function baseThunkAction({
     apiCall: async getState => service(finalSelector(getState())),
     determination: response => response.ok,
     paginationAction,
-    pageSelector: { reducerName, target },
+    pageSelector: { reducerName, target, refresh },
     success: (dispatch, response) =>
       dispatch({
         type: `${type}_SUCCESS`,

diff --git a/src/injections/composeInjections/index.js b/src/injections/composeInjections/index.js
@@ -1,8 +1,9 @@
 import mergeInjections from '../mergeInjections';
 
 const checkPaginationNotHasFinished = (state, pageSelector) =>
+  pageSelector.refresh ||
   state[pageSelector.reducerName][`${pageSelector.target}NextPage`] <=
-  state[pageSelector.reducerName][`${pageSelector.target}TotalPages`];
+    state[pageSelector.reducerName][`${pageSelector.target}TotalPages`];
 
 function composeInjections(...injections) {
   const injectionsDescription = mergeInjections(injections);