[Lens] Fix bug in terms formatting (#82776) (#82843)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Nov 12, 2020 · e316601 · e316601
1 parent 55ff015
commit e316601
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
@@ -34,6 +34,13 @@ export interface TermsIndexPatternColumn extends FieldBasedIndexPatternColumn {
     size: number;
     orderBy: { type: 'alphabetical' } | { type: 'column'; columnId: string };
     orderDirection: 'asc' | 'desc';
+    // Terms on numeric fields can be formatted
+    format?: {
+      id: string;
+      params?: {
+        decimals: number;
+      };
+    };
   };
 }
 
@@ -105,10 +112,16 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
     };
   },
   onFieldChange: (oldColumn, indexPattern, field) => {
+    const newParams = { ...oldColumn.params };
+    if ('format' in newParams && field.type !== 'number') {
+      delete newParams.format;
+    }
     return {
       ...oldColumn,
+      dataType: field.type as DataType,
       label: ofName(field.displayName),
       sourceField: field.name,
+      params: newParams,
     };
   },
   onOtherColumnChanged: (currentColumn, columns) => {

diff --git a/...k/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx b/...k/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
@@ -103,14 +103,40 @@ describe('terms', () => {
         },
       };
       const indexPattern = createMockedIndexPattern();
-      const newDateField = indexPattern.fields.find((i) => i.name === 'dest')!;
+      const newNumberField = indexPattern.fields.find((i) => i.name === 'bytes')!;
 
-      const column = termsOperation.onFieldChange(oldColumn, indexPattern, newDateField);
-      expect(column).toHaveProperty('sourceField', 'dest');
+      const column = termsOperation.onFieldChange(oldColumn, indexPattern, newNumberField);
+      expect(column).toHaveProperty('dataType', 'number');
+      expect(column).toHaveProperty('sourceField', 'bytes');
       expect(column).toHaveProperty('params.size', 5);
       expect(column).toHaveProperty('params.orderBy.type', 'alphabetical');
       expect(column).toHaveProperty('params.orderDirection', 'asc');
-      expect(column.label).toContain('dest');
+      expect(column.label).toContain('bytes');
+    });
+
+    it('should remove numeric parameters when changing away from number', () => {
+      const oldColumn: TermsIndexPatternColumn = {
+        operationType: 'terms',
+        sourceField: 'bytes',
+        label: 'Top values of bytes',
+        isBucketed: true,
+        dataType: 'number',
+        params: {
+          size: 5,
+          orderBy: {
+            type: 'alphabetical',
+          },
+          orderDirection: 'asc',
+          format: { id: 'number', params: { decimals: 0 } },
+        },
+      };
+      const indexPattern = createMockedIndexPattern();
+      const newStringField = indexPattern.fields.find((i) => i.name === 'source')!;
+
+      const column = termsOperation.onFieldChange(oldColumn, indexPattern, newStringField);
+      expect(column).toHaveProperty('dataType', 'string');
+      expect(column).toHaveProperty('sourceField', 'source');
+      expect(column.params.format).toBeUndefined();
     });
   });