homeflowjs 0.7.4 → 0.7.8

package/actions/app.actions.js

@@ -10,6 +10,11 @@ export const setThemePreferences = (payload) => ({
   payload,
 });
 
+export const setThemeSettings = (payload) => ({
+  type: AppActionTypes.SET_THEME_SETTINGS,
+  payload,
+});
+
 export const setAuthenticityToken = (payload) => ({
   type: AppActionTypes.SET_AUTHENTICITY_TOKEN,
   payload,

package/actions/app.types.js

@@ -1,6 +1,7 @@
 const AppActionTypes = {
   SET_LOADING: 'SET_LOADING',
   SET_THEME_PREFERENCES: 'SET_THEME_PREFERENCES',
+  SET_THEME_SETTINGS: 'SET_THEME_SETTINGS',
   SET_AUTHENTICITY_TOKEN: 'SET_AUTHENTICITY_TOKEN',
 };
 

package/package.json

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

package/properties/properties-list/properties-list.component.jsx

@@ -18,7 +18,9 @@ const PropertiesList = ({ properties, ListItem, infiniteScroll }) => {
     };
   });
 
-  const items = propertiesByPage(properties).map((page) => (
+  const propertiesToRender = properties || [];
+
+  const items = propertiesByPage(propertiesToRender).map((page) => (
     <div
       data-result-page={page[0].resultPage}
       key={uniqueKey()}
@@ -38,11 +40,15 @@ const PropertiesList = ({ properties, ListItem, infiniteScroll }) => {
 };
 
 PropertiesList.propTypes = {
-  properties: PropTypes.array.isRequired,
+  properties: PropTypes.array,
   ListItem: PropTypes.elementType.isRequired,
   infiniteScroll: PropTypes.bool.isRequired,
 };
 
+PropertiesList.defaultProps = {
+  properties: [],
+};
+
 const mapStateToProps = state => ({
   properties: state.properties.properties,
 });

package/reducers/app.reducer.js

@@ -14,6 +14,7 @@ const INITIAL_STATE = {
     googleMaps: true,
   },
   themePreferences: {},
+  themeSettings: {},
 };
 
 const appReducer = (state = INITIAL_STATE, action) => {
@@ -31,6 +32,11 @@ const appReducer = (state = INITIAL_STATE, action) => {
         ...state,
         themePreferences: action.payload,
       };
+    case AppActionTypes.SET_THEME_SETTINGS:
+      return {
+        ...state,
+        themeSettings: action.payload,
+      };
     case AppActionTypes.SET_AUTHENTICITY_TOKEN:
       return {
         ...state,

package/search/index.js

@@ -9,8 +9,10 @@ import StatusCheckbox from './status-checkbox/status-checkbox.component';
 import GenericSearchField from './generic-search-field/generic-search-field.component';
 import GeolocateButton from './geolocate-button/geolocate-button.component';
 import SaveSearchButton from './save-search-button/save-search-button.component';
+import RemoveSavedSearchButton from '../properties/remove-saved-property-button/remove-saved-property-button.component';
 import SavedSearch from './saved-search/saved-search.component';
 import propertySearch from './property-search/property-search';
+import generateSearchDescription from './saved-search/generate-description';
 
 export {
   SearchForm,
@@ -23,6 +25,8 @@ export {
   StatusCheckbox,
   GenericSearchField,
   GeolocateButton,
+  RemoveSavedSearchButton,
+  generateSearchDescription,
   SaveSearchButton,
   SavedSearch,
   propertySearch,

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

@@ -14,6 +14,7 @@ class SearchForm extends Component {
     const {
       defaultSort,
       defaultChannel,
+      defaultStatus,
       search,
       setSearch,
       setInitialSearch,
@@ -27,10 +28,14 @@ class SearchForm extends Component {
       if (defaultSort && !searchFromFragment.sorted) {
         searchFromFragment.sorted = defaultSort;
       }
+      if (defaultStatus && !searchFromFragment.status) {
+        searchFromFragment.status = defaultStatus;
+      }
       setInitialSearch(searchFromFragment);
       setSearch(searchFromFragment);
     } else {
       if (defaultSort && !search.sorted) setSearchField({ sorted: defaultSort });
+      if (defaultStatus && !search.status) setSearchField({ status: defaultStatus });
     }
 
     const place = Homeflow.get('place');
@@ -62,6 +67,7 @@ class SearchForm extends Component {
     const {
       defaultSort,
       defaultChannel,
+      defaultStatus,
       search,
       setSearch,
       setSearchField,
@@ -96,6 +102,7 @@ SearchForm.propTypes = {
 
 const mapStateToProps = state => ({
   search: state.search.currentSearch,
+  defaultStatus: state.app.themePreferences.default_search_status,
 });
 
 const mapDispatchToProps = {

package/store.js

@@ -3,7 +3,7 @@ import thunk from 'redux-thunk';
 import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
 // import logger from 'redux-logger';
 import rootReducer from './reducers';
-import { setThemePreferences, setAuthenticityToken } from './actions/app.actions';
+import { setThemePreferences, setThemeSettings, setAuthenticityToken } from './actions/app.actions';
 import { fetchUser } from './actions/user.actions';
 import { setProperties, setPagination, setPropertyLinksAsync } from './actions/properties.actions';
 // import { fetchCompanyPreferences } from './actions/company-preferences.actions';
@@ -32,6 +32,7 @@ window.addEventListener('DOMContentLoaded', () => {
 store.dispatch(setProperties(Homeflow.get('properties')));
 store.dispatch(setPagination(Homeflow.get('pagination')));
 store.dispatch(setThemePreferences(Homeflow.get('theme_preferences')));
+store.dispatch(setThemeSettings(Homeflow.get('theme_settings')));
 store.dispatch(setAuthenticityToken(Homeflow.get('authenticityToken')));
 
 // if we're on the property show page, set next and previous links