fix(results): revert commit that ensure hits are returned only if rig…

…ht indices (#149) This was breaking the SortBy feature. We need to find another way to handle the switch between mono indices / multi indices.
algolia · Jul 6, 2017 · df9aa25 · df9aa25
1 parent 3183b4a
commit df9aa25
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 144 deletions.
diff --git a/packages/react-instantsearch/src/connectors/connectHierarchicalMenu.test.js b/packages/react-instantsearch/src/connectors/connectHierarchicalMenu.test.js
@@ -22,7 +22,6 @@ describe('connectHierarchicalMenu', () => {
         getFacetValues: jest.fn(),
         getFacetByName: () => true,
         hits: [],
-        index: 'index',
       };
 
       results.getFacetValues.mockImplementationOnce(() => ({}));
@@ -335,7 +334,6 @@ describe('connectHierarchicalMenu', () => {
         first: {
           getFacetValues: jest.fn(),
           getFacetByName: () => true,
-          index: 'first',
         },
       };
 

diff --git a/packages/react-instantsearch/src/connectors/connectHits.test.js b/packages/react-instantsearch/src/connectors/connectHits.test.js
@@ -12,7 +12,7 @@ describe('connectHits', () => {
     it('provides the current hits to the component', () => {
       const hits = [{}];
       const props = getProvidedProps(null, null, {
-        results: { hits, index: 'index' },
+        results: { hits },
       });
       expect(props).toEqual({ hits });
     });
@@ -38,7 +38,7 @@ describe('connectHits', () => {
     it('provides the current hits to the component', () => {
       const hits = [{}];
       const props = getProvidedProps(null, null, {
-        results: { second: { hits, index: 'second' } },
+        results: { second: { hits } },
       });
       expect(props).toEqual({ hits });
     });

diff --git a/packages/react-instantsearch/src/connectors/connectInfiniteHits.test.js b/packages/react-instantsearch/src/connectors/connectInfiniteHits.test.js
@@ -11,7 +11,7 @@ describe('connectInfiniteHits', () => {
     it('provides the current hits to the component', () => {
       const hits = [{}];
       const props = getProvidedProps(null, null, {
-        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3, index: 'index' },
+        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3 },
       });
       expect(props).toEqual({ hits, hasMore: true });
     });
@@ -20,7 +20,7 @@ describe('connectInfiniteHits', () => {
       const hits = [{}, {}];
       const hits2 = [{}, {}];
       const res1 = getProvidedProps(null, null, {
-        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3, index: 'index' },
+        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3 },
       });
       expect(res1.hits).toEqual(hits);
       expect(res1.hasMore).toBe(true);
@@ -30,7 +30,6 @@ describe('connectInfiniteHits', () => {
           page: 1,
           hitsPerPage: 2,
           nbPages: 3,
-          index: 'index',
         },
       });
       expect(res2.hits).toEqual([...hits, ...hits2]);
@@ -42,7 +41,7 @@ describe('connectInfiniteHits', () => {
       const hits2 = [{}, {}, {}, {}, {}, {}];
       const hits3 = [{}, {}, {}, {}, {}, {}, {}, {}];
       const res1 = getProvidedProps(null, null, {
-        results: { hits, page: 0, hitsPerPage: 6, nbPages: 10, index: 'index' },
+        results: { hits, page: 0, hitsPerPage: 6, nbPages: 10 },
       });
       expect(res1.hits).toEqual(hits);
       expect(res1.hasMore).toBe(true);
@@ -52,7 +51,6 @@ describe('connectInfiniteHits', () => {
           page: 1,
           hitsPerPage: 6,
           nbPages: 10,
-          index: 'index',
         },
       });
       expect(res2.hits).toEqual([...hits, ...hits2]);
@@ -63,7 +61,6 @@ describe('connectInfiniteHits', () => {
           page: 2,
           hitsPerPage: 8,
           nbPages: 10,
-          index: 'index',
         },
       });
       expect(res3.hits).toEqual([...hits, ...hits2, ...hits3]);
@@ -74,7 +71,6 @@ describe('connectInfiniteHits', () => {
           page: 2,
           hitsPerPage: 8,
           nbPages: 10,
-          index: 'index',
         },
       }); //re-render with the same property
       expect(res3.hits).toEqual([...hits, ...hits2, ...hits3]);
@@ -94,7 +90,6 @@ describe('connectInfiniteHits', () => {
             page,
             hitsPerPage: hits.length,
             nbPages,
-            index: 'index',
           },
         });
         expect(res.hits).toEqual(allHits);
@@ -110,7 +105,6 @@ describe('connectInfiniteHits', () => {
           page: nbPages - 1,
           hitsPerPage: hits.length,
           nbPages,
-          index: 'index',
         },
       });
       expect(res.hits.length).toEqual(nbPages * 2);
@@ -123,15 +117,14 @@ describe('connectInfiniteHits', () => {
       const hits2 = [{}, {}];
       const hits3 = [{}];
       getProvidedProps(null, null, {
-        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3, index: 'index' },
+        results: { hits, page: 0, hitsPerPage: 2, nbPages: 3 },
       });
       getProvidedProps(null, null, {
         results: {
           hits: hits2,
           page: 1,
           hitsPerPage: 2,
           nbPages: 3,
-          index: 'index',
         },
       });
       const props = getProvidedProps(null, null, {
@@ -140,7 +133,6 @@ describe('connectInfiniteHits', () => {
           page: 2,
           hitsPerPage: 2,
           nbPages: 3,
-          index: 'index',
         },
       });
       expect(props.hits).toEqual([...hits, ...hits2, ...hits3]);
@@ -179,15 +171,7 @@ describe('connectInfiniteHits', () => {
     it('provides the current hits to the component', () => {
       const hits = [{}];
       const props = getProvidedProps(null, null, {
-        results: {
-          second: {
-            hits,
-            page: 0,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
-        },
+        results: { second: { hits, page: 0, hitsPerPage: 2, nbPages: 3 } },
       });
       expect(props).toEqual({ hits, hasMore: true });
     });
@@ -196,27 +180,13 @@ describe('connectInfiniteHits', () => {
       const hits = [{}, {}];
       const hits2 = [{}, {}];
       const res1 = getProvidedProps(null, null, {
-        results: {
-          second: {
-            hits,
-            page: 0,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
-        },
+        results: { second: { hits, page: 0, hitsPerPage: 2, nbPages: 3 } },
       });
       expect(res1.hits).toEqual(hits);
       expect(res1.hasMore).toBe(true);
       const res2 = getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits2,
-            page: 1,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
+          second: { hits: hits2, page: 1, hitsPerPage: 2, nbPages: 3 },
         },
       });
       expect(res2.hits).toEqual([...hits, ...hits2]);
@@ -228,53 +198,27 @@ describe('connectInfiniteHits', () => {
       const hits2 = [{}, {}, {}, {}, {}, {}];
       const hits3 = [{}, {}, {}, {}, {}, {}, {}, {}];
       const res1 = getProvidedProps(null, null, {
-        results: {
-          second: {
-            hits,
-            page: 0,
-            hitsPerPage: 6,
-            nbPages: 10,
-            index: 'second',
-          },
-        },
+        results: { second: { hits, page: 0, hitsPerPage: 6, nbPages: 10 } },
       });
       expect(res1.hits).toEqual(hits);
       expect(res1.hasMore).toBe(true);
       const res2 = getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits2,
-            page: 1,
-            hitsPerPage: 6,
-            nbPages: 10,
-            index: 'second',
-          },
+          second: { hits: hits2, page: 1, hitsPerPage: 6, nbPages: 10 },
         },
       });
       expect(res2.hits).toEqual([...hits, ...hits2]);
       expect(res2.hasMore).toBe(true);
       let res3 = getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits3,
-            page: 2,
-            hitsPerPage: 8,
-            nbPages: 10,
-            index: 'second',
-          },
+          second: { hits: hits3, page: 2, hitsPerPage: 8, nbPages: 10 },
         },
       });
       expect(res3.hits).toEqual([...hits, ...hits2, ...hits3]);
       expect(res3.hasMore).toBe(true);
       res3 = getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits3,
-            page: 2,
-            hitsPerPage: 8,
-            nbPages: 10,
-            index: 'second',
-          },
+          second: { hits: hits3, page: 2, hitsPerPage: 8, nbPages: 10 },
         },
       }); //re-render with the same property
       expect(res3.hits).toEqual([...hits, ...hits2, ...hits3]);
