homeflowjs 1.0.41 → 1.0.43

package/app/user-history.js

@@ -1,21 +1,58 @@
+const sortSearchToCompare = (search) => Object.keys(search).sort().reduce((accumulator, currentValue) => {
+  accumulator[currentValue] = search[currentValue];
+  return accumulator;
+}, {});
+
 export const addSearchToLocalStorage = (search) => {
+  const searchSize = Object.keys(search).length;
+  const pageRoute = Homeflow.get('page_route') || '';
+  const propertyId = Homeflow.get('property')?.property_id || null;
+
+  let theSearch = search;
+  /**
+   * placeId may only be added to the 2nd page load, if added in advance
+   * both search terms will match
+   */
+  if (!theSearch?.placeId && theSearch?.place?.place_id) {
+    theSearch = { ...theSearch, placeId: theSearch?.place?.place_id };
+  }
+
+  // Don't add expandedPolygon object to the local search
+  if (searchSize === 1 && theSearch?.expandedPolygon) return null;
+
   // 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 searchWithoutPageNumber = { ...search, page: null };
+  let searchWithoutPageNumber = { ...theSearch, page: null, expandedPolygon: null };
+  searchWithoutPageNumber = sortSearchToCompare(searchWithoutPageNumber);
 
   // Make a new instance of the last search object without the page number.
-  const lastSearchWithoutPageNumber = { ...searchHistory[0], page: null };
+  let lastSearchWithoutPageNumber = { ...searchHistory[0], page: null, expandedPolygon: null };
+  lastSearchWithoutPageNumber = sortSearchToCompare(lastSearchWithoutPageNumber);
+
+  /**
+   * If the current viewed property is the same as the clicked before
+   * don't add the search to the local searches
+   * and keep the current last.
+   */
+  if (
+    pageRoute === 'properties#show'
+    && propertyId
+    && lastSearchWithoutPageNumber?.clickedProperty
+  ) {
+    if (+lastSearchWithoutPageNumber.clickedProperty === +propertyId) return null;
+  }
 
   /**
    * 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 ((JSON.stringify(searchWithoutPageNumber) === JSON.stringify(lastSearchWithoutPageNumber)) && search?.page) {
-    const lastSearchWithUpdatedPageNumber = { ...searchHistory[0], page: search.page };
+  if ((JSON.stringify(searchWithoutPageNumber) === JSON.stringify(lastSearchWithoutPageNumber)) && theSearch?.page) {
+    const lastSearchWithUpdatedPageNumber = { ...searchHistory[0], page: theSearch.page };
     searchHistory.shift();
     searchHistory.unshift(lastSearchWithUpdatedPageNumber);
     localStorage.setItem('searchHistory', JSON.stringify(searchHistory));
@@ -27,28 +64,50 @@ export const addSearchToLocalStorage = (search) => {
    */
   if ((JSON.stringify(searchWithoutPageNumber) !== JSON.stringify(lastSearchWithoutPageNumber))) {
     // Add search to the front of the array ...
-    searchHistory.unshift(search);
+    searchHistory.unshift(theSearch);
     // ... and ensure only 10 most recent searches in history.
     localStorage.setItem('searchHistory', JSON.stringify(searchHistory.slice(0, 10)));
   }
 };
 
