remove storeInState parameter of fetchPage

Author: asauber

src/api/external.js

@@ -55,15 +55,13 @@ function genThunkOne(config, actions) {
  * The results are returned.
  */
 function genThunkPage(config, actions) {
-  function fetchPage(page = 0, ids = [], resourceFilter, storeInState = true, headers) {
+  function fetchPage(page = 0, ids = [], resourceFilter, headers) {
     return async (dispatch) => {
       const endpoint = `${config.endpoint(...ids, '')}?page=${page + 1}`;
       const resources = await dispatch(fetch.get(endpoint, undefined, headers));
-      resources[config.plural] = resources.data || [];
+      resources[config.name] = resources.data || [];
       const filteredResources = filterResources(config, resources, resourceFilter);
-      if (storeInState) {
-        await dispatch(actions.many(filteredResources, ...ids));
-      }
+      await dispatch(actions.many(filteredResources, ...ids));
       return filteredResources;
     };
   }
@@ -79,13 +77,13 @@ function genThunkAll(config, actions, fetchPage) {
     return async (dispatch) => {
       // Grab first page so we know how many there are.
       const resource = await dispatch(
-        fetchPage(0, ids, resourceFilter, true, options));
+        fetchPage(0, ids, resourceFilter, options));
       const resources = [resource];
 
       // Grab all pages we know about and store them in Redux.
       const requests = [];
       for (let i = 1; i < resources[0].pages; i += 1) {
-        requests.push(fetchPage(i, ids, resourceFilter, true, options));
+        requests.push(fetchPage(i, ids, resourceFilter, options));
       }
 
       // Gather all the results for for return to the caller

src/components/PollingWrapper.js

@@ -104,7 +104,7 @@ const mapStateToProps = (state) => ({
 const mapDispatchToProps = (dispatch) => ({
   dispatch,
   fetchEventsPage(headers = null) {
-    return dispatch(api.events.page(0, [], null, true, null, headers));
+    return dispatch(api.events.page(0, [], null, headers));
   },
 });
 export default withRouter(connect(mapStateToProps, mapDispatchToProps)(PollingWrapper));

src/components/notifications/index.js

@@ -123,7 +123,7 @@ class Notifications extends Component {
 
   fetchEventsPage(headers = null) {
     const { dispatch } = this.props;
-    return dispatch(api.events.page(0, [], null, true, null, headers));
+    return dispatch(api.events.page(0, [], null, headers));
   }
 
   render() {
@@ -188,7 +188,7 @@ const mapDispatchToProps = (dispatch) => ({
     }
   },
   fetchEventsPage(headers = null) {
-    return dispatch(api.events.page(0, [], null, true, null, headers));
+    return dispatch(api.events.page(0, [], null, headers));
   },
 });