@@ -295,7 +239,6 @@ describe('connectInfiniteHits', () => {
               page,
               hitsPerPage: hits.length,
               nbPages,
-              index: 'second',
             },
           },
         });
@@ -313,7 +256,6 @@ describe('connectInfiniteHits', () => {
             page: nbPages - 1,
             hitsPerPage: hits.length,
             nbPages,
-            index: 'second',
           },
         },
       });
@@ -327,36 +269,16 @@ describe('connectInfiniteHits', () => {
       const hits2 = [{}, {}];
       const hits3 = [{}];
       getProvidedProps(null, null, {
-        results: {
-          second: {
-            hits,
-            page: 0,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
-        },
+        results: { second: { hits, page: 0, hitsPerPage: 2, nbPages: 3 } },
       });
       getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits2,
-            page: 1,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
+          second: { hits: hits2, page: 1, hitsPerPage: 2, nbPages: 3 },
         },
       });
       const props = getProvidedProps(null, null, {
         results: {
-          second: {
-            hits: hits3,
-            page: 2,
-            hitsPerPage: 2,
-            nbPages: 3,
-            index: 'second',
-          },
+          second: { hits: hits3, page: 2, hitsPerPage: 2, nbPages: 3 },
         },
       });
       expect(props.hits).toEqual([...hits, ...hits2, ...hits3]);

