homeflowjs 1.0.33 → 1.0.35

package/app/user-history.js

@@ -1,36 +1,38 @@
 export const addSearchToLocalStorage = (search) => {
-  // Get search history from local storage
-  let searchHistory = localStorage.getItem('searchHistory');
-  searchHistory = searchHistory ? JSON.parse(searchHistory) : [];
+  // <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;
 
   // Make a new instance of the search object without the page number.
-  const searchWithoutPageNumber = { ...search, page: null };
+  const searchWithoutPageNumberString = JSON.stringify({ ...search, page: null });
 
   // Make a new instance of the last search object without the page number.
-  const lastSearchWithoutPageNumber = { ...searchHistory[0], page: null };
+  const lastSearchWithoutPageNumberString = JSON.stringify({ ...searchHistory[0], page: null });
 
   /**
-   * If the searchWithoutPageNumber and lastSearchWithoutPageNumber match,
+   * If the searchWithoutPageNumberString and lastSearchWithoutPageNumberString match,
    * just update the the last search in local storage to have the search's page number if
    * it has one.
    */
-  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 ((searchWithoutPageNumberString === lastSearchWithoutPageNumberString) && pageNumber) {
+    searchHistory[0].page = pageNumber;
+    localStorage.setItem?.('searchHistory', JSON.stringify(searchHistory));
   }
 
   /**
    * If the search and last search without page numbers don't match add
-   * the search to local storage
+   * the search to local storage.
    */
-  if ((JSON.stringify(searchWithoutPageNumber) !== JSON.stringify(lastSearchWithoutPageNumber))) {
-    // Add the search to the front of the array
-    searchHistory.unshift(search);
-    // Only save the 10 most recent searches
-    localStorage.setItem('searchHistory', JSON.stringify(searchHistory.slice(0, 10)));
+  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),
+    ));
   }
 };
 

package/package.json

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

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

@@ -9,19 +9,22 @@ const BackToSearchButton = ({ children, ...otherProps }) => {
   const lastSearch = JSON.parse(searchHistory)?.[0];
   const secondToLastSearch = JSON.parse(searchHistory)?.[1] || null;
 
-
   let validSearch = lastSearch;
 
   if (secondToLastSearch) {
-    const property =  Homeflow.get('property');
+    const property = Homeflow.get('property');
     const currentPropertyID = property?.propertyId || property?.property_id;
 
-    if (currentPropertyID === secondToLastSearch?.clickedProperty) validSearch = secondToLastSearch;
+    if (currentPropertyID === secondToLastSearch?.clickedProperty) {
+      if ('expandedPolygon' in secondToLastSearch) {
+        const thirdToLastSearch = JSON.parse(searchHistory)?.[2] || null;
+        validSearch = thirdToLastSearch;
+      } else {
+        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/search/property-search/property-search.js

@@ -41,9 +41,10 @@ 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;