[Search Sessions] fix saved object can be created even if courier:bat…

…chSearches is enabled (elastic#105407)
kibanamachine · Jul 15, 2021 · 6db4e68 · 6db4e68
1 parent 125eee0
commit 6db4e68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -909,6 +909,16 @@ describe('SearchSource', () => {
         expect(callOptions.strategy).toBe(ES_SEARCH_STRATEGY);
       });
 
+      test('should remove searchSessionId when forcing ES_SEARCH_STRATEGY', async () => {
+        searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);
+        const options = { sessionId: 'test' };
+        await searchSource.fetch$(options).toPromise();
+
+        const [, callOptions] = mockSearchMethod.mock.calls[0];
+        expect(callOptions.strategy).toBe(ES_SEARCH_STRATEGY);
+        expect(callOptions.sessionId).toBeUndefined();
+      });
+
       test('should not override strategy if set ', async () => {
         searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);
         const options = { strategy: 'banana' };

diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
@@ -287,6 +287,8 @@ export class SearchSource {
     // This still uses bfetch for batching.
     if (!options?.strategy && syncSearchByDefault) {
       options.strategy = ES_SEARCH_STRATEGY;
+      // `ES_SEARCH_STRATEGY` doesn't support search sessions, hence remove sessionId
+      options.sessionId = undefined;
     }
 
     const s$ = defer(() => this.requestIsStarting(options)).pipe(