From 7a4c32d70352ebe6ee4802c47dd0f8238ebb05af Mon Sep 17 00:00:00 2001 From: tanner-bruce Date: Tue, 2 Feb 2021 08:01:57 -0500 Subject: [PATCH] Fix typo in transformer registry (#30712) --- packages/grafana-data/src/transformations/index.ts | 2 +- .../src/transformations/standardTransformersRegistry.ts | 4 ++-- .../grafana-data/src/transformations/transformDataFrame.ts | 4 ++-- .../TransformersUI/CalculateFieldTransformerEditor.tsx | 4 ++-- .../TransformersUI/ConcatenateTransformerEditor.tsx | 4 ++-- .../TransformersUI/FilterByNameTransformerEditor.tsx | 4 ++-- .../TransformersUI/FilterByRefIdTransformerEditor.tsx | 4 ++-- .../FilterByValueTransformerEditor.tsx | 4 ++-- .../components/TransformersUI/GroupByTransformerEditor.tsx | 4 ++-- .../TransformersUI/LabelsToFieldsTransformerEditor.tsx | 4 ++-- .../components/TransformersUI/MergeTransformerEditor.tsx | 6 +++--- .../TransformersUI/OrganizeFieldsTransformerEditor.tsx | 4 ++-- .../components/TransformersUI/ReduceTransformerEditor.tsx | 4 ++-- .../components/TransformersUI/RenameByRegexTransformer.tsx | 4 ++-- .../TransformersUI/SeriesToFieldsTransformerEditor.tsx | 4 ++-- .../TransformersUI/SeriesToRowsTransformerEditor.tsx | 6 +++--- .../components/TransformersUI/SortByTransformerEditor.tsx | 4 ++-- public/app/core/utils/standardTransformers.ts | 4 ++-- .../TransformationsEditor/TransformationEditor.tsx | 4 ++-- .../TransformationsEditor/TransformationOperationRow.tsx | 4 ++-- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/packages/grafana-data/src/transformations/index.ts b/packages/grafana-data/src/transformations/index.ts index 70afc15fceb..dd80a0e577c 100644 --- a/packages/grafana-data/src/transformations/index.ts +++ b/packages/grafana-data/src/transformations/index.ts @@ -5,7 +5,7 @@ export { standardTransformers } from './transformers'; export * from './fieldReducer'; export { transformDataFrame } from './transformDataFrame'; export { - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, standardTransformersRegistry, } from './standardTransformersRegistry'; diff --git a/packages/grafana-data/src/transformations/standardTransformersRegistry.ts b/packages/grafana-data/src/transformations/standardTransformersRegistry.ts index 81ca0de738b..62a804ff641 100644 --- a/packages/grafana-data/src/transformations/standardTransformersRegistry.ts +++ b/packages/grafana-data/src/transformations/standardTransformersRegistry.ts @@ -14,7 +14,7 @@ export interface TransformerUIProps { onChange: (options: T) => void; } -export interface TransformerRegistyItem extends RegistryItem { +export interface TransformerRegistryItem extends RegistryItem { /** * Object describing transformer configuration */ @@ -29,4 +29,4 @@ export interface TransformerRegistyItem extends RegistryItem { * Registry of transformation options that can be driven by * stored configuration files. */ -export const standardTransformersRegistry = new Registry>(); +export const standardTransformersRegistry = new Registry>(); diff --git a/packages/grafana-data/src/transformations/transformDataFrame.ts b/packages/grafana-data/src/transformations/transformDataFrame.ts index c6972d2b70a..dbcb01915bb 100644 --- a/packages/grafana-data/src/transformations/transformDataFrame.ts +++ b/packages/grafana-data/src/transformations/transformDataFrame.ts @@ -2,7 +2,7 @@ import { MonoTypeOperatorFunction, Observable, of } from 'rxjs'; import { map, mergeMap } from 'rxjs/operators'; import { DataFrame, DataTransformerConfig } from '../types'; -import { standardTransformersRegistry, TransformerRegistyItem } from './standardTransformersRegistry'; +import { standardTransformersRegistry, TransformerRegistryItem } from './standardTransformersRegistry'; const getOperator = (config: DataTransformerConfig): MonoTypeOperatorFunction => (source) => { const info = standardTransformersRegistry.get(config.id); @@ -21,7 +21,7 @@ const getOperator = (config: DataTransformerConfig): MonoTypeOperatorFunction + info: TransformerRegistryItem ): MonoTypeOperatorFunction => (source) => source.pipe( map((after) => { diff --git a/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx b/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx index e5e0c295625..07233fd33d7 100644 --- a/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx @@ -12,7 +12,7 @@ import { ReducerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { FilterPill, HorizontalGroup, Input, LegacyForms, Select, StatsPicker } from '@grafana/ui'; @@ -374,7 +374,7 @@ export class CalculateFieldTransformerEditor extends React.PureComponent< } } -export const calculateFieldTransformRegistryItem: TransformerRegistyItem = { +export const calculateFieldTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.calculateField, editor: CalculateFieldTransformerEditor, transformation: standardTransformers.calculateFieldTransformer, diff --git a/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx b/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx index 53af673ad83..5f1f45258a7 100644 --- a/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx @@ -3,7 +3,7 @@ import { DataTransformerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { Input, Select } from '@grafana/ui'; @@ -82,7 +82,7 @@ export class ConcatenateTransformerEditor extends React.PureComponent = { +export const concatenateTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.concatenate, editor: ConcatenateTransformerEditor, transformation: standardTransformers.concatenateTransformer, diff --git a/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx b/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx index 3a04973b99a..08e4b746341 100644 --- a/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx @@ -3,7 +3,7 @@ import { DataTransformerID, KeyValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, getFieldDisplayName, stringToJsRegex, @@ -202,7 +202,7 @@ export class FilterByNameTransformerEditor extends React.PureComponent< } } -export const filterFieldsByNameTransformRegistryItem: TransformerRegistyItem = { +export const filterFieldsByNameTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.filterFieldsByName, editor: FilterByNameTransformerEditor, transformation: standardTransformers.filterFieldsByNameTransformer, diff --git a/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx b/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx index 222862af6ba..e4f90fe91b7 100644 --- a/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx @@ -3,7 +3,7 @@ import { DataTransformerID, KeyValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { HorizontalGroup, FilterPill } from '@grafana/ui'; @@ -129,7 +129,7 @@ export class FilterByRefIdTransformerEditor extends React.PureComponent< } } -export const filterFramesByRefIdTransformRegistryItem: TransformerRegistyItem = { +export const filterFramesByRefIdTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.filterByRefId, editor: FilterByRefIdTransformerEditor, transformation: standardTransformers.filterFramesByRefIdTransformer, diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx b/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx index d3f054010d8..2b286802258 100644 --- a/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx @@ -3,7 +3,7 @@ import { css } from 'emotion'; import { DataTransformerID, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, getFieldDisplayName, DataFrame, @@ -133,7 +133,7 @@ export const FilterByValueTransformerEditor: React.FC = { +export const filterByValueTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.filterByValue, editor: FilterByValueTransformerEditor, transformation: standardTransformers.filterByValueTransformer, diff --git a/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx b/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx index d72570e308f..234fbc5aec5 100644 --- a/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx @@ -5,7 +5,7 @@ import { ReducerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { getAllFieldNamesFromDataFrames } from './OrganizeFieldsTransformerEditor'; @@ -136,7 +136,7 @@ const getStyling = stylesFactory(() => { }; }); -export const groupByTransformRegistryItem: TransformerRegistyItem = { +export const groupByTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.groupBy, editor: GroupByTransformerEditor, transformation: standardTransformers.groupByTransformer, diff --git a/public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx b/public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx index d2605f205a8..c1b9b2dee1a 100644 --- a/public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx @@ -3,7 +3,7 @@ import { DataTransformerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { Select } from '@grafana/ui'; @@ -55,7 +55,7 @@ export const LabelsAsFieldsTransformerEditor: React.FC = { +export const labelsToFieldsTransformerRegistryItem: TransformerRegistryItem = { id: DataTransformerID.labelsToFields, editor: LabelsAsFieldsTransformerEditor, transformation: standardTransformers.labelsToFieldsTransformer, diff --git a/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx b/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx index 9886291503f..4e7b93ec9d5 100644 --- a/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { DataTransformerID, standardTransformers, TransformerRegistyItem, TransformerUIProps } from '@grafana/data'; +import { DataTransformerID, standardTransformers, TransformerRegistryItem, TransformerUIProps } from '@grafana/data'; import { MergeTransformerOptions } from '@grafana/data/src/transformations/transformers/merge'; export const MergeTransformerEditor: React.FC> = ({ @@ -10,11 +10,11 @@ export const MergeTransformerEditor: React.FC = { +export const mergeTransformerRegistryItem: TransformerRegistryItem = { id: DataTransformerID.merge, editor: MergeTransformerEditor, transformation: standardTransformers.mergeTransformer, name: 'Merge', - description: `Merge many series/tables and return a single table where mergeable values will be combined into the same row. + description: `Merge many series/tables and return a single table where mergeable values will be combined into the same row. Useful for showing multiple series, tables or a combination of both visualized in a table.`, }; diff --git a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx b/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx index cb80f4438b7..512ebae6656 100644 --- a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx @@ -6,7 +6,7 @@ import { DataTransformerID, GrafanaTheme, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, getFieldDisplayName, } from '@grafana/data'; @@ -221,7 +221,7 @@ export const getAllFieldNamesFromDataFrames = (input: DataFrame[]): string[] => ); }; -export const organizeFieldsTransformRegistryItem: TransformerRegistyItem = { +export const organizeFieldsTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.organize, editor: OrganizeFieldsTransformerEditor, transformation: standardTransformers.organizeFieldsTransformer, diff --git a/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx b/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx index 9b05edc9656..81da6b5bf3e 100644 --- a/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx @@ -5,7 +5,7 @@ import { ReducerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; @@ -99,7 +99,7 @@ export const ReduceTransformerEditor: React.FC = { +export const reduceTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.reduce, editor: ReduceTransformerEditor, transformation: standardTransformers.reduceTransformer, diff --git a/public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx b/public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx index 3d1614eebfd..38e6d1a62fc 100644 --- a/public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx +++ b/public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { DataTransformerID, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, stringToJsRegex, } from '@grafana/data'; @@ -122,7 +122,7 @@ export class RenameByRegexTransformerEditor extends React.PureComponent< } } -export const renameByRegexTransformRegistryItem: TransformerRegistyItem = { +export const renameByRegexTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.renameByRegex, editor: RenameByRegexTransformerEditor, transformation: standardTransformers.renameByRegexTransformer, diff --git a/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx b/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx index bf07c3ebeb2..f4e58da17fa 100644 --- a/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx @@ -3,7 +3,7 @@ import { DataTransformerID, SelectableValue, standardTransformers, - TransformerRegistyItem, + TransformerRegistryItem, TransformerUIProps, } from '@grafana/data'; import { getAllFieldNamesFromDataFrames } from './OrganizeFieldsTransformerEditor'; @@ -39,7 +39,7 @@ export const SeriesToFieldsTransformerEditor: React.FC = { +export const seriesToFieldsTransformerRegistryItem: TransformerRegistryItem = { id: DataTransformerID.seriesToColumns, editor: SeriesToFieldsTransformerEditor, transformation: standardTransformers.seriesToColumnsTransformer, diff --git a/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx b/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx index 3a2acc18649..0355877f97c 100644 --- a/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { DataTransformerID, standardTransformers, TransformerRegistyItem, TransformerUIProps } from '@grafana/data'; +import { DataTransformerID, standardTransformers, TransformerRegistryItem, TransformerUIProps } from '@grafana/data'; import { SeriesToRowsTransformerOptions } from '@grafana/data/src/transformations/transformers/seriesToRows'; export const SeriesToRowsTransformerEditor: React.FC> = ({ @@ -10,11 +10,11 @@ export const SeriesToRowsTransformerEditor: React.FC = { +export const seriesToRowsTransformerRegistryItem: TransformerRegistryItem = { id: DataTransformerID.seriesToRows, editor: SeriesToRowsTransformerEditor, transformation: standardTransformers.seriesToRowsTransformer, name: 'Series to rows', - description: `Merge many series and return a single series with time, metric and value as columns. + description: `Merge many series and return a single series with time, metric and value as columns. Useful for showing multiple time series visualized in a table.`, }; diff --git a/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx b/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx index b769c70957f..845d547ab87 100644 --- a/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useMemo } from 'react'; -import { DataTransformerID, standardTransformers, TransformerRegistyItem, TransformerUIProps } from '@grafana/data'; +import { DataTransformerID, standardTransformers, TransformerRegistryItem, TransformerUIProps } from '@grafana/data'; import { getAllFieldNamesFromDataFrames } from './OrganizeFieldsTransformerEditor'; import { InlineField, InlineSwitch, InlineFieldRow, Select } from '@grafana/ui'; @@ -59,7 +59,7 @@ export const SortByTransformerEditor: React.FC = { +export const sortByTransformRegistryItem: TransformerRegistryItem = { id: DataTransformerID.sortBy, editor: SortByTransformerEditor, transformation: standardTransformers.sortByTransformer, diff --git a/public/app/core/utils/standardTransformers.ts b/public/app/core/utils/standardTransformers.ts index 98318549340..fe5429fde35 100644 --- a/public/app/core/utils/standardTransformers.ts +++ b/public/app/core/utils/standardTransformers.ts @@ -1,4 +1,4 @@ -import { TransformerRegistyItem } from '@grafana/data'; +import { TransformerRegistryItem } from '@grafana/data'; import { reduceTransformRegistryItem } from '../components/TransformersUI/ReduceTransformerEditor'; import { filterFieldsByNameTransformRegistryItem } from '../components/TransformersUI/FilterByNameTransformerEditor'; import { filterFramesByRefIdTransformRegistryItem } from '../components/TransformersUI/FilterByRefIdTransformerEditor'; @@ -14,7 +14,7 @@ import { seriesToRowsTransformerRegistryItem } from '../components/TransformersU import { concatenateTransformRegistryItem } from '../components/TransformersUI/ConcatenateTransformerEditor'; import { renameByRegexTransformRegistryItem } from '../components/TransformersUI/RenameByRegexTransformer'; -export const getStandardTransformers = (): Array> => { +export const getStandardTransformers = (): Array> => { return [ reduceTransformRegistryItem, filterFieldsByNameTransformRegistryItem, diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx index bc76215f2d2..2b9f1340596 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx @@ -7,7 +7,7 @@ import { DataTransformerConfig, GrafanaTheme, transformDataFrame, - TransformerRegistyItem, + TransformerRegistryItem, } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; @@ -17,7 +17,7 @@ interface TransformationEditorProps { debugMode?: boolean; index: number; data: DataFrame[]; - uiConfig: TransformerRegistyItem; + uiConfig: TransformerRegistryItem; configs: TransformationsEditorTransformation[]; onChange: (index: number, config: DataTransformerConfig) => void; } diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx index 2ba7f96cdd4..277becf2506 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { DataFrame, DataTransformerConfig, TransformerRegistyItem } from '@grafana/data'; +import { DataFrame, DataTransformerConfig, TransformerRegistryItem } from '@grafana/data'; import { HorizontalGroup } from '@grafana/ui'; import { TransformationEditor } from './TransformationEditor'; @@ -14,7 +14,7 @@ interface TransformationOperationRowProps { id: string; index: number; data: DataFrame[]; - uiConfig: TransformerRegistyItem; + uiConfig: TransformerRegistryItem; configs: TransformationsEditorTransformation[]; onRemove: (index: number) => void; onChange: (index: number, config: DataTransformerConfig) => void;