remove all params!

Author: drewdaemon

src/platform/plugins/shared/data/public/search/search_interceptor/search_interceptor.test.ts

@@ -482,14 +482,12 @@ describe('SearchInterceptor', () => {
       const firstRequest = (
         mockCoreSetup.http.post.mock.calls[0] as unknown as [string, HttpFetchOptions]
       )[1];
-      expect(JSON.parse(firstRequest?.body as string).params.query).toBeDefined();
-      expect(JSON.parse(firstRequest?.body as string).params.filter).toBeDefined();
+      expect(JSON.parse(firstRequest?.body as string).params).toBeDefined();
 
       const secondRequest = (
         mockCoreSetup.http.post.mock.calls[1] as unknown as [string, HttpFetchOptions]
       )[1];
-      expect(JSON.parse(secondRequest?.body as string).params.query).not.toBeDefined();
-      expect(JSON.parse(secondRequest?.body as string).params.filter).not.toBeDefined();
+      expect(JSON.parse(secondRequest?.body as string).params).not.toBeDefined();
     });
 
     test('should make secondary request if first call returns partial result (DSL)', async () => {
@@ -601,12 +599,12 @@ describe('SearchInterceptor', () => {
       const firstRequest = (
         mockCoreSetup.http.post.mock.calls[0] as unknown as [string, HttpFetchOptions]
       )[1];
-      expect(JSON.parse(firstRequest?.body as string).params.body).toBeDefined();
+      expect(JSON.parse(firstRequest?.body as string).params).toBeDefined();
 
       const secondRequest = (
         mockCoreSetup.http.post.mock.calls[1] as unknown as [string, HttpFetchOptions]
       )[1];
-      expect(JSON.parse(secondRequest?.body as string).params.body).not.toBeDefined();
+      expect(JSON.parse(secondRequest?.body as string).params).not.toBeDefined();
     });
 
     test('should abort on user abort', async () => {

src/platform/plugins/shared/data/public/search/search_interceptor/search_interceptor.ts

@@ -445,21 +445,15 @@ export class SearchInterceptor {
    * @throws `AbortError` | `ErrorLike`
    */
   private runSearch(
-    request: IKibanaSearchRequest,
+    { params, ...request }: IKibanaSearchRequest,
     options?: ISearchOptions
   ): Promise<IKibanaSearchResponse> {
     const { abortSignal } = options || {};
 
-    const requestHash = request.params
-      ? createRequestHashForBackgroundSearches(request.params)
-      : undefined;
+    const requestHash = params ? createRequestHashForBackgroundSearches(params) : undefined;
 
     const { executionContext, strategy, ...searchOptions } = this.getSerializableOptions(options);
 
-    if (request.id) {
-      request = optimizeParamsForPoll(request, strategy);
-    }
-
     return this.deps.http
       .post<IKibanaSearchResponse | ErrorResponseBase>(
         `/internal/search/${strategy}${request.id ? `/${request.id}` : ''}`,
@@ -468,7 +462,7 @@ export class SearchInterceptor {
           signal: abortSignal,
           context: this.deps.executionContext.withGlobalContext(executionContext),
           body: JSON.stringify({
-            ...request,
+            ...(request.id ? request : { params, ...request }),
             ...searchOptions,
             requestHash,
             stream:
@@ -710,29 +704,4 @@ export class SearchInterceptor {
   }
 }
 
-/**
- * Polling requests do not need to include all the info required for initial search requests.
- */
-const optimizeParamsForPoll = (
-  request: IKibanaSearchRequest,
-  strategy: string | undefined
-): IKibanaSearchRequest => {
-  if (!request.params) return request;
-
-  let optimizedParams = request.params;
-
-  if (strategy === ESQL_ASYNC_SEARCH_STRATEGY) {
-    const { query, filter: _filter, ...paramsWithoutQueryAndFilter } = request.params;
-    optimizedParams = paramsWithoutQueryAndFilter;
-  } else {
-    const { body, ...paramsWithoutBody } = request.params;
-    optimizedParams = paramsWithoutBody;
-  }
-
-  return {
-    ...request,
-    params: optimizedParams,
-  };
-};
-
 export type ISearchInterceptor = PublicMethodsOf<SearchInterceptor>;