diff --git a/packages/grafana-data/src/panel/PanelPlugin.ts b/packages/grafana-data/src/panel/PanelPlugin.ts index b4e56fb52d6..f4227054aae 100644 --- a/packages/grafana-data/src/panel/PanelPlugin.ts +++ b/packages/grafana-data/src/panel/PanelPlugin.ts @@ -3,15 +3,15 @@ import { ComponentClass, ComponentType } from 'react'; import { FieldConfigOptionsRegistry, StandardEditorContext } from '../field'; import { + FieldConfigProperty, FieldConfigSource, GrafanaPlugin, PanelEditorProps, PanelMigrationHandler, + PanelPluginDataSupport, PanelPluginMeta, PanelProps, PanelTypeChangedHandler, - FieldConfigProperty, - PanelPluginDataSupport, VisualizationSuggestionsSupplier, } from '../types'; import { deprecationWarning } from '../utils'; @@ -120,7 +120,7 @@ export class PanelPlugin< }; /** - * Legacy angular ctrl. If this exists it will be used instead of the panel + * Legacy angular ctrl. If this exists it will be used instead of the panel */ angularPanelCtrl?: any; diff --git a/packages/grafana-data/src/transformations/matchers/ids.ts b/packages/grafana-data/src/transformations/matchers/ids.ts index f81400ec5af..0f44b80ec8b 100644 --- a/packages/grafana-data/src/transformations/matchers/ids.ts +++ b/packages/grafana-data/src/transformations/matchers/ids.ts @@ -15,7 +15,7 @@ export enum FieldMatcherID { numeric = 'numeric', time = 'time', // Can be multiple times first = 'first', - firstTimeField = 'firstTimeField', // Only the first fime field + firstTimeField = 'firstTimeField', // Only the first time field // With arguments byType = 'byType', diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts index 0d31b613c62..4c4b3ba12b6 100644 --- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts +++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts @@ -1,9 +1,10 @@ import { getFieldDisplayName } from '../../field/fieldState'; import { stringToJsRegex } from '../../text/string'; -import { Field, DataFrame, FieldType, TIME_SERIES_VALUE_FIELD_NAME } from '../../types/dataFrame'; -import { FieldMatcherInfo, FrameMatcherInfo, FieldMatcher } from '../../types/transformations'; +import { DataFrame, Field, FieldType, TIME_SERIES_VALUE_FIELD_NAME } from '../../types/dataFrame'; +import { FieldMatcher, FieldMatcherInfo, FrameMatcherInfo } from '../../types/transformations'; import { FieldMatcherID, FrameMatcherID } from './ids'; + export interface RegexpOrNamesMatcherOptions { pattern?: string; names?: string[]; @@ -98,10 +99,10 @@ const multipleFieldNamesMatcher: FieldMatcherInfo = { }, }; -// In an effor to support migrating to a consistent data contract, the -// naming conventions need to get normalized. However many existing setups +// In an effort to support migrating to a consistent data contract, the +// naming conventions need to get normalized. However, many existing setups // exist that would no longer match names if that changes. This injects -// fallback logic when when the data frame has not type version specified +// fallback logic when the data frame has not type version specified export function fieldNameFallback(fields: Set) { let fallback: FieldMatcher | undefined = undefined; diff --git a/packages/grafana-data/src/transformations/matchers/refIdMatcher.ts b/packages/grafana-data/src/transformations/matchers/refIdMatcher.ts index 1c9d5d5869d..f8486a36d69 100644 --- a/packages/grafana-data/src/transformations/matchers/refIdMatcher.ts +++ b/packages/grafana-data/src/transformations/matchers/refIdMatcher.ts @@ -5,7 +5,7 @@ import { FrameMatcherInfo } from '../../types/transformations'; import { FrameMatcherID } from './ids'; // General Field matcher -const refIdMacher: FrameMatcherInfo = { +const refIdMatcher: FrameMatcherInfo = { id: FrameMatcherID.byRefId, name: 'Query refId', description: 'match the refId', @@ -24,5 +24,5 @@ const refIdMacher: FrameMatcherInfo = { }; export function getRefIdMatchers(): FrameMatcherInfo[] { - return [refIdMacher]; + return [refIdMatcher]; } diff --git a/packages/grafana-data/src/transformations/transformers/filter.ts b/packages/grafana-data/src/transformations/transformers/filter.ts index 9c8758057f5..86cd60d03cf 100644 --- a/packages/grafana-data/src/transformations/transformers/filter.ts +++ b/packages/grafana-data/src/transformations/transformers/filter.ts @@ -19,7 +19,7 @@ export const filterFieldsTransformer: DataTransformerInfo = { defaultOptions: {}, /** - * Return a modified copy of the series. If the transform is not or should not + * Return a modified copy of the series. If the transform is not or should not * be applied, just return the input series */ operator: (options: FilterOptions, ctx) => (source) => { @@ -86,7 +86,7 @@ export const filterFramesTransformer: DataTransformerInfo = { defaultOptions: {}, /** - * Return a modified copy of the series. If the transform is not or should not + * Return a modified copy of the series. If the transform is not or should not * be applied, just return the input series */ operator: (options, ctx) => (source) => { diff --git a/packages/grafana-data/src/transformations/transformers/filterByName.ts b/packages/grafana-data/src/transformations/transformers/filterByName.ts index f241badb492..1675024636a 100644 --- a/packages/grafana-data/src/transformations/transformers/filterByName.ts +++ b/packages/grafana-data/src/transformations/transformers/filterByName.ts @@ -17,7 +17,7 @@ export const filterFieldsByNameTransformer: DataTransformerInfo (source) => diff --git a/packages/grafana-data/src/transformations/transformers/filterByRefId.ts b/packages/grafana-data/src/transformations/transformers/filterByRefId.ts index c4e0c7fcda7..55c8a960f5e 100644 --- a/packages/grafana-data/src/transformations/transformers/filterByRefId.ts +++ b/packages/grafana-data/src/transformations/transformers/filterByRefId.ts @@ -16,7 +16,7 @@ export const filterFramesByRefIdTransformer: DataTransformerInfo (source) => { diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts index 5f990c59ec0..76c1acf6560 100644 --- a/packages/grafana-data/src/transformations/transformers/groupBy.ts +++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts @@ -31,7 +31,7 @@ export const groupByTransformer: DataTransformerInfo }, /** - * Return a modified copy of the series. If the transform is not or should not + * Return a modified copy of the series. If the transform is not or should not * be applied, just return the input series */ operator: (options) => (source) => diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts index 0ab423ad06b..de8a0b163f1 100644 --- a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts +++ b/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts @@ -42,7 +42,7 @@ export interface JoinOptions { frames: DataFrame[]; /** - * The field to join -- frames that do not have this field will be droppped + * The field to join -- frames that do not have this field will be dropped */ joinBy?: FieldMatcher; diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts index d785120c85b..aee79fbbb86 100644 --- a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts +++ b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts @@ -9,10 +9,11 @@ export enum LabelsToFieldsMode { Columns = 'columns', // default mode Rows = 'rows', } + export interface LabelsToFieldsOptions { mode?: LabelsToFieldsMode; - /** When empty, this will keep all labels, otherise it will keep only labels matching the value */ + /** When empty, this will keep all labels, otherwise it will keep only labels matching the value */ keepLabels?: string[]; /** @@ -52,7 +53,7 @@ export const labelsToFieldsTransformer: SynchronousDataTransformerInfo (source) => diff --git a/packages/grafana-data/src/transformations/transformers/organize.ts b/packages/grafana-data/src/transformations/transformers/organize.ts index 99827803a4d..f910c600e18 100644 --- a/packages/grafana-data/src/transformations/transformers/organize.ts +++ b/packages/grafana-data/src/transformations/transformers/organize.ts @@ -22,7 +22,7 @@ export const organizeFieldsTransformer: DataTransformerInfo (source) => diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/grafana-data/src/transformations/transformers/reduce.ts index 1997d233ab0..ae467deea0f 100644 --- a/packages/grafana-data/src/transformations/transformers/reduce.ts +++ b/packages/grafana-data/src/transformations/transformers/reduce.ts @@ -15,6 +15,7 @@ export enum ReduceTransformerMode { SeriesToRows = 'seriesToRows', // default ReduceFields = 'reduceFields', // same structure, add additional row for each type } + export interface ReduceTransformerOptions { reducers: ReducerID[]; fields?: MatcherConfig; // Assume all fields @@ -32,7 +33,7 @@ export const reduceTransformer: DataTransformerInfo = }, /** - * Return a modified copy of the series. If the transform is not or should not + * Return a modified copy of the series. If the transform is not or should not * be applied, just return the input series */ operator: (options) => (source) => diff --git a/packages/grafana-data/src/transformations/transformers/rename.ts b/packages/grafana-data/src/transformations/transformers/rename.ts index a19f40e0359..be3f585b0c1 100644 --- a/packages/grafana-data/src/transformations/transformers/rename.ts +++ b/packages/grafana-data/src/transformations/transformers/rename.ts @@ -19,7 +19,7 @@ export const renameFieldsTransformer: DataTransformerInfo (source) => diff --git a/packages/grafana-data/src/transformations/transformers/renameByRegex.ts b/packages/grafana-data/src/transformations/transformers/renameByRegex.ts index ad6e2d39942..1a1b0e81da6 100644 --- a/packages/grafana-data/src/transformations/transformers/renameByRegex.ts +++ b/packages/grafana-data/src/transformations/transformers/renameByRegex.ts @@ -33,7 +33,7 @@ export const renameByRegexTransformer: DataTransformerInfo (source) => diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.ts b/packages/grafana-data/src/transformations/transformers/sortBy.ts index 1bf8ba2d859..a8be3e252db 100644 --- a/packages/grafana-data/src/transformations/transformers/sortBy.ts +++ b/packages/grafana-data/src/transformations/transformers/sortBy.ts @@ -28,7 +28,7 @@ export const sortByTransformer: DataTransformerInfo = }, /** - * Return a modified copy of the series. If the transform is not or should not + * Return a modified copy of the series. If the transform is not or should not * be applied, just return the input series */ operator: (options) => (source) => diff --git a/packages/grafana-data/src/types/annotations.ts b/packages/grafana-data/src/types/annotations.ts index a35e0bea005..13b3e0abbbb 100644 --- a/packages/grafana-data/src/types/annotations.ts +++ b/packages/grafana-data/src/types/annotations.ts @@ -1,7 +1,7 @@ import { ComponentType } from 'react'; import { Observable } from 'rxjs'; -import { DataQuery, AnnotationQuery as SchemaAnnotationQuery } from '@grafana/schema'; +import { AnnotationQuery as SchemaAnnotationQuery, DataQuery } from '@grafana/schema'; import { DataFrame } from './dataFrame'; import { QueryEditorProps } from './datasource'; @@ -103,7 +103,7 @@ export interface AnnotationSupport; /** - * Specify a custom QueryEditor for the annotation page. If not specified, the standard one will be used + * Specify a custom QueryEditor for the annotation page. If not specified, the standard one will be used */ QueryEditor?: ComponentType>; diff --git a/public/app/features/transformers/configFromQuery/configFromQuery.ts b/public/app/features/transformers/configFromQuery/configFromQuery.ts index 5c91e7da28a..5b3bc7cb2c6 100644 --- a/public/app/features/transformers/configFromQuery/configFromQuery.ts +++ b/public/app/features/transformers/configFromQuery/configFromQuery.ts @@ -12,9 +12,9 @@ import { } from '@grafana/data'; import { - getFieldConfigFromFrame, - FieldToConfigMapping, evaluteFieldMappings, + FieldToConfigMapping, + getFieldConfigFromFrame, } from '../fieldToConfigMapping/fieldToConfigMapping'; export interface ConfigFromQueryTransformOptions { @@ -99,7 +99,7 @@ export const configFromDataTransformer: DataTransformerInfo (source) => source.pipe(map((data) => extractConfigFromQuery(options, data))), diff --git a/public/app/features/transformers/rowsToFields/rowsToFields.ts b/public/app/features/transformers/rowsToFields/rowsToFields.ts index 8bd7eec91b6..7602ad0ae9d 100644 --- a/public/app/features/transformers/rowsToFields/rowsToFields.ts +++ b/public/app/features/transformers/rowsToFields/rowsToFields.ts @@ -3,11 +3,11 @@ import { map } from 'rxjs/operators'; import { DataFrame, DataTransformerID, DataTransformerInfo, Field, getFieldDisplayName, Labels } from '@grafana/data'; import { - getFieldConfigFromFrame, - FieldToConfigMapping, - evaluteFieldMappings, EvaluatedMappingResult, + evaluteFieldMappings, FieldConfigHandlerKey, + FieldToConfigMapping, + getFieldConfigFromFrame, } from '../fieldToConfigMapping/fieldToConfigMapping'; export interface RowToFieldsTransformOptions { @@ -23,7 +23,7 @@ export const rowsToFieldsTransformer: DataTransformerInfo (source) =>