[Lens] Fix duplicate suggestions on single-bucket charts (#86996)

elastic · Dec 30, 2020 · 83d9ef0 · 83d9ef0
1 parent 5dd9c7d
commit 83d9ef0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -1876,7 +1876,7 @@ describe('IndexPattern Data Source suggestions', () => {
       expect(suggestions.length).toBe(6);
     });
 
-    it('returns an only metric version of a given table', () => {
+    it('returns an only metric version of a given table, but does not include current state as reduced', () => {
       const initialState = testInitialState();
       const state: IndexPatternPrivateState = {
         indexPatternRefs: [],
@@ -1953,6 +1953,21 @@ describe('IndexPattern Data Source suggestions', () => {
       };
 
       const suggestions = getSuggestionSubset(getDatasourceSuggestionsFromCurrentState(state));
+      expect(suggestions).not.toContainEqual(
+        expect.objectContaining({
+          table: expect.objectContaining({
+            changeType: 'reduced',
+            columns: [
+              expect.objectContaining({
+                operation: expect.objectContaining({ label: 'field2' }),
+              }),
+              expect.objectContaining({
+                operation: expect.objectContaining({ label: 'Average of field1' }),
+              }),
+            ],
+          }),
+        })
+      );
       expect(suggestions).toContainEqual(
         expect.objectContaining({
           table: expect.objectContaining({

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -583,8 +583,9 @@ function createSimplifiedTableSuggestions(state: IndexPatternPrivateState, layer
         columnOrder: [...bucketedColumns, ...availableMetricColumns],
       };
 
-      if (availableReferenceColumns.length) {
-        // Don't remove buckets when dealing with any refs. This can break refs.
+      if (availableBucketedColumns.length <= 1 || availableReferenceColumns.length) {
+        // Don't simplify when dealing with single-bucket table. Also don't break
+        // reference-based columns by removing buckets.
         return [];
       } else if (availableMetricColumns.length > 1) {
         return [{ ...layer, columnOrder: [...bucketedColumns, availableMetricColumns[0]] }];
@@ -597,7 +598,6 @@ function createSimplifiedTableSuggestions(state: IndexPatternPrivateState, layer
       availableReferenceColumns.length
         ? []
         : availableMetricColumns.map((columnId) => {
-            // build suggestions with only metrics
             return { ...layer, columnOrder: [columnId] };
           })
     )
@@ -606,8 +606,7 @@ function createSimplifiedTableSuggestions(state: IndexPatternPrivateState, layer
         state,
         layerId,
         updatedLayer,
-        changeType:
-          layer.columnOrder.length === updatedLayer.columnOrder.length ? 'unchanged' : 'reduced',
+        changeType: 'reduced',
         label:
           updatedLayer.columnOrder.length === 1
             ? getMetricSuggestionTitle(updatedLayer, availableMetricColumns.length === 1)