Transformers: Removed display name from reduced fields (#27141)

c80da5f2 · Torkel Ödegaard · GitHub · c207ea12 · c80da5f2 · c80da5f2
Commit c80da5f2 authored Aug 23, 2020 by Torkel Ödegaard Committed by GitHub Aug 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 37 deletions

packages/grafana-data/src/transformations/transformers/reduce.test.ts
+32 -32

packages/grafana-data/src/transformations/transformers/reduce.ts
+2 -5

No files found.
--- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts
@@ -62,28 +62,28 @@ describe('Reducer Transformer', () => {
        config: {},
      },
      {
-        name: 'first',
+        name: 'First',
        type: FieldType.number,
        values: new ArrayVector([3, 10000.3, 1, 11000.1]),
-        config: { displayName: 'First' },
+        config: {},
      },
      {
-        name: 'min',
+        name: 'Min',
        type: FieldType.number,
        values: new ArrayVector([3, 10000.3, 1, 11000.1]),
-        config: { displayName: 'Min' },
+        config: {},
      },
      {
-        name: 'max',
+        name: 'Max',
        type: FieldType.number,
        values: new ArrayVector([6, 10000.6, 7, 11000.7]),
-        config: { displayName: 'Max' },
+        config: {},
      },
      {
-        name: 'last',
+        name: 'Last',
        type: FieldType.number,
        values: new ArrayVector([6, 10000.6, 7, 11000.7]),
-        config: { displayName: 'Last' },
+        config: {},
      },
    ];
@@ -108,28 +108,28 @@ describe('Reducer Transformer', () => {
        config: {},
      },
      {
-        name: 'first',
+        name: 'First',
        type: FieldType.number,
        values: new ArrayVector([3, 1]),
-        config: { displayName: 'First' },
+        config: {},
      },
      {
-        name: 'min',
+        name: 'Min',
        type: FieldType.number,
        values: new ArrayVector([3, 1]),
-        config: { displayName: 'Min' },
+        config: {},
      },
      {
-        name: 'max',
+        name: 'Max',
        type: FieldType.number,
        values: new ArrayVector([6, 7]),
-        config: { displayName: 'Max' },
+        config: {},
      },
      {
-        name: 'last',
+        name: 'Last',
        type: FieldType.number,
        values: new ArrayVector([6, 7]),
-        config: { displayName: 'Last' },
+        config: {},
      },
    ];
@@ -154,28 +154,28 @@ describe('Reducer Transformer', () => {
        config: {},
      },
      {
-        name: 'first',
+        name: 'First',
        type: FieldType.number,
        values: new ArrayVector([3, 10000.3]),
-        config: { displayName: 'First' },
+        config: {},
      },
      {
-        name: 'min',
+        name: 'Min',
        type: FieldType.number,
        values: new ArrayVector([3, 10000.3]),
-        config: { displayName: 'Min' },
+        config: {},
      },
      {
-        name: 'max',
+        name: 'Max',
        type: FieldType.number,
        values: new ArrayVector([6, 10000.6]),
-        config: { displayName: 'Max' },
+        config: {},
      },
      {
-        name: 'last',
+        name: 'Last',
        type: FieldType.number,
        values: new ArrayVector([6, 10000.6]),
-        config: { displayName: 'Last' },
+        config: {},
      },
    ];
@@ -200,28 +200,28 @@ describe('Reducer Transformer', () => {
        config: {},
      },
      {
-        name: 'first',
+        name: 'First',
        type: FieldType.number,
        values: new ArrayVector([3]),
-        config: { displayName: 'First' },
+        config: {},
      },
      {
-        name: 'min',
+        name: 'Min',
        type: FieldType.number,
        values: new ArrayVector([3]),
-        config: { displayName: 'Min' },
+        config: {},
      },
      {
-        name: 'max',
+        name: 'Max',
        type: FieldType.number,
        values: new ArrayVector([6]),
-        config: { displayName: 'Max' },
+        config: {},
      },
      {
-        name: 'last',
+        name: 'Last',
        type: FieldType.number,
        values: new ArrayVector([6]),
-        config: { displayName: 'Last' },
+        config: {},
      },
    ];

--- a/packages/grafana-data/src/transformations/transformers/reduce.ts
+++ b/packages/grafana-data/src/transformations/transformers/reduce.ts
@@ -56,13 +56,10 @@ export const reduceTransformer: DataTransformerInfo<ReduceTransformerOptions> = 
          values.push(vals);
          fields.push({
-            name: info.id,
+            name: info.name,
            type: FieldType.other, // UNKNOWN until after we call the functions
            values: values[values.length - 1],
-            config: {
+            config: {},
-              displayName: info.name,
-              // UNIT from original field?
-            },
          });
        }