homeflowjs 1.0.21 → 1.0.23

package/app/hf-initialize.jsx

@@ -187,7 +187,6 @@ const hfInitialize = () => {
           place,
         };
       }
-
       store.dispatch(setInitialSearch(searchFromFragment));
       store.dispatch(setSearch(searchFromFragment));
     }

package/app/user-history.js

@@ -40,4 +40,16 @@ export const updateLastSearchPageInLocalStorage = (change) => {
   searchHistory = searchHistory ? JSON.parse(searchHistory) : [];
   searchHistory[0].page = (searchHistory[0].page ? +searchHistory[0].page : 1) + change;
   localStorage.setItem('searchHistory', JSON.stringify(searchHistory));
-};
+};
+
+export const updateLastSearchOnPropertyCardClick = (propertyID) => {
+  // 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);
+  localStorage.setItem('searchHistory', JSON.stringify(newSearchHistory));
+}

package/package.json

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

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

@@ -6,10 +6,23 @@ const BackToSearchButton = ({ children, ...otherProps }) => {
   const searchHistory = localStorage.getItem('searchHistory');
   if (!searchHistory) return null;
 
-  const lastSearch = JSON.parse(searchHistory)[0];
-  // remove the place so we don't get [object Object] in URL
-  const { place, ...restOfSearch } = lastSearch;
-  const href = `/search?${buildQueryString(restOfSearch)}`;
+  const lastSearch = JSON.parse(searchHistory)?.[0];
+  const secondToLastSearch = JSON.parse(searchHistory)?.[1] || null;
+
+
+  let validSearch = lastSearch;
+
+  if (secondToLastSearch) {
+    const property =  Homeflow.get('property');
+    const currentPropertyID = property?.propertyId || property?.property_id;
+
+    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 (
     <a href={href} {...otherProps}>

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

@@ -4,6 +4,7 @@ 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';
 
 const ConditionalWrapper = ({ condition, wrapper, children }) => (
   condition ? wrapper(children) : children
@@ -37,6 +38,8 @@ const PropertiesDisplay = ({
     loadingProperties: loadingPreviousProperties,
   } = useLoadPreviousProperties();
 
+  const visitPropertyUpdate = (id) => updateLastSearchOnPropertyCardClick(id);
+
   useEffect(() => {
     const pageMarkers = document.querySelectorAll('[data-page-marker]');
 
@@ -114,7 +117,7 @@ const PropertiesDisplay = ({
           return (
             <React.Fragment key={property.property_id}>
               {inserts[0].component}
-              <Item property={property} {...other} />
+              <Item property={property} onClick={() => visitPropertyUpdate(property.property_id)} {...other} />
             </React.Fragment>
           );
         } else if (
@@ -126,7 +129,7 @@ const PropertiesDisplay = ({
             return (
               <React.Fragment key={property.property_id}>
                 {findResult.component}
-                <Item property={property} {...other} />
+                <Item property={property} onClick={() => visitPropertyUpdate(property.property_id)} {...other} />
               </React.Fragment>
             );
           }
@@ -135,6 +138,7 @@ const PropertiesDisplay = ({
         return (
           <Item
             key={property.property_id}
+            onClick={() => visitPropertyUpdate(property.property_id)}
             property={property}
             data-page-marker={!addWrapper && index === 0 ? page[0].resultPage : null}
             {...other}

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

@@ -28,6 +28,8 @@ export const buildQueryString = (search) => {
   Object.keys(search).forEach((key) => {
     const value = search[key];
 
+    if (key === 'clickedProperty') return;
+
     if (key === 'pets' && value) return fragmentParams.push('pets');
 
     if (minOrMaxBedZero(key, value)) return fragmentParams.push(fragmentize(key, value));

package/user/reset-password-form/reset-password-form.component.jsx

@@ -7,7 +7,16 @@ import { setCurrentUser } from '../../actions/user.actions';
 import notify from '../../app/notify';
 
 const ResetPasswordForm = ({
-  user, setCurrentUser, inputClass, buttonClass, buttonSpanClass, pattern, patternTitle, redirect,
+  user,
+  setCurrentUser,
+  inputClass,
+  buttonClass,
+  buttonSpanClass,
+  pattern,
+  patternTitle,
+  redirect,
+  newPasswordInputProps,
+  confirmPasswordInputProps,
 }) => {
   const [password, setPassword] = useState('');
   const [passwordConfirmation, setPasswordConfirmation] = useState('');
@@ -47,6 +56,7 @@ const ResetPasswordForm = ({
         className={inputClass}
         pattern={pattern}
         title={patternTitle}
+        {...newPasswordInputProps}
       />
       <input
         name="password_confirmation"
@@ -57,6 +67,7 @@ const ResetPasswordForm = ({
         className={inputClass}
         pattern={pattern}
         title={patternTitle}
+        {...confirmPasswordInputProps}
       />
 
       <button
@@ -87,6 +98,8 @@ ResetPasswordForm.defaultProps = {
   pattern: null,
   patternTitle: null,
   redirect: '/user',
+  newPasswordInputProps: {},
+  confirmPasswordInputProps: {},
 };
 
 const mapStateToProps = (state) => ({