diff --git a/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx b/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx index 4e7b93ec9d5..c2905712d3e 100644 --- a/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx @@ -1,12 +1,17 @@ import React from 'react'; import { DataTransformerID, standardTransformers, TransformerRegistryItem, TransformerUIProps } from '@grafana/data'; -import { MergeTransformerOptions } from '@grafana/data/src/transformations/transformers/merge'; +import { MergeTransformerOptions } from '../../../../../packages/grafana-data/src/transformations/transformers/merge'; +import { FieldValidationMessage } from '@grafana/ui'; export const MergeTransformerEditor: React.FC> = ({ input, options, onChange, }) => { + if (input.length <= 1) { + // Show warning that merge is useless only apply on a single frame + return Merge has no effect when applied on a single frame.; + } return null; }; diff --git a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx b/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx index b606a49f393..0dfc3787f67 100644 --- a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx +++ b/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx @@ -10,7 +10,7 @@ import { TransformerUIProps, getFieldDisplayName, } from '@grafana/data'; -import { stylesFactory, useTheme, Input, IconButton, Icon } from '@grafana/ui'; +import { stylesFactory, useTheme, Input, IconButton, Icon, FieldValidationMessage } from '@grafana/ui'; import { OrganizeFieldsTransformerOptions } from '@grafana/data/src/transformations/transformers/organize'; import { createOrderFieldsComparer } from '@grafana/data/src/transformations/transformers/order'; @@ -73,7 +73,11 @@ const OrganizeFieldsTransformerEditor: React.FC 1) { - return
Organize fields only works with a single frame. Consider applying a join transformation first.
; + return ( + + Organize fields only works with a single frame. Consider applying a join transformation first. + + ); } return (