From 5847ad9a5a11fff33ab75732cb3dd5e89676d527 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Tue, 22 Dec 2020 17:19:40 +0100
Subject: [PATCH] Fix functional test

---
 .../components/discover_grid/discover_grid_flyout.tsx       | 6 +++---
 test/functional/apps/discover/_data_grid_doc_navigation.ts  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx
index 91de00d1f940c6..79ad98ae2babe1 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx
@@ -124,16 +124,16 @@ export function DiscoverGridFlyout({
             columns={columns}
             indexPattern={indexPattern}
             filter={(mapping, value, mode) => {
-              onClose();
               onFilter(mapping, value, mode);
+              onClose();
             }}
             onRemoveColumn={(columnName: string) => {
-              onClose();
               onRemoveColumn(columnName);
+              onClose();
             }}
             onAddColumn={(columnName: string) => {
-              onClose();
               onAddColumn(columnName);
+              onClose();
             }}
           />
         </EuiFlyoutBody>
diff --git a/test/functional/apps/discover/_data_grid_doc_navigation.ts b/test/functional/apps/discover/_data_grid_doc_navigation.ts
index fff37765e55ac6..92d9893cab0b60 100644
--- a/test/functional/apps/discover/_data_grid_doc_navigation.ts
+++ b/test/functional/apps/discover/_data_grid_doc_navigation.ts
@@ -79,7 +79,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         );
         expect(hasInclusiveFilter).to.be(true);
 
-        await dataGrid.removeInclusiveFilter(details, 'referer');
+        await dataGrid.clickRowToggle({ rowIndex: 0 });
+        const detailsExcluding = await dataGrid.getDetailsRow();
+        await dataGrid.removeInclusiveFilter(detailsExcluding, 'referer');
         await PageObjects.discover.waitUntilSearchingHasFinished();
         const hasExcludeFilter = await filterBar.hasFilter('referer', 'exists', true, false, false);
         expect(hasExcludeFilter).to.be(true);