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

fix(ssr): avoid duplicate serializing #2726

Merged
merged 2 commits into from
Aug 13, 2019
Merged

fix(ssr): avoid duplicate serializing #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06c33da
fix(ssr): avoid duplicate serializing
Haroenv Aug 1, 2019
1bcbc36
empty commit for CI
Haroenv Aug 13, 2019
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
3 changes: 2 additions & 1 deletion packages/react-instantsearch-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
},
"dependencies": {
"@babel/runtime": "^7.1.2",
"algoliasearch-helper": "0.0.0-27095c0",
"@types/algoliasearch": "^3.30.16",
"algoliasearch-helper": "0.0.0-6ac260d",
"fast-deep-equal": "^2.0.1",
"prop-types": "^15.5.10"
},
Expand Down
16 changes: 9 additions & 7 deletions packages/react-instantsearch-core/src/core/__tests__/createInstantSearchManager.derived.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ const runAllMicroTasks = () => new Promise(setImmediate);
const createSearchClient = () => ({
search: jest.fn(requests =>
Promise.resolve({
results: requests.map(request => ({
index: request.indexName,
query: request.params.query,
page: request.params.page,
hitsPerPage: request.params.hitsPerPage,
hits: [],
})),
results: requests.map(
({ indexName, params: { page, query, hitsPerPage } }) => ({
index: indexName,
query,
page,
hitsPerPage,
hits: [],
})
),
})
),
searchForFacetValues() {
Expand Down
112 changes: 48 additions & 64 deletions packages/react-instantsearch-core/src/core/__tests__/createInstantSearchManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,12 @@ describe('createInstantSearchManager', () => {
});

const resultsState = {
_originalResponse: {
results: [
{
index: 'index',
query: 'query',
},
],
},
rawResults: [
{
index: 'index',
query: 'query',
},
],
state: {
index: 'index',
query: 'query',
Expand Down Expand Up @@ -112,29 +110,25 @@ describe('createInstantSearchManager', () => {
const resultsState = [
{
_internalIndexId: 'index1',
_originalResponse: {
results: [
{
index: 'index1',
query: 'query1',
},
],
},
rawResults: [
{
index: 'index1',
query: 'query1',
},
],
state: {
index: 'index1',
query: 'query1',
},
},
{
_internalIndexId: 'index2',
_originalResponse: {
results: [
{
index: 'index2',
query: 'query2',
},
],
},
rawResults: [
{
index: 'index2',
query: 'query2',
},
],
state: {
index: 'index2',
query: 'query2',
Expand Down Expand Up @@ -187,14 +181,12 @@ describe('createInstantSearchManager', () => {
};

const resultsState = {
_originalResponse: {
results: [
{
index: 'indexName',
query: 'query',
},
],
},
rawResults: [
{
index: 'indexName',
query: 'query',
},
],
state: {
index: 'indexName',
query: 'query',
Expand All @@ -218,14 +210,12 @@ describe('createInstantSearchManager', () => {
});

const resultsState = {
_originalResponse: {
results: [
{
index: 'indexName',
query: 'query',
},
],
},
rawResults: [
{
index: 'indexName',
query: 'query',
},
],
state: {
index: 'indexName',
query: 'query',
Expand All @@ -250,14 +240,12 @@ describe('createInstantSearchManager', () => {
indexName: 'index',
searchClient: createSearchClient(),
resultsState: {
_originalResponse: {
results: [
{
index: 'indexName',
query: 'query',
},
],
},
rawResults: [
{
index: 'indexName',
query: 'query',
},
],
state: {
index: 'indexName',
query: 'query',
Expand All @@ -276,29 +264,25 @@ describe('createInstantSearchManager', () => {
resultsState: [
{
_internalIndexId: 'index1',
_originalResponse: {
results: [
{
index: 'index1',
query: 'query1',
},
],
},
rawResults: [
{
index: 'index1',
query: 'query1',
},
],
state: {
index: 'index1',
query: 'query1',
},
},
{
_internalIndexId: 'index2',
_originalResponse: {
results: [
{
index: 'index2',
query: 'query2',
},
],
},
rawResults: [
{
index: 'index2',
query: 'query2',
},
],
state: {
index: 'index2',
query: 'query2',
Expand Down
14 changes: 8 additions & 6 deletions packages/react-instantsearch-core/src/core/createInstantSearchManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export default function createInstantSearchManager({
requests: results.reduce(
(acc, result) =>
acc.concat(
result._originalResponse.results.map(request => ({
result.rawResults.map(request => ({
indexName: request.index,
params: request.params,
}))
Expand All @@ -335,7 +335,7 @@ export default function createInstantSearchManager({
...client.cache,
[key]: {
results: results.reduce(
(acc, result) => acc.concat(result._originalResponse.results),
(acc, result) => acc.concat(result.rawResults),
[]
),
},
Expand All @@ -349,15 +349,17 @@ export default function createInstantSearchManager({
// computation of the key inside the client (see link below).
// https://github.com/algolia/algoliasearch-client-javascript/blob/c27e89ff92b2a854ae6f40dc524bffe0f0cbc169/src/AlgoliaSearchCore.js#L232-L240
const key = `/1/indexes/*/queries_body_${JSON.stringify({
requests: results._originalResponse.results.map(request => ({
requests: results.rawResults.map(request => ({
indexName: request.index,
params: request.params,
})),
})}`;

client.cache = {
...client.cache,
[key]: results._originalResponse,
[key]: {
results: results.rawResults,
},
};
}

Expand All @@ -372,7 +374,7 @@ export default function createInstantSearchManager({
...acc,
[result._internalIndexId]: new algoliasearchHelper.SearchResults(
new algoliasearchHelper.SearchParameters(result.state),
result._originalResponse.results
result.rawResults
),
}),
{}
Expand All @@ -381,7 +383,7 @@ export default function createInstantSearchManager({

return new algoliasearchHelper.SearchResults(
new algoliasearchHelper.SearchParameters(results.state),
results._originalResponse.results
results.rawResults
);
}

Expand Down
19 changes: 11 additions & 8 deletions packages/react-instantsearch-core/src/widgets/InstantSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ import PropTypes from 'prop-types';
import createInstantSearchManager from '../core/createInstantSearchManager';
import { InstantSearchProvider, InstantSearchContext } from '../core/context';
import { Store } from '../core/createStore';
import { PlainSearchParameters, SearchParameters } from 'algoliasearch-helper';
import { MultiResponse } from 'algoliasearch';

function isControlled(props: Props) {
return Boolean(props.searchState);
}

// @TODO: move this to the helper?
type SearchParameters = any; // algoliaHelper.SearchParameters
type SearchResults = any; // algoliaHelper.SearchResults
type ResultsState = {
state: PlainSearchParameters;
rawResults: MultiResponse;
};

// @TODO: move to createInstantSearchManager when it's TS
type InstantSearchManager = {
Expand Down Expand Up @@ -53,13 +52,17 @@ type Props = {
searchState: SearchState
) => void;
stalledSearchDelay?: number;
resultsState: SearchResults | { [indexId: string]: SearchResults };
resultsState: ResultsState | { [indexId: string]: ResultsState };
};

type State = {
contextValue: InstantSearchContext;
};

function isControlled(props: Props) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TS complained about "use before declare", but not sure why it only now complained. It's not that big of a deal though.

return Boolean(props.searchState);
}

/**
* @description
* `<InstantSearch>` is the root component of all React InstantSearch implementations.
Expand Down
Loading