From 3f683dc25d213f72c08f8fe89077058eb2d0656d Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Mon, 7 Sep 2020 16:59:17 +0300
Subject: [PATCH] Simplify options

---
 .../server/search/es_search_strategy.ts       | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 420b15cd706d0..cace1f5d6a02b 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -84,34 +84,18 @@ async function asyncSearch(
   request: IEnhancedEsSearchRequest,
   options?: ISearchOptions
 ): Promise<IEsSearchResponse> {
-  const { timeout = undefined, restTotalHitsAsInt = undefined, ...params } = {
-    ...request.params,
-  };
-
-  params.trackTotalHits = true; // Get the exact count of hits
-
-  // If we have an ID, then just poll for that ID, otherwise send the entire request body
-  const { body = undefined, index = undefined, ...queryParams } = request.id ? {} : params;
-  // Only report partial results every 64 shards; this should be reduced when we actually display partial results
-  const batchedReduceSize = request.id ? undefined : 64;
-
-  const asyncOptions = {
-    waitForCompletionTimeout: '100ms', // Wait up to 100ms for the response to return
-    keepAlive: '1m', // Extend the TTL for this search request by one minute
-  };
-
-  const queryOptions = toSnakeCase({
-    ...asyncOptions,
-    ...(batchedReduceSize && { batchedReduceSize }),
-    ...queryParams,
-  });
-
   let esResponse;
+  // If we have an ID, then just poll for that ID, otherwise send the entire request body
   if (!request.id) {
-    esResponse = await client.asyncSearch.submit({
-      body,
-      ...queryOptions,
+    const submitOptions = toSnakeCase({
+      batchedReduceSize: 64, // Only report partial results every 64 shards; this should be reduced when we actually display partial results
+      trackTotalHits: true, // Get the exact count of hits
+      waitForCompletionTimeout: '100ms', // Wait up to 100ms for the response to return
+      keepAlive: '1m', // Extend the TTL for this search request by one minute
+      ...request.params,
     });
+
+    esResponse = await client.asyncSearch.submit(submitOptions);
   } else {
     esResponse = await client.asyncSearch.get({
       id: request.id,