homeflowjs 0.10.7 → 0.10.9

package/app/hf-initialize.jsx

@@ -7,6 +7,8 @@ import initCookieConsent from '../cookie-consent/cookie-consent';
 import notify from './notify';
 import antiCSRF from './anti-csrf';
 import recaptcha from './recaptcha';
+import { addSearchToLocalStorage } from './user-history';
+
 import bookingCalendar from '../booking-calendar/booking-calendar';
 import { setThemePreferences, setThemeSettings, setAuthenticityToken } from '../actions/app.actions';
 import { fetchUser } from '../actions/user.actions';
@@ -89,16 +91,30 @@ const hfInitialize = () => {
   store.dispatch(setThemeSettings(Homeflow.get('theme_settings')));
   store.dispatch(setAuthenticityToken(Homeflow.get('authenticityToken')));
 
+  const pageRoute = Homeflow.get('page_route');
+
   // if we're on the property show page, set next and previous links
-  if (Homeflow.get('property')) {
+  if (pageRoute === 'properties#show') {
     store.dispatch(setPropertyLinksAsync());
   }
 
   // setting articles, pagination and topics on articles index page
-  if (Homeflow.get('articles')) {
+  if (pageRoute === 'articles#index') {
     store.dispatch(setArticles(Homeflow.get('articles')));
   }
 
+  // Add search to add to userHstory in localStorage if this is a search results page
+  if (
+    pageRoute === 'properties#index'
+    || pageRoute === 'postcodes#show'
+    || pageRoute === 'locations#show'
+    || pageRoute === 'counties#show'
+    || pageRoute === 'countries#show'
+  ) {
+    const { search: { currentSearch } } = store.getState();
+    addSearchToLocalStorage(currentSearch);
+  }
+
   return null;
 };
 

package/package.json

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

package/reducers/app.reducer.js

@@ -38,7 +38,7 @@ const appReducer = (state = INITIAL_STATE, action) => {
     case AppActionTypes.SET_THEME_SETTINGS:
       // Add default theme settings with values to set values Object
       Object.keys(state.themeSettings).forEach((key) => {
-        if (state.themeSettings[key].default) {
+        if (typeof state.themeSettings[key].default !== 'undefined') {
           defaultThemeSettingsObject[key] = state.themeSettings[key].default;
         }
       });

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

@@ -6,8 +6,6 @@ import { setSearch, setInitialSearch, setSearchField, setPlace } from '../../act
 import propertySearch from '../property-search/property-search';
 import parseFragment from '../property-search/parse-fragment';
 import { isEmpty } from '../../utils';
-import { addSearchToLocalStorage } from '../../app/user-history';
-import store from '../../store';
 
 class SearchForm extends Component {
   componentDidMount() {
@@ -57,10 +55,6 @@ class SearchForm extends Component {
     }
 
     if (defaultChannel) setSearchField({ channel: defaultChannel });
-
-    // after search has been fully updated, add to userHstory in localStorage
-    const { search: { currentSearch } } = store.getState();
-    addSearchToLocalStorage(currentSearch);
   }
 
   handleSubmit(e) {