homeflowjs 0.14.3 → 1.0.1

package/actions/properties.actions.js

@@ -147,8 +147,9 @@ export const loadNext = () => (dispatch, getState) => {
   dispatch(setLoading({ properties: true }));
   // set page on search to page + 1
   let newProperties = [...getState().properties.properties];
-  const nextPageSearch = { ...getState().search.currentSearch };
-  nextPageSearch.page = nextPageSearch.page ? nextPageSearch.page + 1 : 2;
+  const nextPageSearch = { ...getState().search.initialSearch };
+  const currentPageNumber = getState()?.properties?.pagination?.current_page;
+  nextPageSearch.page = currentPageNumber ? currentPageNumber + 1 : 2;
   // conduct search ljson
   return fetch(`/search.ljson?${buildQueryString(nextPageSearch)}`)
     .then((response) => response.json())

package/package.json

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

package/search/bedrooms-select/bedrooms-select.component.jsx

@@ -19,6 +19,7 @@ const NormalSelect = ({
   maxBeds,
   placeholder,
   bedOptionText,
+  abbreviatedPlaceholder,
   ...otherProps
 }) => {
   const isNumberArray = (array) => array.every((item) => typeof item === 'number');
@@ -37,7 +38,7 @@ const NormalSelect = ({
         title={`${type} beds`}
         className={optionClass}
       >
-        {placeholder || `${capitalizeFirstLetter(type)}. bedrooms`}
+        {placeholder || `${capitalizeFirstLetter(type)}. bed${abbreviatedPlaceholder ? '' : 'room'}s`}
       </option>
       {bedValues.map((item) => (
         isNumberArray(bedValues) ? (
@@ -75,6 +76,7 @@ const ReactSelect = (props) => {
     value,
     placeholder,
     bedOptionText,
+    abbreviatedPlaceholder,
   } = props;
 
   const bedOptions = bedValues.map((bedValue) => ({
@@ -90,7 +92,7 @@ const ReactSelect = (props) => {
       className={className}
       options={bedOptions}
       styles={styles}
-      placeholder={placeholder || `${capitalizeFirstLetter(type)} bedrooms`}
+      placeholder={placeholder || `${capitalizeFirstLetter(type)} bed${abbreviatedPlaceholder ? '' : 'room'}s`}
       value={bedOptions.find((option) => option.value === value)}
       setValue={() => value}
       isSearchable={false}
@@ -143,6 +145,7 @@ BedroomsSelect.propTypes = {
   placeholder: PropTypes.string,
   allowUnderOver: PropTypes.bool,
   bedOptionText: PropTypes.string,
+  abbreviatedPlaceholder: PropTypes.bool,
 };
 
 BedroomsSelect.defaultProps = {
@@ -151,6 +154,7 @@ BedroomsSelect.defaultProps = {
   placeholder: null,
   allowUnderOver: false,
   bedOptionText: 'Bed',
+  abbreviatedPlaceholder: false,
 };
 
 const mapStateToProps = ({ search: { currentSearch } }) => ({

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

@@ -34,8 +34,22 @@ class SearchForm extends Component {
     }
 
     if (defaultChannel) setSearchField({ channel: defaultChannel });
-    if (customsalesredirect) setSearchField({ customSalesRedirect: customsalesredirect });
-    if (customlettingsredirect) setSearchField({ customLettingsRedirect: customlettingsredirect });
+    /**
+     * If a custom redirect has been set we need to make sure a channel
+     * is set in initial search search state. This is because the load more 
+     * button loads more property results based on the initial search not 
+     * the current search. If no channel is set it will try to load more 
+     * properties based off the custom redirect but with no channel 
+     * leading to no properties being found.
+     */
+    if (customsalesredirect) {
+      setSearchField({ customSalesRedirect: customsalesredirect })
+      setInitialSearch({ ...search, channel: defaultChannel ? defaultChannel : 'sales' });
+    }
+    if (customlettingsredirect) {
+      setSearchField({ customLettingsRedirect: customlettingsredirect })
+      setInitialSearch({ ...search, channel: defaultChannel ? defaultChannel : 'lettings' });
+    }
   }
 
   handleSubmit(e) {