PR Feedback: Refactor _updateSearchResults

Changed all actions to call _updateSearchResults only with updated values. _updateSearchResults then defaults unprovided values to current state.

Author: JasonStoltz

src/app-search/AppSearchDriver.js

@@ -114,10 +114,19 @@ export default class AppSearchDriver {
  }
  }
 
- _updateSearchResults = (
- { current, filters, resultsPerPage, searchTerm, sortDirection, sortField },
- skipPushToUrl = false
- ) => {
+ _updateSearchResults = (searchParameters, skipPushToUrl = false) => {
+ const {
+ current,
+ filters,
+ resultsPerPage,
+ searchTerm,
+ sortDirection,
+ sortField
+ } = {
+ ...this.state,
+ ...searchParameters
+ };
+
  const searchOptions = {
  ...this.searchOptions,
  page: {
@@ -141,13 +150,13 @@ export default class AppSearchDriver {
  current: resultList.info.meta.page.current,
  error: "",
  facets: resultList.info.facets,
- filters: filters,
+ filters,
  requestId: resultList.info.meta.request_id,
  results: resultList.results,
- resultsPerPage: resultsPerPage,
- searchTerm: searchTerm,
- sortDirection: sortDirection,
- sortField: sortField,
+ resultsPerPage,
+ searchTerm,
+ sortDirection,
+ sortField,
  totalResults: resultList.info.meta.page.total_results
  });
 
@@ -224,20 +233,10 @@ export default class AppSearchDriver {
  * @param value String field value to filter on
  */
  addFilter = (name, value) => {
- const {
- filters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
- } = this.state;
+ const { filters } = this.state;
  this._updateSearchResults({
  current: 1,
- filters: [...filters, { [name]: value }],
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
+ filters: [...filters, { [name]: value }]
  });
  };
 
@@ -250,21 +249,11 @@ export default class AppSearchDriver {
  * @param value String field value for filter to remove
  */
  removeFilter = (name, value) => {
- const {
- filters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
- } = this.state;
+ const { filters } = this.state;
  const updatedFilters = filters.filter(filter => !(filter[name] === value));
  this._updateSearchResults({
  current: 1,
- filters: updatedFilters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
+ filters: updatedFilters
  });
  };
 
@@ -276,14 +265,9 @@ export default class AppSearchDriver {
  * @param resultsPerPage Integer
  */
  setResultsPerPage = resultsPerPage => {
- const { filters, searchTerm, sortDirection, sortField } = this.state;
  this._updateSearchResults({
  current: 1,
- filters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
+ resultsPerPage
  });
  };
 
@@ -295,14 +279,10 @@ export default class AppSearchDriver {
  * @param searchTerm String
  */
  setSearchTerm = searchTerm => {
- const { resultsPerPage, sortDirection, sortField } = this.state;
  this._updateSearchResults({
  current: 1,
  filters: [],
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
+ searchTerm
  });
  };
 
@@ -315,12 +295,8 @@ export default class AppSearchDriver {
  * @param sortDirection String ["asc"|"desc"]
  */
  setSort = (sortField, sortDirection) => {
- const { filters, resultsPerPage, searchTerm } = this.state;
  this._updateSearchResults({
  current: 1,
- filters: filters,
- resultsPerPage,
- searchTerm,
  sortDirection,
  sortField
  });
@@ -355,21 +331,8 @@ export default class AppSearchDriver {
  * @param current Integer
  */
  setCurrent = current => {
- const {
- filters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
- } = this.state;
-
  this._updateSearchResults({
- current,
- filters,
- resultsPerPage,
- searchTerm,
- sortDirection,
- sortField
+ current
  });
  };
 }