homeflowjs 0.11.10 → 0.12.1

package/app/hf-initialize.jsx

@@ -14,7 +14,10 @@ import { fetchUser } from '../actions/user.actions';
 import {
   setProperties, setPagination, setProperty, setPropertyLinksAsync,
 } from '../actions/properties.actions';
+import { setSearch, setInitialSearch, setSearchField, setPlace } from '../actions/search.actions';
 import { setArticles } from '../actions/articles.actions';
+import parseFragment from '../search/property-search/parse-fragment';
+import { isEmpty } from '../utils';
 
 const hfInitialize = () => {
   if (!window.Homeflow) {
@@ -102,6 +105,39 @@ const hfInitialize = () => {
     store.dispatch(setArticles(Homeflow.get('articles')));
   }
 
+  if (pageRoute === 'properties#index') {
+    const searchFromFragment = parseFragment(window.location.pathname);
+    const defaultStatus = store.getState().app.themePreferences.default_search_status;
+
+    if (!isEmpty(searchFromFragment)) {
+      if (defaultStatus && !searchFromFragment.status) {
+        searchFromFragment.status = defaultStatus;
+      }
+
+      const branchID = Homeflow.get('branch_id');
+      if (branchID) searchFromFragment.branch_id = branchID;
+
+      store.dispatch(setInitialSearch(searchFromFragment));
+      store.dispatch(setSearch(searchFromFragment));
+    } else {
+      if (defaultStatus && !search.status) store.dispatch(setSearchField({ status: defaultStatus }));
+    }
+
+    const place = Homeflow.get('place');
+    if (place) {
+      store.dispatch(setPlace(place));
+      store.dispatch(setInitialSearch({
+        q: place.name + (place.county_name ? `, ${place.county_name}` : ''),
+        place,
+      }));
+    }
+    const expandedPolygon = Homeflow.get('expanded_polygon');
+    if (expandedPolygon) {
+      store.dispatch(setSearchField({ expandedPolygon }));
+      store.dispatch(setInitialSearch({ expandedPolygon }));
+    }
+  }
+
   return null;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.11.10",
+  "version": "0.12.1",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

package/properties/properties-map/draggable-map.js

@@ -125,7 +125,7 @@ export default class DraggableMap {
   generateMarker(property) {
     const marker = L.marker(
       [property.lat, property.lng],
-      { title: property.name, icon: Homeflow.get('custom_property_pin')(property) }
+      { title: property.name, icon: this.generateMarkerIcon(property) }
     );
 
     // add the property to marker attributes so they can be accessed on click

package/reducers/search.reducer.js

@@ -10,6 +10,7 @@ const INITIAL_STATE = {
     suggestions: [],
     tags: [],
     poly: '',
+    auctionDate: '',
   },
   initialSearch: {}, // original search when the page first loads
   savedSearches: [],

package/search/property-search/constants.js

@@ -21,4 +21,5 @@ export const FRAGMENT_BOOKENDS = {
   shortLets: 'short-lets',
   tags: ['tag-'],
   sorted: '',
+  auctionDate: 'auction-date-',
 };

package/search/property-search/parse-fragment.js

@@ -41,6 +41,11 @@ export default (fragment) => {
       return;
     }
 
+    if (part.startsWith('auction-date-')) {
+      search.auctionDate = part.replace('auction-date-', '');
+      return;
+    }
+
     if (part.startsWith('gid-')) {
       search.placeId = part.replace(/^gid-/, '');
       return;

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

@@ -12,6 +12,8 @@ const fragmentize = (key, value) => {
 
   if (key === 'poly') return pattern[0] + base64.encode(value);
 
+  if (key === 'auctionDate') return `${pattern}${value}`;
+
   if (typeof pattern === 'string') return pattern;
 
   return `${pattern[0] ? pattern[0] : ''}${value}${pattern[1] ? pattern[1] : ''}`;

package/search/search-form/search-form.component.jsx

@@ -26,32 +26,8 @@ class SearchForm extends Component {
       if (defaultSort && !searchFromFragment.sorted) {
         searchFromFragment.sorted = defaultSort;
       }
-      if (defaultStatus && !searchFromFragment.status) {
-        searchFromFragment.status = defaultStatus;
-      }
-
-      const branchID = Homeflow.get('branch_id');
-      if (branchID) searchFromFragment.branch_id = branchID;
-
-      setInitialSearch(searchFromFragment);
-      setSearch(searchFromFragment);
     } else {
       if (defaultSort && !search.sorted) setSearchField({ sorted: defaultSort });
-      if (defaultStatus && !search.status) setSearchField({ status: defaultStatus });
-    }
-
-    const place = Homeflow.get('place');
-    if (place) {
-      setPlace(place);
-      setInitialSearch({
-        q: place.name + (place.county_name ? `, ${place.county_name}` : ''),
-        place,
-      });
-    }
-    const expandedPolygon = Homeflow.get('expanded_polygon');
-    if (expandedPolygon) {
-      setSearchField({ expandedPolygon });
-      setInitialSearch({ expandedPolygon });
     }
 
     if (defaultChannel) setSearchField({ channel: defaultChannel });