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

refactor(helper): replace Helper usage #2621

Merged
merged 3 commits into from
Jul 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,23 +126,23 @@
"bundlesize": [
{
"path": "packages/react-instantsearch/dist/umd/Core.min.js",
"maxSize": "3 kB"
"maxSize": "2.75 kB"
},
{
"path": "packages/react-instantsearch/dist/umd/Connectors.min.js",
"maxSize": "39.25 kB"
"maxSize": "21 kB"
},
{
"path": "packages/react-instantsearch/dist/umd/Dom.min.js",
"maxSize": "51.50 kB"
"maxSize": "33.25 kB"
},
{
"path": "packages/react-instantsearch-core/dist/umd/ReactInstantSearchCore.min.js",
"maxSize": "42.50 kB"
"maxSize": "24.25 kB"
},
{
"path": "packages/react-instantsearch-dom/dist/umd/ReactInstantSearchDOM.min.js",
"maxSize": "53.75 kB"
"maxSize": "35.50 kB"
},
{
"path": "packages/react-instantsearch-dom-maps/dist/umd/ReactInstantSearchDOMMaps.min.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-instantsearch-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@babel/runtime": "^7.1.2",
"algoliasearch-helper": "^2.26.0",
"algoliasearch-helper": "0.0.0-27095c0",
"fast-deep-equal": "^2.0.1",
"prop-types": "^15.5.10"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,10 @@ describe('connectConfigure', () => {
contextValue,
})
);
expect(searchParameters.getQueryParameter('distinct')).toEqual(1);
expect(searchParameters.getQueryParameter('whatever')).toEqual('please');
expect(
searchParameters.getQueryParameter.bind(searchParameters, 'children')
).toThrowErrorMatchingInlineSnapshot(
`"Parameter 'children' is not an attribute of SearchParameters (http://algolia.github.io/algoliasearch-helper-js/docs/SearchParameters.html)"`
);
expect(
searchParameters.getQueryParameter.bind(
searchParameters,
'contextValue'
)
).toThrowErrorMatchingInlineSnapshot(
`"Parameter 'contextValue' is not an attribute of SearchParameters (http://algolia.github.io/algoliasearch-helper-js/docs/SearchParameters.html)"`
);
expect(searchParameters.distinct).toEqual(1);
expect(searchParameters.whatever).toEqual('please');
expect(searchParameters.children).toBeUndefined();
expect(searchParameters.contextValue).toBeUndefined();
});

it('calling transitionState should add configure parameters to the search state', () => {
Expand Down Expand Up @@ -116,31 +105,11 @@ describe('connectConfigure', () => {
},
{}
);
expect(searchParameters.getQueryParameter('distinct')).toEqual(1);
expect(searchParameters.getQueryParameter('whatever')).toEqual('please');
expect(
searchParameters.getQueryParameter.bind(searchParameters, 'children')
).toThrowErrorMatchingInlineSnapshot(
`"Parameter 'children' is not an attribute of SearchParameters (http://algolia.github.io/algoliasearch-helper-js/docs/SearchParameters.html)"`
);

expect(
searchParameters.getQueryParameter.bind(
searchParameters,
'contextValue'
)
).toThrowErrorMatchingInlineSnapshot(
`"Parameter 'contextValue' is not an attribute of SearchParameters (http://algolia.github.io/algoliasearch-helper-js/docs/SearchParameters.html)"`
);

expect(
searchParameters.getQueryParameter.bind(
searchParameters,
'indexContextValue'
)
).toThrowErrorMatchingInlineSnapshot(
`"Parameter 'indexContextValue' is not an attribute of SearchParameters (http://algolia.github.io/algoliasearch-helper-js/docs/SearchParameters.html)"`
);
expect(searchParameters.distinct).toEqual(1);
expect(searchParameters.whatever).toEqual('please');
expect(searchParameters.children).toBeUndefined();
expect(searchParameters.contextValue).toBeUndefined();
expect(searchParameters.indexContextValue).toBeUndefined();
});

it('calling transitionState should add configure parameters to the search state', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ describe('connectToggleRefinement', () => {
}
);

expect(params.query).toEqual('');
expect(params.query).toBeUndefined();
});

