fix(SSR): clean SP before rendering agan (#238)

algolia · Aug 8, 2017 · e765886 · e765886
1 parent 7f8f3ae
commit e765886
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/packages/react-instantsearch/src/core/createInstantSearchServer.js b/packages/react-instantsearch/src/core/createInstantSearchServer.js
@@ -38,6 +38,7 @@ const createInstantSearch = function(algoliasearch) {
   };
 
   const findResultsState = function(App, props) {
+    searchParameters = [];
     ReactDom.renderToString(<App {...props} />);
     const sharedSearchParameters = searchParameters
       .filter(searchParameter => !hasMultipleIndex(searchParameter.context))
@@ -66,8 +67,6 @@ const createInstantSearch = function(algoliasearch) {
         return acc;
       }, {});
 
-    searchParameters = [];
-
     if (isEmpty(mergedSearchParameters)) {
       const helper = algoliasearchHelper(client, sharedSearchParameters.index);
       return helper.searchOnce(sharedSearchParameters);

diff --git a/packages/react-instantsearch/src/core/createInstantSearchServer.test.js b/packages/react-instantsearch/src/core/createInstantSearchServer.test.js
@@ -14,24 +14,28 @@ describe('createInstantSearchServer', () => {
     search: () => Promise.resolve({ results: [{ query: 'query' }] }),
   };
   const algoliaClientFactory = jest.fn(() => algoliaClient);
+  const getSearchParametersCall = jest.fn();
   const {
     InstantSearch: CustomInstantSearch,
     findResultsState,
   } = createInstantSearch(algoliaClientFactory);
   const Connected = createConnector({
     displayName: 'CoolConnector',
     getProvidedProps: () => null,
-    getSearchParameters: (searchParameters, props, searchState) =>
-      isEmpty(searchState)
+    getSearchParameters: (searchParameters, props, searchState) => {
+      getSearchParametersCall();
+      return isEmpty(searchState)
         ? searchParameters.setIndex(searchParameters.index)
         : searchParameters.setIndex(
             searchState.index
               ? searchState.index
               : searchState.indices[searchParameters.index].index
-          ),
+          );
+    },
     getMetadata: () => null,
     getId: () => 'id',
   })(() => null);
+
   beforeEach(() => {
     algoliaClient.addAlgoliaAgent.mockClear();
     algoliaClientFactory.mockClear();
@@ -56,6 +60,21 @@ describe('createInstantSearchServer', () => {
     });
 
     describe('find results', () => {
+      it('searchParameters should be cleaned each time', () => {
+        const App = () =>
+          <CustomInstantSearch appId="app" apiKey="key" indexName="indexName">
+            <Connected />
+          </CustomInstantSearch>;
+
+        expect.assertions(1);
+        return findResultsState(App).then(() => {
+          getSearchParametersCall.mockClear();
+          findResultsState(App).then(() => {
+            expect(getSearchParametersCall).toHaveBeenCalledTimes(2);
+          });
+        });
+      });
+
       it('without search state', () => {
         const App = () =>
           <CustomInstantSearch appId="app" apiKey="key" indexName="indexName">
@@ -125,6 +144,22 @@ describe('createInstantSearchServer', () => {
     });
 
     describe('find results', () => {
+      it('searchParameters should be cleaned each time', () => {
+        const App = () =>
+          <CustomInstantSearch appId="app" apiKey="key" indexName="indexName">
+            <Connected />
+          </CustomInstantSearch>;
+
+        expect.assertions(1);
+
+        return findResultsState(App).then(() => {
+          getSearchParametersCall.mockClear();
+          findResultsState(App).then(() => {
+            expect(getSearchParametersCall).toHaveBeenCalledTimes(2);
+          });
+        });
+      });
+
       it('without search state', () => {
         const App = () =>
           <CustomInstantSearch appId="app" apiKey="key" indexName="index1">