From 61e2af3a71d0cf7249c467e7f7fb7b465b91f983 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Tue, 10 Nov 2020 14:07:22 +0100
Subject: [PATCH] [Lens] Do not reset formatting when switching between custom
 ranges and auto histogram (#82694) (#83034)

---
 .../definitions/ranges/ranges.test.tsx        | 30 +++++++++++++++++++
 .../operations/definitions/ranges/ranges.tsx  |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
index c8a8ffa7b128f..d43a905434c02 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
@@ -744,6 +744,36 @@ describe('ranges', () => {
           /^Bytes format:/
         );
       });
+
+      it('should not reset formatters when switching between custom ranges and auto histogram', () => {
+        const setStateSpy = jest.fn();
+        // now set a format on the range operation
+        (state.layers.first.columns.col1 as RangeIndexPatternColumn).params.format = {
+          id: 'custom',
+          params: { decimals: 3 },
+        };
+
+        const instance = mount(
+          <InlineOptions
+            {...defaultOptions}
+            state={state}
+            setState={setStateSpy}
+            columnId="col1"
+            currentColumn={state.layers.first.columns.col1 as RangeIndexPatternColumn}
+            layerId="first"
+          />
+        );
+
+        // This series of act closures are made to make it work properly the update flush
+        act(() => {
+          instance.find(EuiLink).first().prop('onClick')!({} as ReactMouseEvent);
+        });
+
+        expect(setStateSpy.mock.calls[1][0].layers.first.columns.col1.params.format).toEqual({
+          id: 'custom',
+          params: { decimals: 3 },
+        });
+      });
     });
   });
 });
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
index 1050eef45a71c..46d9e4e6c22de 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
@@ -225,7 +225,7 @@ export const rangeOperation: OperationDefinition<RangeIndexPatternColumn, 'field
               type: newMode,
               ranges: [{ from: 0, to: DEFAULT_INTERVAL, label: '' }],
               maxBars: maxBarsDefaultValue,
-              format: undefined,
+              format: currentColumn.params.format,
               parentFormat,
             },
           },