From 0c44799d4162c8ece95c38c095d355241f5c5c28 Mon Sep 17 00:00:00 2001
From: Daniil <daniil_suleiman@epam.com>
Date: Mon, 21 Dec 2020 13:42:25 +0300
Subject: [PATCH] Fix request with disabled aggregation (#85696)

* Fix request with disabled aggregation

* Update unit tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../search/expressions/esaggs/request_handler.test.ts    | 9 ++++++++-
 .../common/search/expressions/esaggs/request_handler.ts  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
index 78d169e8529c5..9d0c63a8dc7aa 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
@@ -150,7 +150,8 @@ describe('esaggs expression function - public', () => {
     });
   });
 
-  test('calls agg.postFlightRequest if it exiests', async () => {
+  test('calls agg.postFlightRequest if it exiests and agg is enabled', async () => {
+    mockParams.aggs.aggs[0].enabled = true;
     await handleRequest(mockParams);
     expect(mockParams.aggs.aggs[0].type.postFlightRequest).toHaveBeenCalledTimes(1);
 
@@ -160,6 +161,12 @@ describe('esaggs expression function - public', () => {
     expect(async () => await handleRequest(mockParams)).not.toThrowError();
   });
 
+  test('should skip agg.postFlightRequest call if the agg is disabled', async () => {
+    mockParams.aggs.aggs[0].enabled = false;
+    await handleRequest(mockParams);
+    expect(mockParams.aggs.aggs[0].type.postFlightRequest).toHaveBeenCalledTimes(0);
+  });
+
   test('tabifies response data', async () => {
     await handleRequest(mockParams);
     expect(tabifyAggResponse).toHaveBeenCalledWith(
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
index e4385526ee6e8..b773aad67c3f8 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -170,7 +170,7 @@ export const handleRequest = async ({
   // response data incorrectly in the inspector.
   let response = (searchSource as any).rawResponse;
   for (const agg of aggs.aggs) {
-    if (typeof agg.type.postFlightRequest === 'function') {
+    if (agg.enabled && typeof agg.type.postFlightRequest === 'function') {
       response = await agg.type.postFlightRequest(
         response,
         aggs,