it('registers its filter in metadata', () => {
Expand Down Expand Up @@ -831,7 +831,7 @@ describe('connectToggleRefinement', () => {
}
);

expect(params.query).toEqual('');
expect(params.query).toBeUndefined();
});

it('registers its filter in metadata', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
query: 'second query 1',
index: 'second',
page: 0,
})
);

Expand Down Expand Up @@ -140,7 +139,6 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
query: 'second query 2',
index: 'second',
page: 0,
})
);
});
Expand Down Expand Up @@ -207,15 +205,13 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
index: 'third',
query: 'query',
page: 0,
})
);

expect(ism.store.getState().results.second).toEqual(
expect.objectContaining({
index: 'second',
query: 'query',
page: 0,
})
);
});
Expand Down Expand Up @@ -459,7 +455,6 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
index: 'second',
query: 'second query 1',
page: 0,
})
);

Expand All @@ -477,7 +472,6 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
index: 'first',
query: 'first query 2',
page: 0,
})
);

Expand Down Expand Up @@ -537,7 +531,6 @@ describe('createInstantSearchManager with multi index', () => {
expect.objectContaining({
index: 'second',
query: 'second query 2',
page: 0,
})
);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ describe('createInstantSearchManager', () => {
expect(mainParameters).toEqual(
expect.objectContaining({
index: 'index',
query: '',
})
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export default function createInstantSearchManager({
}

function handleSearchSuccess({ indexId }) {
return content => {
return event => {
const state = store.getState();
const isDerivedHelpersEmpty = !helper.derivedHelpers.length;

Expand All @@ -234,9 +234,9 @@ export default function createInstantSearchManager({
results = !isDerivedHelpersEmpty && results.getFacetByName ? {} : results;

if (!isDerivedHelpersEmpty) {
results[indexId] = content;
results[indexId] = event.results;
} else {
results = content;
results = event.results;
}

const currentState = store.getState();
Expand All @@ -259,7 +259,7 @@ export default function createInstantSearchManager({
};
}

function handleSearchError(error) {
function handleSearchError({ error }) {
const currentState = store.getState();

let nextIsSearchStalled = currentState.isSearchStalled;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-instantsearch-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"dependencies": {
"@babel/runtime": "^7.1.2",
"algoliasearch-helper": "^2.26.0",
"algoliasearch-helper": "0.0.0-27095c0",
"classnames": "^2.2.5",
"prop-types": "^15.5.10",
"react-instantsearch-core": "^5.7.0"
Expand Down
13 changes: 5 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4114,15 +4114,12 @@ algolia-aerial@^1.5.3:
resolved "https://registry.yarnpkg.com/algolia-aerial/-/algolia-aerial-1.5.3.tgz#c8b8ca6bc484164ffc7b36717689a424ea6bfe6c"
integrity sha512-LZTpVlYnhqNFd+ru/Spm73omhsagiRQLmjrosa5bJ6/I9OMRp4Sb9pYZkAxcx3RSr+ZNXZqthL7rpXqMFdrnPA==

algoliasearch-helper@^2.26.0:
version "2.26.0"
resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-2.26.0.tgz#cb784b692a5aacf17062493cb0b94f6d60d30d0f"
integrity sha512-Yt9ARVC2eY48G2UdxCG+qGTGufh0+mQD2jh9qXTraQKunTSQGj+4Ah5OotuaUVdUBEBRRE3cvUoK+pZpwidQ0Q==
algoliasearch-helper@0.0.0-27095c0:
version "0.0.0-27095c0"
resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-0.0.0-27095c0.tgz#8aa246e23fc665403917eeaf9cf7beeea70866f1"
integrity sha512-d0wlSReMpnz7sT5ibojXucYsWHTigu83ge+qktQ9m0u+kG7bHqRErzBUOZ03BMr9zd1sWSNR1TMR9l6AHHrqow==
dependencies:
events "^1.1.1"
lodash "^4.17.5"
qs "^6.5.1"
util "^0.10.3"

algoliasearch@3.33.0, algoliasearch@^3.27.1:
version "3.33.0"
Expand Down Expand Up @@ -14153,7 +14150,7 @@ q@^1.1.2, q@^1.5.1:
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=

qs@6.5.1, qs@^6.5.1, qs@~6.5.1:
qs@6.5.1, qs@~6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
Expand Down