-export const updateLastSearchPageInLocalStorage = (change) => {
+export const updateLastSearchPageInLocalStorage = (change, toChange = false) => {
   // Get search history from local storage
   let searchHistory = localStorage.getItem('searchHistory');
   searchHistory = searchHistory ? JSON.parse(searchHistory) : [];
-  searchHistory[0].page = (searchHistory[0].page ? +searchHistory[0].page : 1) + change;
+  if (toChange) {
+    searchHistory[0].page = change;
+  } else {
+    searchHistory[0].page = (searchHistory[0].page ? +searchHistory[0].page : 1) + change;
+  }
   localStorage.setItem('searchHistory', JSON.stringify(searchHistory));
 };
 
-export const updateLastSearchOnPropertyCardClick = (propertyID) => {
+export const updateLastSearchOnPropertyCardClick = (propertyID, remove = false) => {
   // Get search history from local storage
   let searchHistory = localStorage.getItem('searchHistory');
   searchHistory = searchHistory ? JSON.parse(searchHistory) : [];
 
   if (searchHistory?.length === 0) return null;
 
-  // Add property about to be visited to the search object in local storage
-  const newSearchHistory = searchHistory.map((search, index) => index === 0 ?  {...search, clickedProperty: propertyID } : search);
+  const newSearchHistory = searchHistory.map((search, index) => {
+    if (index === 0) {
+      if (remove && search?.clickedProperty && propertyID === search?.clickedProperty) {
+        const { clickedProperty, ...rest } = search;
+        /**
+         * Remove clickedProperty from last search on back to search
+         * if last property clicked  and current property match
+         */
+        return { ...rest };
+      }
+      /**
+       * Add property about to be visited to the search object in local storage
+       */
+      return {
+        ...search,
+        clickedProperty: propertyID,
+      }
+    }
+    return search;
+  });
   localStorage.setItem('searchHistory', JSON.stringify(newSearchHistory));
 }

package/hooks/use-load-previous-properties.jsx

@@ -32,7 +32,9 @@ const useLoadPreviousProperties = () => {
     if (currentFirstPage > 1) {
       dispatch(loadPage(currentFirstPage - 1))
         .then(() => {
-          addSearchToLocalStorage(currentSearch);
+          const pageNumber = currentSearch?.page ? currentSearch?.page - 1 : 1;
+          const searchToLocal = {...currentSearch, page: pageNumber };
+          addSearchToLocalStorage(searchToLocal);
           updatePageInURL(currentFirstPage - 1);
           setCurrentTopPage(currentFirstPage - 1);
         });

package/package.json

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

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

@@ -1,5 +1,5 @@
 import React from 'react';
-
+import { updateLastSearchOnPropertyCardClick } from '../../app/user-history';
 import { buildQueryString } from '../../search/property-search/property-search';
 
 const BackToSearchButton = ({ children, ...otherProps }) => {
@@ -8,23 +8,30 @@ const BackToSearchButton = ({ children, ...otherProps }) => {
 
   const lastSearch = JSON.parse(searchHistory)?.[0];
   const secondToLastSearch = JSON.parse(searchHistory)?.[1] || null;
+  const property = Homeflow.get('property');
+  const currentPropertyID = property?.propertyId || property?.property_id || null;
 
   let validSearch = lastSearch;
-
-  if (secondToLastSearch) {
-    const property = Homeflow.get('property');
-    const currentPropertyID = property?.propertyId || property?.property_id;
-
-    if (currentPropertyID === secondToLastSearch?.clickedProperty) validSearch = secondToLastSearch;
+  
+  if (!lastSearch?.clickedProperty || lastSearch?.clickedProperty !== currentPropertyID) {
+    if (secondToLastSearch && !lastSearch?.clickedProperty) {
+      if (currentPropertyID === secondToLastSearch?.clickedProperty) validSearch = secondToLastSearch;
+    }
   }
 
-  // delete the 'place' so we don't get [object Object] in URL if place is found in object.
+  /**
+   * Delete the 'place' so we don't get [object Object] in URL if place is found in object.
+   * And also the expanded polygon array in URL if expanded polygon is found in object
+   */
   if (validSearch?.place) delete validSearch.place;
+  if (validSearch?.expandedPolygon) delete validSearch.expandedPolygon;
 
-  const href = `/search?${buildQueryString(validSearch)}`;
+  const href = `/search?${buildQueryString(validSearch, true)}`;
 
+  const removeFromSearch = (id) => updateLastSearchOnPropertyCardClick(id, true);
+  
   return (
-    <a href={href} {...otherProps}>
+    <a href={href} onClick={() => removeFromSearch(property?.propertyId || property?.property_id)} {...otherProps}>
       {children}
     </a>
   );

package/properties/load-more-button/load-more-button.component.jsx

@@ -32,7 +32,9 @@ const LoadMoreButton = (props) => {
         dispatch(loadNext())
           .then(() => {
             setLoading(false);
-            addSearchToLocalStorage(currentSearch);
+            const pageNumber = currentSearch?.page ? currentSearch?.page + 1 : 2;
+            const searchToLocal = {...currentSearch, page: pageNumber };
+            addSearchToLocalStorage(searchToLocal);
           });
       }}
       {...otherProps}

package/properties/properties-display/properties-display.component.jsx

@@ -1,10 +1,9 @@
 import React, { useEffect, useRef, useMemo } from 'react';
 import { connect, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-
 import { propertiesByPage, updatePageInURL } from '../property-utils/property-utils';
 import { usePropertyInfiniteScroll, useLoadPreviousProperties } from '../../hooks';
-import { updateLastSearchOnPropertyCardClick } from '../../app/user-history.js';
+import { updateLastSearchOnPropertyCardClick, updateLastSearchPageInLocalStorage } from '../../app/user-history.js';
 
 const ConditionalWrapper = ({ condition, wrapper, children }) => (
   condition ? wrapper(children) : children
@@ -47,6 +46,7 @@ const PropertiesDisplay = ({
       entries.forEach((entry) => {
         if (entry.isIntersecting && entry.target?.dataset?.pageMarker) {
           updatePageInURL(parseInt(entry.target.dataset.pageMarker, 10));
+          updateLastSearchPageInLocalStorage(parseInt(entry.target.dataset.pageMarker, 10), true);
         }
       });
     });
@@ -61,7 +61,6 @@ const PropertiesDisplay = ({
   }, [properties]);
 
   const addWrapper = displayType === 'list';
-
   const showPreviousBtn = includePreviousBtn && hasPreviousPage && !loadingPreviousProperties;
   const showPreviousLoader = includePreviousBtn
     && InfiniteScrollLoader
@@ -180,6 +179,7 @@ PropertiesDisplay.propTypes = {
   Item: PropTypes.elementType.isRequired,
   displayType: PropTypes.string.isRequired,
   infiniteScroll: PropTypes.bool.isRequired,
+  includePreviousBtn: PropTypes.bool.isRequired,
   InfiniteScrollLoader: PropTypes.func,
   inserts: PropTypes.array,
   noResultsMessage: PropTypes.node,
@@ -188,6 +188,7 @@ PropertiesDisplay.propTypes = {
 PropertiesDisplay.defaultProps = {
   inserts: null,
   InfiniteScrollLoader: null,
+  includePreviousBtn: false,
   noResultsMessage: <p>There were no properties matching your search.</p>,
 };
 

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

@@ -21,7 +21,7 @@ const fragmentize = (key, value) => {
 
 const minOrMaxBedZero = (key, value) => (key === 'minBeds' || key === 'maxBeds') && value === 0;
 
-export const buildQueryString = (search) => {
+export const buildQueryString = (search, withPlace = false) => {
   const queryParams = [];
   const fragmentParams = [];
 
@@ -39,10 +39,18 @@ export const buildQueryString = (search) => {
     if (Array.isArray(value) && !value.length) return;
 
     // 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 === 'q' && !search.isQuerySearch)
+      || (key === 'placeId' && search.isQuerySearch)
+      || (!withPlace && key === 'place')
+      || (key === 'poly' && search.isQuerySearch)
+    ) return;
+
+    // add place id
+    if (withPlace
+      && key === 'place'
+      && value?.place_id
+    ) 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;

package/utils/stamp-duty-calculator/english-rates.js

@@ -58,7 +58,7 @@ const englishRates = (
     totalRate = rate1 + rate2 + rate3 + rate4 + rate5;
 
     // Apply additional rate for non-UK residents only if applicable
-    if (!ukResident && additionalProperty) {
+    if (!ukResident) {
       totalRate += price * 0.02; // Non-UK resident surcharge
     }
   }

package/utils/stamp-duty-calculator/welsh-rates.js

@@ -10,50 +10,50 @@ const welshRates = (price, additionalProperty, ukResident) => {
 
   if (additionalProperty) {
     // Rate 1
-    if (price > 180000) rate1 = 180000 * 0.04;
+    if (price > 180000) rate1 = 180000 * 0.05;
     if (price <= 180000) {
-      rate1 = price * 0.04;
+      rate1 = price * 0.05;
     }
 
     // Rate 2
     if (price - 180000 > 0) {
       if ((price - 180000) > (250000 - 180000)) {
-        rate2 = (250000 - 180000) * 0.075;
+        rate2 = (250000 - 180000) * 0.085;
       } else {
-        rate2 = (price - 180000) * 0.075;
+        rate2 = (price - 180000) * 0.085;
       }
     }
 
     // Rate 3
     if (price - 250000 > 0) {
       if ((price - 250000) > (400000 - 250000)) {
-        rate3 = (400000 - 250000) * 0.09;
+        rate3 = (400000 - 250000) * 0.10;
       } else {
-        rate3 = (price - 250000) * 0.09;
+        rate3 = (price - 250000) * 0.10;
       }
     }
 
     // Rate 4
     if (price - 400000 > 0) {
       if ((price - 400000) > (750000 - 400000)) {
-        rate4 = (750000 - 400000) * 0.115;
+        rate4 = (750000 - 400000) * 0.125;
       } else {
-        rate4 = (price - 400000) * 0.115;
+        rate4 = (price - 400000) * 0.125;
       }
     }
 
     // Rate 5
     if (price - 750000 > 0) {
       if ((price - 750000) > (1500000 - 750000)) {
-        rate5 = (1500000 - 750000) * 0.14;
+        rate5 = (1500000 - 750000) * 0.15;
       } else {
-        rate5 = (price - 750000) * 0.14;
+        rate5 = (price - 750000) * 0.15;
       }
     }
 
     // Rate 6
     if (price - 1500000 > 0) {
-      rate6 = (price - 1500000) * 0.160;
+      rate6 = (price - 1500000) * 0.17;
     }
   }