homeflowjs 1.0.9 → 1.0.10

package/actions/properties.actions.js

@@ -5,6 +5,17 @@ import { setSearch } from './search.actions';
 import { setLoading } from './app.actions';
 import { JSON_to_URLEncoded, getOfflineSavedProperties } from '../utils';
 
+/*
+ * we need to keep track of all the pages previously loaded
+ * to avoid duplications when running loadNext
+ */
+const loadedPages = new Array();
+
+const addToLoadedPages = (pageNumber) => {
+  if (!loadedPages?.includes(pageNumber)) loadedPages.push(pageNumber);
+  return null;
+};
+
 export const setPropertyLinks = (payload) => ({
   type: PropertiesActionTypes.SET_PROPERTY_LINKS,
   payload,
@@ -167,8 +178,14 @@ export const loadNext = () => (dispatch, getState) => {
   const nextPageSearch = { ...getState().search.initialSearch };
   const currentPageNumber = getState()?.properties?.pagination?.current_page;
 
+  addToLoadedPages(currentPageNumber);
+
+  const sortedLoadedPages = loadedPages?.sort((a, b) => a - b) || null;
+  const highestPageLoaded = sortedLoadedPages ? sortedLoadedPages[sortedLoadedPages?.length - 1] : null;
+
   if (nextPageSearch?.place?.place_id) nextPageSearch.placeId = nextPageSearch?.place?.place_id;
-  nextPageSearch.page = currentPageNumber ? currentPageNumber + 1 : 2;
+
+  nextPageSearch.page = highestPageLoaded ? highestPageLoaded + 1 : 2;
 
   // conduct search ljson
   return fetch(`/search.ljson?${buildQueryString(nextPageSearch)}`)
@@ -190,6 +207,7 @@ export const loadNext = () => (dispatch, getState) => {
         dispatch(setSearch(nextPageSearch));
         dispatch(setProperties(newProperties));
         dispatch(setPagination(json.pagination));
+        addToLoadedPages(json.pagination.current_page);
         dispatch(setLoading({ properties: false }));
       }
     });
@@ -200,7 +218,12 @@ export const loadPage = (payload) => (dispatch, getState) => {
   // set page on search to page + 1
   let newProperties = [...getState().properties.properties];
   const newSearch = { ...getState().search.currentSearch };
+  const currentPageNumber = getState()?.properties?.pagination?.current_page;
+
+  addToLoadedPages(currentPageNumber);
+
   newSearch.page = payload;
+
   // conduct search ljson
   return fetch(`/search.ljson?${buildQueryString(newSearch)}`)
     .then((response) => response.json())
@@ -214,6 +237,7 @@ export const loadPage = (payload) => (dispatch, getState) => {
         dispatch(setSearch(newSearch));
         dispatch(setProperties(newProperties));
         dispatch(setPagination(json.pagination));
+        addToLoadedPages(json.pagination.current_page);
         dispatch(setLoading({ properties: false }));
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",