From a176df415457cb501505482f563e78e9fec33b08 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Thu, 8 Feb 2018 13:49:14 +0200
Subject: [PATCH] Add features filtering to mobile search

---
 .../SearchFiltersMobile.js                    | 51 +++++++++++++++++--
 src/containers/SearchPage/SearchPage.js       |  1 +
 .../__snapshots__/SearchPage.test.js.snap     | 36 +++++++++++++
 src/translations/en.json                      |  1 +
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
index 7e2d3cca..d224302a 100644
--- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js
+++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
@@ -7,11 +7,18 @@ import { omit, toPairs } from 'lodash';
 
 import routeConfiguration from '../../routeConfiguration';
 import { createResourceLocatorString } from '../../util/routes';
-import { SecondaryButton, ModalInMobile, Button, SelectSingleFilterMobile } from '../../components';
+import {
+  SecondaryButton,
+  ModalInMobile,
+  Button,
+  SelectSingleFilterMobile,
+  SelectMultipleFilterMobile,
+} from '../../components';
 import css from './SearchFiltersMobile.css';
 
 const CATEGORY_URL_PARAM = 'pub_category';
-const allowedCategories = [CATEGORY_URL_PARAM];
+const FEATURES_URL_PARAM = 'pub_amenities';
+const allowedCategories = [CATEGORY_URL_PARAM, FEATURES_URL_PARAM];
 
 const validateParamValue = value => value !== null && value !== undefined && value.length > 0;
 const validateParamKey = key => allowedCategories.includes(key);
@@ -33,7 +40,8 @@ class SearchFiltersMobileComponent extends Component {
     this.cancelFilters = this.cancelFilters.bind(this);
     this.closeFilters = this.closeFilters.bind(this);
     this.resetAll = this.resetAll.bind(this);
-    this.onSelectSingle = this.onSelectSingle.bind(this);
+    this.handleSelectSingle = this.handleSelectSingle.bind(this);
+    this.handleSelectMultiple = this.handleSelectMultiple.bind(this);
   }
 
   // Open filters modal, set the initial parameters to current ones
@@ -65,7 +73,7 @@ class SearchFiltersMobileComponent extends Component {
     this.setState({ isFiltersOpenOnMobile: false });
   }
 
-  onSelectSingle(urlParam, option) {
+  handleSelectSingle(urlParam, option) {
     const { urlQueryParams, history } = this.props;
 
     // query parameters after selecting the option
@@ -77,6 +85,17 @@ class SearchFiltersMobileComponent extends Component {
     history.push(createResourceLocatorString('SearchPage', routeConfiguration(), {}, queryParams));
   }
 
+  handleSelectMultiple(urlParam, options) {
+    const { urlQueryParams, history } = this.props;
+
+    const queryParams =
+      options && options.length > 0
+        ? { ...urlQueryParams, [FEATURES_URL_PARAM]: options.join(',') }
+        : omit(urlQueryParams, FEATURES_URL_PARAM);
+
+    history.push(createResourceLocatorString('SearchPage', routeConfiguration(), {}, queryParams));
+  }
+
   // Reset all filter query parameters
   resetAll(e) {
     const { urlQueryParams, history } = this.props;
@@ -102,6 +121,7 @@ class SearchFiltersMobileComponent extends Component {
       onMapIconClick,
       onManageDisableScrolling,
       categories,
+      features,
       intl,
     } = this.props;
 
@@ -139,13 +159,30 @@ class SearchFiltersMobileComponent extends Component {
       <SelectSingleFilterMobile
         urlParam={CATEGORY_URL_PARAM}
         label={categoryLabel}
-        onSelect={this.onSelectSingle}
+        onSelect={this.handleSelectSingle}
         options={categories}
         initialValue={initialCategory}
         intl={intl}
       />
     ) : null;
 
+    const featuresLabel = intl.formatMessage({ id: 'SearchFiltersMobile.featuresLabel' });
+
+    const initialFeatures = !!urlQueryParams[FEATURES_URL_PARAM]
+      ? urlQueryParams[FEATURES_URL_PARAM].split(',')
+      : [];
+
+    const featuresFilter = features ? (
+      <SelectMultipleFilterMobile
+        name="amenities"
+        urlParam={FEATURES_URL_PARAM}
+        label={featuresLabel}
+        onSelect={this.handleSelectMultiple}
+        options={features}
+        initialValues={initialFeatures}
+      />
+    ) : null;
+
     return (
       <div className={classes}>
         <div className={css.searchResultSummary}>
@@ -175,6 +212,7 @@ class SearchFiltersMobileComponent extends Component {
             </button>
           </div>
           {categoryFilter}
+          {featuresFilter}
           <div className={css.showListingsContainer}>
             <Button className={css.showListingsButton} onClick={this.closeFilters}>
               {showListingsLabel}
@@ -193,6 +231,8 @@ SearchFiltersMobileComponent.defaultProps = {
   searchingInProgress: false,
   onOpenModal: null,
   onCloseModal: null,
+  categories: null,
+  features: null,
 };
 
 SearchFiltersMobileComponent.propTypes = {
@@ -208,6 +248,7 @@ SearchFiltersMobileComponent.propTypes = {
   onOpenModal: func,
   onCloseModal: func,
   categories: array,
+  features: array,
 
   // from injectIntl
   intl: intlShape.isRequired,
diff --git a/src/containers/SearchPage/SearchPage.js b/src/containers/SearchPage/SearchPage.js
index e7305298..da75c1b7 100644
--- a/src/containers/SearchPage/SearchPage.js
+++ b/src/containers/SearchPage/SearchPage.js
@@ -331,6 +331,7 @@ export class SearchPageComponent extends Component {
               onOpenModal={this.onOpenMobileModal}
               onCloseModal={this.onCloseMobileModal}
               categories={categories}
+              features={features}
             />
             <div
               className={classNames(css.listings, {
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index 2facea5e..30b3b75e 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -98,6 +98,42 @@ exports[`SearchPageComponent matches snapshot 1`] = `
             },
           ]
         }
+        features={
+          Array [
+            Object {
+              "key": "towels",
+              "label": "Towels",
+            },
+            Object {
+              "key": "bathroom",
+              "label": "Bathroom",
+            },
+            Object {
+              "key": "swimming_pool",
+              "label": "Swimming pool",
+            },
+            Object {
+              "key": "own_drinks",
+              "label": "Own drinks allowed",
+            },
+            Object {
+              "key": "jacuzzi",
+              "label": "Jacuzzi",
+            },
+            Object {
+              "key": "audiovisual_entertainment",
+              "label": "Audiovisual entertainment",
+            },
+            Object {
+              "key": "barbeque",
+              "label": "Barbeque",
+            },
+            Object {
+              "key": "own_food_allowed",
+              "label": "Own food allowed",
+            },
+          ]
+        }
         listingsAreLoaded={true}
         onCloseModal={[Function]}
         onManageDisableScrolling={[Function]}
diff --git a/src/translations/en.json b/src/translations/en.json
index b7ee01b0..30c26cee 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -494,6 +494,7 @@
   "SearchFilters.openMapView": "Map",
   "SearchFiltersMobile.cancel": "CANCEL",
   "SearchFiltersMobile.categoryLabel": "Category",
+  "SearchFiltersMobile.featuresLabel": "Amenities",
   "SearchFiltersMobile.heading": "Filter saunas",
   "SearchFiltersMobile.resetAll": "Reset all",
   "SearchFiltersMobile.showListings": "Show {count, number} {count, plural, one {sauna} other {saunas}}",