Merge pull request #141 from social-native/fix/es710-results

Fix bug of not saving results from ES710

package.json

@@ -1,6 +1,6 @@
 {
     "name": "elastic-composer",
-    "version": "4.6.0",
+    "version": "4.6.1",
     "description": "",
     "main": "dist/index.cjs.js",
     "module": "dist/index.es.js",

src/__tests__/manager.test.ts

@@ -0,0 +1,39 @@
+import Manager from '../manager';
+
+describe('Manager', () => {
+    describe('#_saveQueryResults', () => {
+        it('saves ES 7.10 query results', () => {
+            const fakeES710QueryResults = {
+                took: 2,
+                timed_out: false,
+                _shards: {total: 1, successful: 1, skipped: 0, failed: 0},
+                hits: {
+                    total: {value: 10, relation: 'eq'},
+                    max_score: 1,
+                    hits: [
+                        {
+                            _index: 'crm_index',
+                            _type: '_doc',
+                            _id: '_aLNPnkBrs-zuIFb2nyl',
+                            _score: 1,
+                            _source: {id: 234},
+                            sort: [1, 0]
+                        },
+                        {
+                            _index: 'crm_index',
+                            _type: '_doc',
+                            _id: '_qKLP3kBrs-zuIFbcXxC',
+                            _score: 1,
+                            _source: {id: 2344, 'user_profile.birth_date': 712652400000},
+                            sort: [1, 1]
+                        }
+                    ]
+                }
+            };
+            // @ts-ignore
+            const manager = new Manager();
+            manager._saveQueryResults(fakeES710QueryResults);
+            expect(manager.results).toEqual(fakeES710QueryResults.hits.hits)
+        });
+    });
+});

src/manager.ts

@@ -22,7 +22,8 @@ import {
     IFilters,
     ISuggestions,
     ManagerOptions,
-    EffectKinds
+    EffectKinds,
+    ES710Response,
 } from './types';
 import {objKeys} from './utils';
 import {decorate, observable, runInAction, reaction, toJS, computed} from 'mobx';
@@ -129,7 +130,7 @@ class Manager<
     public suggestions: ISuggestions;
 
     public results: Array<ESHit<ESDocSource>>;
-    public rawESResponse?: ESResponse<ESDocSource>;
+    public rawESResponse?: ESResponse<ESDocSource> | ES710Response<ESDocSource>;
 
     public _sideEffectQueue: Array<EffectRequest<EffectKinds>>;
     public isSideEffectRunning: boolean;
@@ -761,8 +762,9 @@ class Manager<
      * Save the results
      * The results contain the documents found in the query that match the filters
      */
-    public _saveQueryResults = (response: ESResponse<ESDocSource>) => {
-        if (response.timed_out === false && response.hits.total >= 0) {
+    public _saveQueryResults = (response: ESResponse<ESDocSource> | ES710Response<ESDocSource>) => {
+        const totalHits = typeof response.hits.total === 'number' ? response.hits.total : response.hits.total.value;
+        if (response.timed_out === false && totalHits >= 0) {
             runInAction(() => {
                 if (response && response.hits && response.hits.hits) {
                     this.results = response.hits.hits;

src/types.ts

@@ -17,7 +17,7 @@ import {FuzzySuggestion, BaseSuggestion} from './suggestions';
  * ES Request
  * ***********************************
  */
-export type ESRequestSortField = Array<object | string>;
+export type ESRequestSortField = Array<object | string | number>;
 
 export type ESRequest = {
     query: {
@@ -63,6 +63,16 @@ export type ESResponse<Source extends object = object> = {
     };
 };
 
+export type ES710Response<Source extends object = object> = {
+    took: number;
+    timed_out: boolean;
+    _shards: {total: number; successful: number; skipped: number; failed: number};
+    hits: {total: { value: number, relation: string}; max_score: number; hits: Array<ESHit<Source>>};
+    aggregations?: {
+        [boundary: string]: AggregationResults;
+    };
+};
+
 export type ESHit<Source extends object = object> = {
     _index: string;
     _type: string;