homeflowjs 1.0.35 → 1.0.37

package/app/user-history.js

@@ -1,38 +1,35 @@
 export const addSearchToLocalStorage = (search) => {
-  // <search> format: {channel: 'sales'}
-
-  // Get search history from local storage.
-  // <searchHistory> format: [{channel: 'sales'}, {channel: 'sales'}]
-  const searchHistory = JSON.parse(localStorage.getItem?.('searchHistory') || null) || [];
-
-  // Get current page number from Homeflow state.
-  const pageNumber = Homeflow.getState?.().properties?.pagination?.current_page;
+  // Get search history from local storage
+  let searchHistory = localStorage.getItem('searchHistory');
+  searchHistory = searchHistory ? JSON.parse(searchHistory) : [];
 
   // Make a new instance of the search object without the page number.
-  const searchWithoutPageNumberString = JSON.stringify({ ...search, page: null });
+  const searchWithoutPageNumber = { ...search, page: null };
 
   // Make a new instance of the last search object without the page number.
-  const lastSearchWithoutPageNumberString = JSON.stringify({ ...searchHistory[0], page: null });
+  const lastSearchWithoutPageNumber = { ...searchHistory[0], page: null };
 
   /**
-   * If the searchWithoutPageNumberString and lastSearchWithoutPageNumberString match,
+   * If the searchWithoutPageNumber and lastSearchWithoutPageNumber match,
    * just update the the last search in local storage to have the search's page number if
    * it has one.
    */
-  if ((searchWithoutPageNumberString === lastSearchWithoutPageNumberString) && pageNumber) {
-    searchHistory[0].page = pageNumber;
-    localStorage.setItem?.('searchHistory', JSON.stringify(searchHistory));
+  if ((JSON.stringify(searchWithoutPageNumber) === JSON.stringify(lastSearchWithoutPageNumber)) && search?.page) {
+    const lastSearchWithUpdatedPageNumber = { ...searchHistory[0], page: search.page };
+    searchHistory.shift();
+    searchHistory.unshift(lastSearchWithUpdatedPageNumber);
+    localStorage.setItem('searchHistory', JSON.stringify(searchHistory));
   }
 
   /**
    * If the search and last search without page numbers don't match add
    * the search to local storage.
    */
-  if (searchWithoutPageNumberString !== lastSearchWithoutPageNumberString) {
-    // Add <search> to the front of the array and ensure only 10 most recent searches in history.
-    localStorage.setItem('searchHistory', JSON.stringify(
-      [{ ...search }, ...searchHistory].slice(0, 10),
-    ));
+  if ((JSON.stringify(searchWithoutPageNumber) !== JSON.stringify(lastSearchWithoutPageNumber))) {
+    // Add search to the front of the array ...
+    searchHistory.unshift(search);
+    // ... and ensure only 10 most recent searches in history.
+    localStorage.setItem('searchHistory', JSON.stringify(searchHistory.slice(0, 10)));
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",
@@ -8,7 +8,8 @@
     "properties/properties-map/**/*",
     "properties/property-map/**/*",
     "properties/property-streetview/**/*",
-    "properties/stamp-duty-calculator/**/*"
+    "properties/stamp-duty-calculator/**/*",
+    "properties/property-results-pagination/**/*"
   ],
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",

package/properties/back-to-search-button/back-to-search-button.component.jsx

@@ -15,16 +15,12 @@ const BackToSearchButton = ({ children, ...otherProps }) => {
     const property = Homeflow.get('property');
     const currentPropertyID = property?.propertyId || property?.property_id;
 
-    if (currentPropertyID === secondToLastSearch?.clickedProperty) {
-      if ('expandedPolygon' in secondToLastSearch) {
-        const thirdToLastSearch = JSON.parse(searchHistory)?.[2] || null;
-        validSearch = thirdToLastSearch;
-      } else {
-        validSearch = secondToLastSearch;
-      }
-    }
+    if (currentPropertyID === secondToLastSearch?.clickedProperty) validSearch = secondToLastSearch;
   }
 
+  // delete the 'place' so we don't get [object Object] in URL if place is found in object.
+  if (validSearch?.place) delete validSearch.place;
+
   const href = `/search?${buildQueryString(validSearch)}`;
 
   return (

package/properties/property-results-pagination/property-results-pagination.component.jsx

@@ -47,6 +47,18 @@ export default function PropertyResultsPagination({
    * currentPage = 3;
    * pageCount = 100;
    *'Should output: [ 3, 4, 5, 6]'
+   *
+   * currentPage = 100;
+   * pageCount = 100;
+   * 'Should output: [ 96, 97, 98, 99]'
+   *
+   * currentPage = 3;
+   * pageCount = 3;
+   * 'Should output: [ 2 ]'
+   *
+   * currentPage = 1;
+   * pageCount = 3;
+   * 'Should output: [ 2 ]'
    * @returns {number[]} An array of page numbers for pagination.
    */
   const getPaginationIncrements = () => {
@@ -59,10 +71,18 @@ export default function PropertyResultsPagination({
       startIncrement++;
       endIncrement++;
     }
+
     if (endIncrement >= pageCount) {
       endIncrement = pageCount;
     }
 
+    // If on the final page
+    if (currentPage === pageCount) {
+      startIncrement = pageCount >= paginationIncrements
+        ? currentPage - paginationIncrements : currentPage - (paginationIncrements - currentPage);
+      endIncrement = currentPage;
+    }
+
     for (let i = startIncrement; i < endIncrement; i++) {
       pagination.push(i);
     }

package/search/property-search/property-search.js

@@ -41,10 +41,9 @@ export const buildQueryString = (search) => {
     // only include either q or place ID
     if ((key === 'q' && !search.isQuerySearch)
         || (key === 'placeId' && search.isQuerySearch)
+        || (key === 'place')
         || (key === 'poly' && search.isQuerySearch)) return;
 
-    if (key === 'place') return queryParams.push(`place_id=${value?.place_id}`);
-
     // Don't include branch_id if a search term has been entered
     if (key === 'branch_id' && search.isQuerySearch) return;