More cleanup
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
];
|
||||
|
||||
+1
-1
@@ -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: {} },
|
||||
]);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user