From 8dce4e76bb7005ec75a4c7d392cb17537b85367c Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 19 Nov 2024 15:24:10 +0100
Subject: [PATCH 1/5] [Discover] Another attempt to address the flaky test

---
 .../unified_histogram/public/chart/chart.tsx  | 42 ++++++++++---------
 .../apps/discover/group3/_lens_vis.ts         |  6 +--
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/plugins/unified_histogram/public/chart/chart.tsx b/src/plugins/unified_histogram/public/chart/chart.tsx
index 4fb1b9cbe6471..16addd06cd0e4 100644
--- a/src/plugins/unified_histogram/public/chart/chart.tsx
+++ b/src/plugins/unified_histogram/public/chart/chart.tsx
@@ -357,26 +357,28 @@ export function Chart({
                 <EuiProgress size="xs" color="accent" position="absolute" />
               </EuiDelayRender>
             )}
-            <HistogramMemoized
-              abortController={abortController}
-              services={services}
-              dataView={dataView}
-              request={request}
-              hits={hits}
-              chart={chart}
-              getTimeRange={getTimeRange}
-              refetch$={refetch$}
-              visContext={visContext}
-              isPlainRecord={isPlainRecord}
-              disableTriggers={disableTriggers}
-              disabledActions={disabledActions}
-              onTotalHitsChange={onTotalHitsChange}
-              hasLensSuggestions={hasLensSuggestions}
-              onChartLoad={onChartLoad}
-              onFilter={onFilter}
-              onBrushEnd={onBrushEnd}
-              withDefaultActions={withDefaultActions}
-            />
+            {dataView.id === visContext?.requestData.dataViewId ? (
+              <HistogramMemoized
+                abortController={abortController}
+                services={services}
+                dataView={dataView}
+                request={request}
+                hits={hits}
+                chart={chart}
+                getTimeRange={getTimeRange}
+                refetch$={refetch$}
+                visContext={visContext}
+                isPlainRecord={isPlainRecord}
+                disableTriggers={disableTriggers}
+                disabledActions={disabledActions}
+                onTotalHitsChange={onTotalHitsChange}
+                hasLensSuggestions={hasLensSuggestions}
+                onChartLoad={onChartLoad}
+                onFilter={onFilter}
+                onBrushEnd={onBrushEnd}
+                withDefaultActions={withDefaultActions}
+              />
+            ) : null}
           </section>
           {appendHistogram}
         </EuiFlexItem>
diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
index 03641ee5bcb41..46b21a00294fe 100644
--- a/test/functional/apps/discover/group3/_lens_vis.ts
+++ b/test/functional/apps/discover/group3/_lens_vis.ts
@@ -19,11 +19,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');
   const toasts = getService('toasts');
   const dataViews = getService('dataViews');
-  const { common, discover, header, timePicker } = getPageObjects([
+  const { common, discover, header, timePicker, home } = getPageObjects([
     'common',
     'discover',
     'header',
     'timePicker',
+    'home',
   ]);
   const security = getService('security');
   const defaultSettings = {
@@ -110,8 +111,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     return seriesType;
   }
 
-  // FLAKY: 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');

From b5dbaf4815c1bff8ad1a89a8e6d00a9a7f87edd9 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 19 Nov 2024 15:24:45 +0100
Subject: [PATCH 2/5] [Discover] One correction

---
 src/plugins/unified_histogram/public/chart/chart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/unified_histogram/public/chart/chart.tsx b/src/plugins/unified_histogram/public/chart/chart.tsx
index 16addd06cd0e4..ef0e4b793d146 100644
--- a/src/plugins/unified_histogram/public/chart/chart.tsx
+++ b/src/plugins/unified_histogram/public/chart/chart.tsx
@@ -357,7 +357,7 @@ export function Chart({
                 <EuiProgress size="xs" color="accent" position="absolute" />
               </EuiDelayRender>
             )}
-            {dataView.id === visContext?.requestData.dataViewId ? (
+            {dataView?.id === visContext?.requestData.dataViewId ? (
               <HistogramMemoized
                 abortController={abortController}
                 services={services}

From 8300c1722143d242ff806997c5d3359bec8bf793 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 19 Nov 2024 15:27:09 +0100
Subject: [PATCH 3/5] Update test/functional/apps/discover/group3/_lens_vis.ts

---
 test/functional/apps/discover/group3/_lens_vis.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
index 46b21a00294fe..6847729291ef0 100644
--- a/test/functional/apps/discover/group3/_lens_vis.ts
+++ b/test/functional/apps/discover/group3/_lens_vis.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');
   const toasts = getService('toasts');
   const dataViews = getService('dataViews');
-  const { common, discover, header, timePicker, home } = getPageObjects([
+  const { common, discover, header, timePicker } = getPageObjects([
     'common',
     'discover',
     'header',

From 72b6ade95eb91c4dcecd068e33f250fbdfc0a326 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 19 Nov 2024 15:27:22 +0100
Subject: [PATCH 4/5] Update test/functional/apps/discover/group3/_lens_vis.ts

---
 test/functional/apps/discover/group3/_lens_vis.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
index 6847729291ef0..0864382cad7a8 100644
--- a/test/functional/apps/discover/group3/_lens_vis.ts
+++ b/test/functional/apps/discover/group3/_lens_vis.ts
@@ -24,7 +24,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'discover',
     'header',
     'timePicker',
-    'home',
   ]);
   const security = getService('security');
   const defaultSettings = {

From 65f59bf238665676943c19451f3da2296e1b32a7 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 19 Nov 2024 15:27:41 +0100
Subject: [PATCH 5/5] Update
 src/plugins/unified_histogram/public/chart/chart.tsx

---
 src/plugins/unified_histogram/public/chart/chart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/unified_histogram/public/chart/chart.tsx b/src/plugins/unified_histogram/public/chart/chart.tsx
index ef0e4b793d146..dd0a86ce7d3bc 100644
--- a/src/plugins/unified_histogram/public/chart/chart.tsx
+++ b/src/plugins/unified_histogram/public/chart/chart.tsx
@@ -357,7 +357,7 @@ export function Chart({
                 <EuiProgress size="xs" color="accent" position="absolute" />
               </EuiDelayRender>
             )}
-            {dataView?.id === visContext?.requestData.dataViewId ? (
+            {dataView?.id === visContext?.requestData?.dataViewId ? (
               <HistogramMemoized
                 abortController={abortController}
                 services={services}