From 66d635d1337ed049f67a5cce498324231f70064b Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Mon, 23 Mar 2020 15:51:56 -0400
Subject: [PATCH 1/2] [Lens] Fix bug in metric config panel

---
 .../metric_visualization.test.ts              | 19 +++++++++++++++++++
 .../metric_visualization.tsx                  |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
index 276f24433c670..51cabd6ad62ad 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
@@ -72,6 +72,25 @@ describe('metric_visualization', () => {
     });
   });
 
+  describe('#getConfiguration', () => {
+    it('can add a metric when there is no accessor', () => {
+      expect(
+        metricVisualization.getConfiguration({
+          state: {
+            accessor: undefined,
+            layerId: 'l1',
+          },
+        })
+      ).toEqual({
+        groups: [
+          expect.objectContaining({
+            supportsMoreColumns: true,
+          }),
+        ],
+      });
+    });
+  });
+
   describe('#setDimension', () => {
     it('sets the accessor', () => {
       expect(
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
index 44256df5aed6d..73b8019a31eaa 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.tsx
@@ -94,7 +94,7 @@ export const metricVisualization: Visualization<State, PersistableState> = {
           groupLabel: i18n.translate('xpack.lens.metric.label', { defaultMessage: 'Metric' }),
           layerId: props.state.layerId,
           accessors: props.state.accessor ? [props.state.accessor] : [],
-          supportsMoreColumns: false,
+          supportsMoreColumns: !props.state.accessor,
           filterOperations: (op: OperationMetadata) => !op.isBucketed && op.dataType === 'number',
         },
       ],

From e3e415c6d091d1e52f01bebaf0ad2efc32a7c9cf Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Mon, 23 Mar 2020 17:39:29 -0400
Subject: [PATCH 2/2] Fix test

---
 .../metric_visualization.test.ts              | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
index 51cabd6ad62ad..62f47a21c85b0 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization/metric_visualization.test.ts
@@ -80,6 +80,8 @@ describe('metric_visualization', () => {
             accessor: undefined,
             layerId: 'l1',
           },
+          layerId: 'l1',
+          frame: mockFrame(),
         })
       ).toEqual({
         groups: [
@@ -89,6 +91,25 @@ describe('metric_visualization', () => {
         ],
       });
     });
+
+    it('is not allowed to add a metric once one accessor is set', () => {
+      expect(
+        metricVisualization.getConfiguration({
+          state: {
+            accessor: 'a',
+            layerId: 'l1',
+          },
+          layerId: 'l1',
+          frame: mockFrame(),
+        })
+      ).toEqual({
+        groups: [
+          expect.objectContaining({
+            supportsMoreColumns: false,
+          }),
+        ],
+      });
+    });
   });
 
   describe('#setDimension', () => {