diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts index a010e60bab4..5c3603fdba5 100644 --- a/packages/grafana-data/src/index.ts +++ b/packages/grafana-data/src/index.ts @@ -278,7 +278,7 @@ export { getValueMatcher, } from './transformations/matchers'; export { type FieldValueMatcherConfig } from './transformations/matchers/fieldValueMatcher'; -export { DataTransformerID, refIDDependentIDs } from './transformations/transformers/ids'; +export { DataTransformerID } from './transformations/transformers/ids'; export { MatcherID, FieldMatcherID, FrameMatcherID, ValueMatcherID } from './transformations/matchers/ids'; export { ReducerID, diff --git a/packages/grafana-data/src/query/refId.ts b/packages/grafana-data/src/query/refId.ts index 134a668b31f..bdfa87ef68a 100644 --- a/packages/grafana-data/src/query/refId.ts +++ b/packages/grafana-data/src/query/refId.ts @@ -1,15 +1,12 @@ -import { DataQuery, DataTransformerConfig } from '@grafana/schema'; +import { DataQuery } from '@grafana/schema'; /** * Finds the next available refId for a query */ -export const getNextRefId = (item: DataQuery[] | DataTransformerConfig[], prefix?: string): string => { +export const getNextRefId = (queries: DataQuery[]): string => { for (let num = 0; ; num++) { - let refId = getRefId(num); - if (prefix !== undefined) { - refId = `${prefix}${refId}`; - } - if (!item.some((i) => i.refId === refId)) { + const refId = getRefId(num); + if (!queries.some((query) => query.refId === refId)) { return refId; } } diff --git a/packages/grafana-data/src/transformations/transformers/ids.ts b/packages/grafana-data/src/transformations/transformers/ids.ts index af54935a7a3..cc2b76fae69 100644 --- a/packages/grafana-data/src/transformations/transformers/ids.ts +++ b/packages/grafana-data/src/transformations/transformers/ids.ts @@ -44,11 +44,3 @@ export enum DataTransformerID { regression = 'regression', groupToNestedTable = 'groupToNestedTable', } - -export const refIDDependentIDs: string[] = [ - DataTransformerID.joinByField, - DataTransformerID.merge, - DataTransformerID.reduce, - DataTransformerID.seriesToRows, - DataTransformerID.joinByLabels, -]; diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx index 715f26dc2df..e06b9fc6da2 100644 --- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx +++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx @@ -123,7 +123,7 @@ describe('PanelDataTransformationsTab', () => { const button = transformationCard.getElementsByTagName('button').item(0); await userEvent.click(button!); expect(onChangeTransformation).toHaveBeenCalledWith([ - { id: 'calculateField', options: {}, refId: 'T-A' }, + { id: 'calculateField', options: {} }, { id: 'calculateField', options: {} }, ]); });