diff --git a/packages/react-instantsearch/src/connectors/connectMenu.test.js b/packages/react-instantsearch/src/connectors/connectMenu.test.js
@@ -25,7 +25,6 @@ describe('connectMenu', () => {
         getFacetValues: jest.fn(() => []),
         getFacetByName: () => true,
         hits: [],
-        index: 'index',
       };
 
       props = getProvidedProps({ attributeName: 'ok' }, {}, {});
@@ -213,7 +212,6 @@ describe('connectMenu', () => {
         getFacetValues: jest.fn(() => []),
         getFacetByName: () => true,
         hits: [],
-        index: 'index',
       };
       results.getFacetValues.mockImplementation(() => [
         {
@@ -388,7 +386,6 @@ describe('connectMenu', () => {
         getFacetValues: jest.fn(() => []),
         getFacetByName: () => true,
         hits: [],
-        index: 'index',
       };
       results.getFacetValues.mockClear();
       results.getFacetValues.mockImplementation(() => [
@@ -465,7 +462,6 @@ describe('connectMenu', () => {
         first: {
           getFacetValues: jest.fn(() => []),
           getFacetByName: () => true,
-          index: 'first',
         },
       };
 
@@ -654,7 +650,6 @@ describe('connectMenu', () => {
         first: {
           getFacetValues: jest.fn(() => []),
           getFacetByName: () => true,
-          index: 'first',
         },
       };
       results.first.getFacetValues.mockImplementation(() => [

diff --git a/packages/react-instantsearch/src/connectors/connectMultiRange.test.js b/packages/react-instantsearch/src/connectors/connectMultiRange.test.js
@@ -21,7 +21,6 @@ describe('connectMultiRange', () => {
       getFacetStats: () => ({ min: 0, max: 300 }),
       getFacetByName: () => true,
       hits: [],
-      index: 'index',
     };
 
     it('provides the correct props to the component', () => {
@@ -373,7 +372,6 @@ describe('connectMultiRange', () => {
       first: {
         getFacetStats: () => ({ min: 0, max: 300 }),
         getFacetByName: () => true,
-        index: 'first',
       },
     };