From f96f928e6990d64cd7abdb4bedadc1d84557d39c Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Fri, 10 Apr 2020 12:29:26 -0400
Subject: [PATCH] [Lens] Fix error in query from generated suggestion (#63018)

* [Lens] Fix error in query from generated suggestion

* Update from review comments

* Fix test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../indexpattern_suggestions.test.tsx             |  4 ++--
 .../indexpattern_suggestions.ts                   | 15 +++++++--------
 .../operations/definitions/terms.test.tsx         |  2 +-
 .../operations/definitions/terms.tsx              |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index e36622f876acd5..fe14e5de5c1e30 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -824,10 +824,10 @@ describe('IndexPattern Data Source suggestions', () => {
             state: expect.objectContaining({
               layers: expect.objectContaining({
                 currentLayer: expect.objectContaining({
-                  columnOrder: ['cola', 'id1'],
+                  columnOrder: ['cola', 'colb'],
                   columns: {
                     cola: initialState.layers.currentLayer.columns.cola,
-                    id1: expect.objectContaining({
+                    colb: expect.objectContaining({
                       operationType: 'avg',
                       sourceField: 'memory',
                     }),
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
index 96127caa67bb42..d339171a5ae1f6 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -15,8 +15,8 @@ import {
   operationDefinitionMap,
   IndexPatternColumn,
 } from './operations';
-import { hasField } from './utils';
 import { operationDefinitions } from './operations/definitions';
+import { hasField } from './utils';
 import {
   IndexPattern,
   IndexPatternPrivateState,
@@ -196,7 +196,7 @@ function addFieldAsMetricOperation(
     suggestedPriority: undefined,
     field,
   });
-  const newColumnId = generateId();
+  const addedColumnId = generateId();
 
   const [, metrics] = separateBucketColumns(layer);
 
@@ -206,20 +206,19 @@ function addFieldAsMetricOperation(
       indexPatternId: indexPattern.id,
       columns: {
         ...layer.columns,
-        [newColumnId]: newColumn,
+        [addedColumnId]: newColumn,
       },
-      columnOrder: [...layer.columnOrder, newColumnId],
+      columnOrder: [...layer.columnOrder, addedColumnId],
     };
   }
 
-  // If only one metric, replace instead of add
-  const newColumns = { ...layer.columns, [newColumnId]: newColumn };
-  delete newColumns[metrics[0]];
+  // Replacing old column with new column, keeping the old ID
+  const newColumns = { ...layer.columns, [metrics[0]]: newColumn };
 
   return {
     indexPatternId: indexPattern.id,
     columns: newColumns,
-    columnOrder: [...layer.columnOrder.filter(c => c !== metrics[0]), newColumnId],
+    columnOrder: layer.columnOrder, // Order is kept by replacing
   };
 }
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
index 226246714f18df..fc0c9746b2f989 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
@@ -274,7 +274,7 @@ describe('terms', () => {
       expect(updatedColumn).toBe(initialColumn);
     });
 
-    it('should switch to alphabetical ordering if the order column is removed', () => {
+    it('should switch to alphabetical ordering if there are no columns to order by', () => {
       const termsColumn = termsOperation.onOtherColumnChanged!(
         {
           label: 'Top value of category',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
index cd0dcc0b7e9ce2..387b197c9235cc 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
@@ -135,7 +135,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn> = {
     }
     return currentColumn;
   },
-  paramEditor: ({ state, setState, currentColumn, columnId: currentColumnId, layerId }) => {
+  paramEditor: ({ state, setState, currentColumn, layerId }) => {
     const SEPARATOR = '$$$';
     function toValue(orderBy: TermsIndexPatternColumn['params']['orderBy']) {
       if (orderBy.type === 'alphabetical') {