From 3bf06e1f087611e9bc677c7757b0980767c968bf Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Sat, 26 Oct 2024 04:00:30 +1100
Subject: [PATCH] [8.x] [Discover] Fix suggestions for ES|QL charts (#197583)
 (#197852)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Discover] Fix suggestions for ES|QL charts
(#197583)](https://github.com/elastic/kibana/pull/197583)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Marta
Bondyra","email":"4283304+mbondyra@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-25T15:17:02Z","message":"[Discover]
Fix suggestions for ES|QL charts (#197583)\n\nFixes
https://github.com/elastic/kibana/issues/197342\r\n\r\nIn this PR
(https://github.com/elastic/kibana/pull/197101) I removed the\r\nlegacy
metric from being suggested in the suggestion panel, and replaced\r\nit
with the new metric visualization. To maintain the previous
behavior\r\nin Lens (suggesting a new metric in the same place as legacy
metric), we\r\nmade the score higher for the new metric. This positioned
it higher also\r\nin the Discover ESQL suggestions. This led to an issue
where one\r\nexpected suggestion didn’t appear because we only display
the top 6\r\nsuggestions by score and it got pushed out by
metric.\r\n\r\nAdditionally, I made a change here to only display the
metric without\r\nbucketed columns in the suggestion panel. I don't see
there's a lot of\r\nvalue in suggesting bucketed metric unless it's
something user chooses\r\nintentionally.\r\n\r\nShould be merged to 8.x
after
this:\r\nhttps://github.com/elastic/kibana/pull/197337","sha":"b3b85da80d0c9a8431f6a2f2e3c1bdf1448eb1a6","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Feature:Discover","Team:Visualizations","release_note:skip","v9.0.0","backport:prev-minor"],"title":"[Discover]
Fix suggestions for ES|QL
charts","number":197583,"url":"https://github.com/elastic/kibana/pull/197583","mergeCommit":{"message":"[Discover]
Fix suggestions for ES|QL charts (#197583)\n\nFixes
https://github.com/elastic/kibana/issues/197342\r\n\r\nIn this PR
(https://github.com/elastic/kibana/pull/197101) I removed the\r\nlegacy
metric from being suggested in the suggestion panel, and replaced\r\nit
with the new metric visualization. To maintain the previous
behavior\r\nin Lens (suggesting a new metric in the same place as legacy
metric), we\r\nmade the score higher for the new metric. This positioned
it higher also\r\nin the Discover ESQL suggestions. This led to an issue
where one\r\nexpected suggestion didn’t appear because we only display
the top 6\r\nsuggestions by score and it got pushed out by
metric.\r\n\r\nAdditionally, I made a change here to only display the
metric without\r\nbucketed columns in the suggestion panel. I don't see
there's a lot of\r\nvalue in suggesting bucketed metric unless it's
something user chooses\r\nintentionally.\r\n\r\nShould be merged to 8.x
after
this:\r\nhttps://github.com/elastic/kibana/pull/197337","sha":"b3b85da80d0c9a8431f6a2f2e3c1bdf1448eb1a6"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197583","number":197583,"mergeCommit":{"message":"[Discover]
Fix suggestions for ES|QL charts (#197583)\n\nFixes
https://github.com/elastic/kibana/issues/197342\r\n\r\nIn this PR
(https://github.com/elastic/kibana/pull/197101) I removed the\r\nlegacy
metric from being suggested in the suggestion panel, and replaced\r\nit
with the new metric visualization. To maintain the previous
behavior\r\nin Lens (suggesting a new metric in the same place as legacy
metric), we\r\nmade the score higher for the new metric. This positioned
it higher also\r\nin the Discover ESQL suggestions. This led to an issue
where one\r\nexpected suggestion didn’t appear because we only display
the top 6\r\nsuggestions by score and it got pushed out by
metric.\r\n\r\nAdditionally, I made a change here to only display the
metric without\r\nbucketed columns in the suggestion panel. I don't see
there's a lot of\r\nvalue in suggesting bucketed metric unless it's
something user chooses\r\nintentionally.\r\n\r\nShould be merged to 8.x
after
this:\r\nhttps://github.com/elastic/kibana/pull/197337","sha":"b3b85da80d0c9a8431f6a2f2e3c1bdf1448eb1a6"}}]}]
BACKPORT-->

Co-authored-by: Marta Bondyra <4283304+mbondyra@users.noreply.github.com>
---
 test/functional/apps/discover/group3/_lens_vis.ts     | 11 +++++------
 .../public/visualizations/metric/suggestions.test.ts  | 10 +++++-----
 .../lens/public/visualizations/metric/suggestions.ts  |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
index db526fe978610..5e13c8bbb243c 100644
--- 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/197342
-  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');
@@ -616,8 +615,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await getCurrentVisTitle()).to.be('Pie');
       await testSubjects.existOrFail('partitionVisChart');
 
-      await discover.chooseLensSuggestion('barVerticalStacked');
-      await changeVisShape('Line');
+      await discover.chooseLensSuggestion('waffle');
+      await changeVisShape('Treemap');
 
       await testSubjects.existOrFail('unsavedChangesBadge');
       await discover.saveUnsavedChanges();
@@ -626,8 +625,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await discover.waitUntilSearchingHasFinished();
 
       await testSubjects.missingOrFail('unsavedChangesBadge');
-      expect(await getCurrentVisTitle()).to.be('Line');
-      await testSubjects.existOrFail('xyVisChart');
+      expect(await getCurrentVisTitle()).to.be('Treemap');
+      await testSubjects.existOrFail('partitionVisChart');
     });
 
     it('should close lens flyout on revert changes', async () => {
diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
index 4f1c7b46d06be..c9a97c0d170a0 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
@@ -189,7 +189,7 @@ describe('metric suggestions', () => {
               breakdownByAccessor: bucketColumn.columnId,
             },
             title: 'Metric',
-            hide: false,
+            hide: true,
             previewIcon: IconChartMetric,
             score: 0.51,
           },
@@ -221,7 +221,7 @@ describe('metric suggestions', () => {
               breakdownByAccessor: bucketColumn.columnId,
             },
             title: 'Metric',
-            hide: false,
+            hide: true,
             previewIcon: IconChartMetric,
             score: 0.51,
           },
@@ -294,7 +294,7 @@ describe('metric suggestions', () => {
               breakdownByAccessor: bucketColumn.columnId,
             },
             title: 'Metric',
-            hide: false,
+            hide: true,
             previewIcon: IconChartMetric,
             score: 0.52,
           },
@@ -326,7 +326,7 @@ describe('metric suggestions', () => {
               breakdownByAccessor: bucketColumn.columnId,
             },
             title: 'Metric',
-            hide: false,
+            hide: true,
             previewIcon: IconChartMetric,
             score: 0.52,
           },
@@ -357,7 +357,7 @@ describe('metric suggestions', () => {
             breakdownByAccessor: bucketColumn.columnId,
           },
           title: 'Metric',
-          hide: false,
+          hide: true,
           previewIcon: IconChartMetric,
           score: 0.52,
         },
diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
index 877d2b45d66af..5d066318d734f 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
@@ -30,8 +30,6 @@ export const getSuggestions: Visualization<MetricVisualizationState>['getSuggest
 
   const bucketedColumns = table.columns.filter(({ operation }) => operation.isBucketed);
 
-  const hasInterval = bucketedColumns.some(({ operation }) => operation.scale === 'interval');
-
   const unsupportedColumns = table.columns.filter(
     ({ operation }) => !supportedDataTypes.has(operation.dataType) && !operation.isBucketed
   );
@@ -64,7 +62,7 @@ export const getSuggestions: Visualization<MetricVisualizationState>['getSuggest
     title: metricColumns[0]?.operation.label || metricLabel,
     previewIcon: IconChartMetric,
     score: 0.5,
-    hide: hasInterval,
+    hide: !!bucketedColumns.length,
   };
 
   const accessorMappings: Pick<MetricVisualizationState, 'metricAccessor' | 'breakdownByAccessor'> =