From 99ce1f9a0190f23a3a9a58d3d46f2d55d33e8458 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Mon, 5 Feb 2018 16:28:48 +0200
Subject: [PATCH] Unify function naming

---
 src/components/SearchFilters/SearchFilters.js  | 18 ++++++++++--------
 .../SelectMultipleFilter.example.js            |  2 +-
 .../SelectMultipleFilter.js                    | 12 ++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/SearchFilters/SearchFilters.js b/src/components/SearchFilters/SearchFilters.js
index db220e0c..9ea2f70e 100644
--- a/src/components/SearchFilters/SearchFilters.js
+++ b/src/components/SearchFilters/SearchFilters.js
@@ -48,20 +48,22 @@ const SearchFiltersComponent = props => {
     id: 'SearchFilters.featuresLabel',
   });
 
-  const initialFeatures =
-    urlQueryParams[FEATURES_URL_PARAM] && urlQueryParams[FEATURES_URL_PARAM].split(',');
+  const initialFeatures = !!urlQueryParams[FEATURES_URL_PARAM]
+    ? urlQueryParams[FEATURES_URL_PARAM].split(',')
+    : [];
 
   const initialCategory = urlQueryParams[CATEGORY_URL_PARAM];
 
   const handleSelectOptions = (urlParam, options) => {
-    const queryParams = options
-      ? { ...urlQueryParams, [FEATURES_URL_PARAM]: options.join(',') }
-      : omit(urlQueryParams, FEATURES_URL_PARAM);
+    const queryParams =
+      options && options.length > 0
+        ? { ...urlQueryParams, [FEATURES_URL_PARAM]: options.join(',') }
+        : omit(urlQueryParams, FEATURES_URL_PARAM);
 
     history.push(createResourceLocatorString('SearchPage', routeConfiguration(), {}, queryParams));
   };
 
-  const onSelectOption = (urlParam, option) => {
+  const handleSelectOption = (urlParam, option) => {
     // query parameters after selecting the option
     // if no option is passed, clear the selection for the filter
     const queryParams = option
@@ -75,7 +77,7 @@ const SearchFiltersComponent = props => {
     <SelectSingleFilter
       urlParam={CATEGORY_URL_PARAM}
       label={categoryLabel}
-      onSelect={onSelectOption}
+      onSelect={handleSelectOption}
       options={categories}
       initialValue={initialCategory}
       contentPlacementOffset={FILTER_OFFSET}
@@ -86,7 +88,7 @@ const SearchFiltersComponent = props => {
     <SelectMultipleFilter
       urlParam={FEATURES_URL_PARAM}
       label={featuresLabel}
-      onSubmit={handleSelectOptions}
+      onSelect={handleSelectOptions}
       options={features}
       initialValues={initialFeatures}
       contentPlacementOffset={FILTER_OFFSET}
diff --git a/src/components/SelectMultipleFilter/SelectMultipleFilter.example.js b/src/components/SelectMultipleFilter/SelectMultipleFilter.example.js
index d9e0b610..36f025d1 100644
--- a/src/components/SelectMultipleFilter/SelectMultipleFilter.example.js
+++ b/src/components/SelectMultipleFilter/SelectMultipleFilter.example.js
@@ -56,7 +56,7 @@ const AmenitiesFilterComponent = withRouter(props => {
     <SelectMultipleFilter
       urlParam={URL_PARAM}
       label="Amenities"
-      onSubmit={(urlParam, values) => handleSubmit(urlParam, values, history)}
+      onSelect={(urlParam, values) => handleSubmit(urlParam, values, history)}
       options={options}
       initialValues={initialValues}
       contentPlacementOffset={-14}
diff --git a/src/components/SelectMultipleFilter/SelectMultipleFilter.js b/src/components/SelectMultipleFilter/SelectMultipleFilter.js
index dc679088..dbe3544b 100644
--- a/src/components/SelectMultipleFilter/SelectMultipleFilter.js
+++ b/src/components/SelectMultipleFilter/SelectMultipleFilter.js
@@ -48,21 +48,21 @@ class SelectMultipleFilter extends Component {
   }
 
   handleSubmit(values) {
-    const { onSubmit, urlParam } = this.props;
+    const { onSelect, urlParam } = this.props;
     const selectedKeys = valuesToKeys(values);
     this.setState({ isOpen: false });
-    onSubmit(urlParam, selectedKeys);
+    onSelect(urlParam, selectedKeys);
   }
 
   handleClear() {
     this.setState({ isOpen: false });
-    this.props.onSubmit(null);
+    this.props.onSelect(null);
   }
 
   handleCancel() {
-    const { onSubmit, initialValues, urlParam } = this.props;
+    const { onSelect, initialValues, urlParam } = this.props;
     this.setState({ isOpen: false });
-    onSubmit(urlParam, initialValues);
+    onSelect(urlParam, initialValues);
   }
 
   handleBlur(event) {
@@ -170,7 +170,7 @@ SelectMultipleFilter.propTypes = {
   className: string,
   urlParam: string.isRequired,
   label: string.isRequired,
-  onSubmit: func.isRequired,
+  onSelect: func.isRequired,
   options: array.isRequired,
   initialValues: arrayOf(string),
   contentPlacementOffset: number,