[8.16] [Discover] Unskip Discover-Lens functional test suite (elastic…

…#200687) (elastic#201076) # Backport This will backport the following commits from `main` to `8.16`: - [[Discover] Unskip Discover-Lens functional test suite (elastic#200687)](elastic#200687)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) \n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n\n\nCo-authored-by: Matthias Wilhelm <[email protected]>"}}]}] BACKPORT-->
kibanamachine · Nov 21, 2024 · ab696dd · ab696dd
1 parent 44f4203
commit ab696dd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/src/plugins/unified_histogram/public/chart/histogram.tsx b/src/plugins/unified_histogram/public/chart/histogram.tsx
@@ -10,12 +10,12 @@
 import { useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import React, { useState } from 'react';
-import type { DataView } from '@kbn/data-views-plugin/public';
+import type { DataView, DataViewSpec } from '@kbn/data-views-plugin/public';
 import type { DefaultInspectorAdapters, Datatable } from '@kbn/expressions-plugin/common';
 import type { IKibanaSearchResponse } from '@kbn/search-types';
 import type { estypes } from '@elastic/elasticsearch';
 import type { TimeRange } from '@kbn/es-query';
-import type {
+import {
   EmbeddableComponentProps,
   LensEmbeddableInput,
   LensEmbeddableOutput,
@@ -59,6 +59,32 @@ export interface HistogramProps {
   withDefaultActions: EmbeddableComponentProps['withDefaultActions'];
 }
 
+/**
+ * To prevent flakiness in the chart, we need to ensure that the data view config is valid.
+ * This requires that there are not multiple different data view ids in the given configuration.
+ * @param dataView
+ * @param visContext
+ * @param adHocDataViews
+ */
+const checkValidDataViewConfig = (
+  dataView: DataView,
+  visContext: UnifiedHistogramVisContext,
+  adHocDataViews: { [key: string]: DataViewSpec } | undefined
+) => {
+  if (!dataView.id) {
+    return false;
+  }
+
+  if (!dataView.isPersisted() && !adHocDataViews?.[dataView.id]) {
+    return false;
+  }
+
+  if (dataView.id !== visContext.requestData.dataViewId) {
+    return false;
+  }
+  return true;
+};
+
 const computeTotalHits = (
   hasLensSuggestions: boolean,
   adapterTables:
@@ -204,6 +230,10 @@ export function Histogram({
     }
   `;
 
+  if (!checkValidDataViewConfig(dataView, visContext, lensProps.attributes.state.adHocDataViews)) {
+    return <></>;
+  }
+
   return (
     <>
       <div

diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
@@ -110,8 +110,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     return seriesType;
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/184600
-  describe.skip('discover lens vis', function () {
+  describe('discover lens vis', function () {
     before(async () => {
       await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
@@ -655,8 +654,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await discover.waitUntilSearchingHasFinished();
       await testSubjects.missingOrFail('unsavedChangesBadge');
 
-      await discover.chooseLensSuggestion('pie');
-      expect(await getCurrentVisTitle()).to.be('Pie');
+      await discover.chooseLensSuggestion('waffle');
+      expect(await getCurrentVisTitle()).to.be('Waffle');
       await testSubjects.existOrFail('partitionVisChart');
       expect(await discover.getVisContextSuggestionType()).to.be('lensSuggestion');