Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

Commit

Permalink
fix(geoSearch): gSP
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haroenv
Haroenv committed Mar 18, 2019
1 parent ca7752a commit 7ce3a35
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 63 deletions.
93 changes: 32 additions & 61 deletions packages/react-instantsearch-core/src/connectors/__tests__/connectGeoSearch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ describe('connectGeoSearch', () => {
const empty = {};

describe('single index', () => {
const createSingleIndexInstance = () => ({
const contextValue = {
mainTargetedIndex: 'index',
});
};

const createSingleIndexSearchResults = (hits = [], state) => ({
results: new SearchResults(new SearchParameters(state), [
Expand All @@ -21,8 +21,7 @@ describe('connectGeoSearch', () => {

describe('getProvidedProps', () => {
it('expect to return default provided props', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = empty;

Expand Down Expand Up @@ -50,8 +49,7 @@ describe('connectGeoSearch', () => {
{ objectID: '789', _geoloc: true },
];

const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults(hits);

Expand All @@ -77,8 +75,7 @@ describe('connectGeoSearch', () => {
{ objectID: '789', _geoloc: true },
];

const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults(hits);

Expand All @@ -97,8 +94,7 @@ describe('connectGeoSearch', () => {
});

it("expect to return empty hits when we don't have results", () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = empty;

Expand All @@ -116,8 +112,7 @@ describe('connectGeoSearch', () => {

describe('position', () => {
it('expect to return the position from the searchState (aroundLatLng)', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchResults = createSingleIndexSearchResults();
const searchState = {
aroundLatLng: {
Expand All @@ -139,8 +134,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return the position from the searchState (configure.aroundLatLng)', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchResults = createSingleIndexSearchResults();
const searchState = {
configure: {
Expand All @@ -161,8 +155,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return the position from the SearchResults', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults([], {
aroundLatLng: '10, 12',
Expand All @@ -181,8 +174,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return undefined from an empty searchState', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults();

Expand All @@ -196,11 +188,10 @@ describe('connectGeoSearch', () => {
});

it('expect to return undefined with the default refinement', () => {
const instance = createSingleIndexInstance();
const searchState = {};
const searchResults = createSingleIndexSearchResults();
const props = {
contextValue: instance,
contextValue,
defaultRefinement: {
northEast: {
lat: 10,
Expand All @@ -225,8 +216,7 @@ describe('connectGeoSearch', () => {

describe('currentRefinement', () => {
it('expect to return the boundingBox from the searchState', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchResults = createSingleIndexSearchResults();
const searchState = {
boundingBox: {
Expand Down Expand Up @@ -260,8 +250,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return the boundingBox from the searchState with string values', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchResults = createSingleIndexSearchResults();
const searchState = {
boundingBox: {
Expand Down Expand Up @@ -295,8 +284,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return the boundingBox from the SearchResults', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults([], {
insideBoundingBox: '10, 12, 12, 14',
Expand All @@ -321,11 +309,10 @@ describe('connectGeoSearch', () => {
});

it('expect to return the default refinement', () => {
const instance = createSingleIndexInstance();
const searchState = {};
const searchResults = createSingleIndexSearchResults();
const props = {
contextValue: instance,
contextValue,
defaultRefinement: {
northEast: {
lat: 10,
Expand Down Expand Up @@ -357,8 +344,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return undefined from an empty searchState', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults();

Expand All @@ -380,8 +366,7 @@ describe('connectGeoSearch', () => {
{ objectID: '789', _geoloc: true },
];

const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchResults = createSingleIndexSearchResults(hits);
const searchState = {
boundingBox: {
Expand Down Expand Up @@ -412,8 +397,7 @@ describe('connectGeoSearch', () => {
{ objectID: '789', _geoloc: true },
];

const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults(hits, {
insideBoundingBox: '10, 12, 12, 14',
Expand All @@ -435,8 +419,7 @@ describe('connectGeoSearch', () => {
{ objectID: '789', _geoloc: true },
];

const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const searchResults = createSingleIndexSearchResults(hits);

Expand All @@ -453,8 +436,7 @@ describe('connectGeoSearch', () => {

describe('refine', () => {
it('expect to set the boundingBox when boundingBox is provided', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};
const nextRefinement = {
northEast: {
Expand Down Expand Up @@ -485,8 +467,7 @@ describe('connectGeoSearch', () => {
});

it('expect to replace the previous value when boundingBox is provided', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
boundingBox: {
northEast: {
Expand Down Expand Up @@ -529,8 +510,7 @@ describe('connectGeoSearch', () => {
});

it('expect to clear the previous value when boundingBox is omit', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
boundingBox: {
northEast: {
Expand All @@ -555,10 +535,9 @@ describe('connectGeoSearch', () => {
});

describe('getSearchParameters', () => {
it('expect to set the paremeter "insideBoundingBox" when boundingBox is provided', () => {
const instance = createSingleIndexInstance();
it('expect to set the parameter "insideBoundingBox" when boundingBox is provided', () => {
const searchParameters = new SearchParameters();
const props = {};
const props = { contextValue };
const searchState = {
boundingBox: {
northEast: {
Expand All @@ -575,8 +554,7 @@ describe('connectGeoSearch', () => {
const actual = connector.getSearchParameters(
searchParameters,
props,
searchState,
{ ais: instance }
searchState
);

const expectation = '10,12,12,14';
Expand All @@ -585,16 +563,14 @@ describe('connectGeoSearch', () => {
});

it('expect to return the given searchParameters when boundingBox is omit', () => {
const instance = createSingleIndexInstance();
const searchParameters = new SearchParameters();
const props = {};
const props = { contextValue };
const searchState = {};

const actual = connector.getSearchParameters(
searchParameters,
props,
searchState,
{ ais: instance }
searchState
);

expect(actual).toEqual(searchParameters);
Expand All @@ -603,8 +579,7 @@ describe('connectGeoSearch', () => {

describe('cleanUp', () => {
it('expect to remove the refinement from the searchState when boundingBox is provided', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
query: 'studio',
boundingBox: {
Expand All @@ -629,8 +604,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return the given searchState when boundingBox is omit', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
query: 'studio',
};
Expand All @@ -647,8 +621,7 @@ describe('connectGeoSearch', () => {

describe('getMetadata', () => {
it('expect to return the meta when boundingBox is provided', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
boundingBox: {
northEast: {
Expand Down Expand Up @@ -689,8 +662,7 @@ describe('connectGeoSearch', () => {
});

it('expect to return an empty meta when boundingBox is omit', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {};

const actual = connector.getMetadata(props, searchState);
Expand All @@ -703,8 +675,7 @@ describe('connectGeoSearch', () => {
});

it('expect to clear the boundingBox when value is called', () => {
const instance = createSingleIndexInstance();
const props = { contextValue: instance };
const props = { contextValue };
const searchState = {
query: 'studio',
boundingBox: {
Expand Down
6 changes: 4 additions & 2 deletions packages/react-instantsearch-core/src/connectors/connectGeoSearch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,10 @@ export default createConnector({
return refine(searchState, nextValue, { ais: props.contextValue });
},

getSearchParameters(searchParameters, props, searchState, context) {
const currentRefinement = getCurrentRefinement(props, searchState, context);
getSearchParameters(searchParameters, props, searchState) {
const currentRefinement = getCurrentRefinement(props, searchState, {
ais: props.contextValue,
});

if (!currentRefinement) {
return searchParameters;
Expand Down

0 comments on commit 7ce3a35

Please sign in to comment.