maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-31 02:26:50 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #710 from sharetribe/query-param-cleanup

Browse source 
Remove unnecessary listing query params
This commit is contained in:
Hannu Lyytikäinen 2018-02-16 13:38:19 +02:00 • committed by GitHub
commit 408f8a0b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/containers/SearchPage/SearchPage.js
View file

@ -75,10 +75,8 @@ const validURLParamForExtendedData = (paramKey, urlParams) => {
const pickSearchParamsOnly = params => {
const { address, origin, bounds, country, ...rest } = params || {};
return {
address,
origin,
bounds,
country,
...validURLParamForExtendedData(CATEGORY_URL_PARAM, rest),
...validURLParamForExtendedData(AMENITIES_URL_PARAM, rest),
};
@ -174,9 +172,11 @@ export class SearchPageComponent extends Component {
latlng: ['origin'],
latlngBounds: ['bounds'],
});
const perPage = SHARETRIBE_API_MAX_PAGE_SIZE;
const page = 1;
const searchParamsForMapResults = { ...searchInURL, include: ['images'], page, perPage };
const { address, country, ...rest } = searchInURL;
const searchParamsForMapResults = { ...rest, include: ['images'], page, perPage };
this.searchMapListingsInProgress = true;
// Search more listings for map
@ -333,7 +333,7 @@ export class SearchPageComponent extends Component {
<div className={css.searchResultContainer}>
<SearchFilters
className={css.searchFilters}
urlQueryParams={urlQueryParams}
urlQueryParams={searchInURL}
listingsAreLoaded={listingsAreLoaded}
resultsCount={totalItems}
searchInProgress={searchInProgress}
@ -345,7 +345,7 @@ export class SearchPageComponent extends Component {
/>
<SearchFiltersMobile
className={css.searchFiltersMobile}
urlQueryParams={urlQueryParams}
urlQueryParams={searchInURL}
listingsAreLoaded={listingsAreLoaded}
resultsCount={totalItems}
searchInProgress={searchInProgress}
@ -476,7 +476,7 @@ SearchPage.loadData = (params, search) => {
latlng: ['origin'],
latlngBounds: ['bounds'],
});
const { page = 1, ...rest } = queryParams;
const { page = 1, address, country, ...rest } = queryParams;
return searchListings({
...rest,
page,

18
src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
View file

@ -51,14 +51,7 @@ exports[`SearchPageComponent matches snapshot 1`] = `
resultsCount={22}
searchInProgress={false}
searchListingsError={null}
urlQueryParams={
Object {
"address": undefined,
"bounds": undefined,
"country": undefined,
"origin": undefined,
}
}
urlQueryParams={Object {}}
/>
<InjectIntl(withRouter(SearchFiltersMobileComponent))
amenities={
@ -94,14 +87,7 @@ exports[`SearchPageComponent matches snapshot 1`] = `
searchInProgress={false}
searchListingsError={null}
showAsModalMaxWidth={768}
urlQueryParams={
Object {
"address": undefined,
"bounds": undefined,
"country": undefined,
"origin": undefined,
}
}
urlQueryParams={Object {}}
/>
<div
className=""