From 776a886a3bb18e1223d7dd31fd7a94c38a2c75e3 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 16 Jul 2021 12:27:11 -0500 Subject: [PATCH 1/5] [ML] Fix flaky saved search --- .../index_data_visualizer.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index 8e0230a9bc6f94..2835588625a6e5 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -65,20 +65,16 @@ export const DataVisualizerUrlStateContextProvider: FC { - if (typeof parsedQueryString?.index === 'string') { - const indexPattern = await indexPatterns.get(parsedQueryString.index); - setCurrentIndexPattern(indexPattern); - } - if (typeof parsedQueryString?.savedSearchId === 'string') { const savedSearchId = parsedQueryString.savedSearchId; try { const savedSearch = await savedObjectsClient.get('search', savedSearchId); const indexPatternId = savedSearch.references.find((ref) => ref.type === 'index-pattern') ?.id; - if (indexPatternId !== undefined) { + if (indexPatternId !== undefined && savedSearch) { try { const indexPattern = await indexPatterns.get(indexPatternId); + setCurrentSavedSearch(savedSearch); setCurrentIndexPattern(indexPattern); } catch (e) { toasts.addError(e, { @@ -88,7 +84,6 @@ export const DataVisualizerUrlStateContextProvider: FC Date: Fri, 16 Jul 2021 12:28:09 -0500 Subject: [PATCH 2/5] [ML] Re-enable tests --- .../apps/ml/data_visualizer/index_data_visualizer.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index 2e88198adbc089..031074876f39c7 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -496,8 +496,7 @@ export default function ({ getService }: FtrProviderContext) { }); } - // FLAKY: https://github.com/elastic/kibana/issues/105087 - describe.skip('index based', function () { + describe('index based', function () { this.tags(['mlqa']); before(async () => { await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); From e2ceb69c8a27576e8e127454a69b6733b9549e76 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 16 Jul 2021 12:29:36 -0500 Subject: [PATCH 3/5] [ML] Make data viz the only tests for flaky test suite runner --- x-pack/test/functional/apps/ml/data_visualizer/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index.ts b/x-pack/test/functional/apps/ml/data_visualizer/index.ts index 3e6b644a0b494a..dc04b30e42cb17 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index.ts @@ -8,7 +8,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('data visualizer', function () { + // eslint-disable-next-line ban/ban + describe.only('data visualizer', function () { this.tags(['skipFirefox']); loadTestFile(require.resolve('./index_data_visualizer')); From 942c984477e6a234adeb791b08a669c879271364 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 16 Jul 2021 13:18:31 -0500 Subject: [PATCH 4/5] [ML] Make ML only --- x-pack/test/functional/apps/ml/data_visualizer/index.ts | 3 +-- x-pack/test/functional/apps/ml/index.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index.ts b/x-pack/test/functional/apps/ml/data_visualizer/index.ts index dc04b30e42cb17..3e6b644a0b494a 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index.ts @@ -8,8 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - // eslint-disable-next-line ban/ban - describe.only('data visualizer', function () { + describe('data visualizer', function () { this.tags(['skipFirefox']); loadTestFile(require.resolve('./index_data_visualizer')); diff --git a/x-pack/test/functional/apps/ml/index.ts b/x-pack/test/functional/apps/ml/index.ts index abaa387336c883..0b1b5c72b9dfbf 100644 --- a/x-pack/test/functional/apps/ml/index.ts +++ b/x-pack/test/functional/apps/ml/index.ts @@ -12,7 +12,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { const ml = getService('ml'); describe('machine learning', function () { - describe('', function () { + // eslint-disable-next-line ban/ban + describe.only('', function () { this.tags('ciGroup3'); before(async () => { From 39ab8a87d1ed1e286f1fcfbe87a2e32bac642dad Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 16 Jul 2021 13:28:18 -0500 Subject: [PATCH 5/5] [ML] Remove describe.only --- x-pack/test/functional/apps/ml/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/ml/index.ts b/x-pack/test/functional/apps/ml/index.ts index 0b1b5c72b9dfbf..abaa387336c883 100644 --- a/x-pack/test/functional/apps/ml/index.ts +++ b/x-pack/test/functional/apps/ml/index.ts @@ -12,8 +12,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { const ml = getService('ml'); describe('machine learning', function () { - // eslint-disable-next-line ban/ban - describe.only('', function () { + describe('', function () { this.tags('ciGroup3'); before(async () => {