homeflowjs 0.13.0 → 0.13.2

package/actions/properties.actions.js

@@ -10,38 +10,34 @@ export const setPropertyLinks = (payload) => ({
 });
 
 // TODO: This method is long and repetitive. Refactor.
-export const setPropertyLinksAsync = () => (dispatch) => {
+export const setPropertyLinksAsync = (page = null) => (dispatch) => {
   const searchHistory = localStorage.getItem('searchHistory');
   if (!searchHistory) return null;
 
   const parsedSearchHistory = JSON.parse(searchHistory);
   if (!Array.isArray(parsedSearchHistory)) return null;
 
-  const validateSearch = (search) =>
-    (!search.isQuerySearch && search?.q)
-    || search?.place
-    || (search.isQuerySearch && search?.placeId)
-    || (search.isQuerySearch && search?.poly);
+  const lastSearch = parsedSearchHistory[0];
 
-  const filteredSearchHistory = parsedSearchHistory.filter(validateSearch)
-  if (!filteredSearchHistory?.length) return null;
-  const lastSearch = filteredSearchHistory[0];
-  const { place, ...restOfSearch } = lastSearch;
-  const searchURL = `/search.ljson?${buildQueryString(restOfSearch)}`;
+  const searchURL = `/search.ljson?${buildQueryString(lastSearch)}`;
 
   const propertyLinks = {
     next: '',
     prev: '',
+    nextPage: false,
+    prevPage: false,
   };
 
   const getPropertyUrl = (property) => property?.property_url || property?.url;
 
   fetch(searchURL)
     .then((response) => response.json())
-    .then(({ properties }) => {
+    .then(({ properties, pagination }) => {
       if (!properties) return;
 
       const index = properties.findIndex((prop) => prop.property_id === Homeflow.get('property').property_id);
+      if (index === -1) return;
+
       // if there is a next and previous property in page, set those
       if (properties[index + 1] && properties[index - 1]) {
         propertyLinks.next = getPropertyUrl(properties[index + 1]);
@@ -50,60 +46,52 @@ export const setPropertyLinksAsync = () => (dispatch) => {
         return dispatch(setPropertyLinks(propertyLinks));
       }
 
-      // if there is no next but there is a previous, conduct search for next page
-      // but use previous
-      if (!properties[index + 1] && properties[index - 1]) {
+      const nextSearch = {
+        ...lastSearch,
+        page: lastSearch.page ? lastSearch.page : 1,
+      };
+
+      // if there is a previous, conduct search for next
+      if (properties[index - 1]) {
         propertyLinks.prev = getPropertyUrl(properties[index - 1]);
+        if (!pagination.has_next_page) return dispatch(setPropertyLinks(propertyLinks));
 
-        const nextSearch = {
-          ...restOfSearch,
-          page: restOfSearch.page ? restOfSearch.page : 1,
-        };
         nextSearch.page += 1;
         const nextSearchURL = `/search.ljson?${buildQueryString(nextSearch)}`;
         fetch(nextSearchURL)
           .then((response) => response.json())
           .then(({ properties }) => {
-            if (!properties) {
-              propertyLinks.next = '';
-            } else {
+            if (properties) {
               propertyLinks.next = getPropertyUrl(properties[0]);
+              propertyLinks.nextPage = true;
             }
 
             return dispatch(setPropertyLinks(propertyLinks));
           });
       }
 
-      // if there is no previous but there is a next, conduct search for previous page
-      // but use next
-      if (!properties[index - 1] && properties[index + 1]) {
+      // if there is a next, conduct search for previous
+      if (properties[index + 1]) {
         propertyLinks.next = getPropertyUrl(properties[index + 1]);
 
-        const nextSearch = {
-          ...restOfSearch,
-          page: restOfSearch.page ? restOfSearch.page : 1,
-        };
-
         // if we're on page 1, there can't be a previous
-        if (nextSearch.page === 1) {
-          propertyLinks.prev = '';
-          return dispatch(setPropertyLinks(propertyLinks));
-        }
+        if (!pagination.has_prev_page) return dispatch(setPropertyLinks(propertyLinks));
 
         nextSearch.page -= 1;
         const nextSearchURL = `/search.ljson?${buildQueryString(nextSearch)}`;
         fetch(nextSearchURL)
           .then((response) => response.json())
           .then(({ properties }) => {
-            if (!properties) {
-              propertyLinks.prev = '';
-            } else {
+            if (properties) {
               propertyLinks.prev = getPropertyUrl(properties[properties.length - 1]);
+              propertyLinks.prevPage = true;
             }
 
             return dispatch(setPropertyLinks(propertyLinks));
           });
       }
+
+      // There is neither a previous nor a next no need to setPropertyLinks as they are already blank
     });
 };
 

package/app/user-history.js

@@ -33,3 +33,11 @@ export const addSearchToLocalStorage = (search) => {
     localStorage.setItem('searchHistory', JSON.stringify(searchHistory.slice(0, 10)));
   }
 };
+
+export const updateLastSearchPageInLocalStorage = (change) => {
+  // 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;
+  localStorage.setItem('searchHistory', JSON.stringify(searchHistory));
+};

package/package.json

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

package/properties/next-property-link/next-property-link.component.jsx

@@ -1,11 +1,20 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-const NextPropertyLink = ({ children, className, link }) => {
+import { updateLastSearchPageInLocalStorage } from '../../app/user-history';
+
+const NextPropertyLink = ({ children, className, link, nextPage }) => {
   if (!link) return null;
 
+  const handleOnClick = () => {
+    if (nextPage) updateLastSearchPageInLocalStorage(1);
+  }
   return (
-    <a className={className} href={link}>
+    <a
+      className={className}
+      href={link}
+      onClick={handleOnClick}
+    >
       {children}
     </a>
   );
@@ -13,63 +22,7 @@ const NextPropertyLink = ({ children, className, link }) => {
 
 const mapStateToProps = (state) => ({
   link: state.properties.propertyLinks.next,
+  nextPage: state.properties.propertyLinks.nextPage,
 });
 
 export default connect(mapStateToProps)(NextPropertyLink);
-
-// probably best to wait until button is clicked before doing all this:
-// conduct search using most recent search in local storage
-// find position of property in search
-// if there is a NEXT property, go to that
-// if not, conduct another search for the next page and render first property
-
-// getNextProperty:()->
-// return @_next_property if @_next_property
-// property = @propertyAfter(@currentPropertyId())
-// if property?
-//   return @_next_property = property
-// else
-//   if (@mostRecentSearch().get('performed_data').properties.length - 1) == @positionOfPropertyInSearch(@currentPropertyId()) && @mostRecentSearch().get('performed_data').pagination.has_next_page
-//     #get next page
-//     new_search = @mostRecentSearch().clone()
-//     current_page = @mostRecentSearch().get('page')
-//     current_page = 1 unless current_page
-//     new_search.unset('performed_data')
-//     new_search.set('page', ( current_page + 1 ))
-//     new_search.performAsData =>
-//       @addSearch(new_search)
-//       @_next_property = new_search.get('performed_data').properties[0]
-//       @_most_recent = undefined
-//       @getOrCreatNextAndPreviousPropertyView().render()
-//   return null
-
-// Trying to emulate this in C2:
-// class Ctesius.Views.NextAndPreviousProperty extends Backbone.View
-
-// template: ->
-//   Ctesius.Template.load('next_and_previous_property_template')
-
-// render: ->
-//   if search = @model.mostRecentSearch()
-//     Homeflow.kickEvent('before_next_and_previous_property_view_rendered', search)
-//     prev =  @model.getPreviousProperty()
-//     next = @model.getNextProperty()
-
-//     @addPrefetch(prev) if prev
-//     @addPrefetch(next) if next
-
-//     pos = @model.positionOfPropertyInSearch(@model.currentPropertyId()) + search.get('performed_data').pagination.from_record
-
-//     _template = this.template()
-//     t = _template.render({next_property: next, previous_property: prev, position: pos , search:  @model.mostRecentSearch()})
-//     for ele in $('[id|="next_and_previous_property_view"]')
-//       $(ele).html(t)
-//     Homeflow.kickEvent('next_and_previous_property_view_rendered', search)
-
-
-// addPrefetch: (property) ->
-//   @_prefetched = {} unless @_prefetched?
-//   unless @_prefetched[property.property_url]?
-//     @_prefetched[property.property_url] = true
-//     $("<link />", {rel: "prerender", href: property.property_url}).appendTo("head");
-//     $.get(property.property_url)

package/properties/previous-property-link/previous-property-link.component.jsx

@@ -1,11 +1,20 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-const PreviousPropertyLink = ({ children, className, link }) => {
+import { updateLastSearchPageInLocalStorage } from '../../app/user-history';
+
+const PreviousPropertyLink = ({ children, className, link, prevPage }) => {
   if (!link) return null;
 
+  const handleOnClick = () => {
+    if (prevPage) updateLastSearchPageInLocalStorage(-1);
+  }
   return (
-    <a className={className} href={link}>
+    <a
+      className={className}
+      href={link}
+      onClick={handleOnClick}
+    >
       {children}
     </a>
   );
@@ -13,6 +22,7 @@ const PreviousPropertyLink = ({ children, className, link }) => {
 
 const mapStateToProps = (state) => ({
   link: state.properties.propertyLinks.prev,
+  prevPage: state.properties.propertyLinks.prevPage,
 });
 
 export default connect(mapStateToProps)(PreviousPropertyLink);