From 9035a498ca6d6aeaf25568d23fe8adf0294a88cb Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Wed, 11 Oct 2023 11:44:36 +0200 Subject: [PATCH] Chore: Export closestIdx function from @grafana/data (#76176) * export calculateFieldDisplayName function * export closestIdx function * Use getFieldDisplayName --- packages/grafana-data/src/dataframe/index.ts | 2 +- public/app/features/live/data/amendTimeSeries.ts | 2 +- .../app/plugins/datasource/prometheus/result_transformer.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/grafana-data/src/dataframe/index.ts b/packages/grafana-data/src/dataframe/index.ts index 07217a3ce12..b1362fc3e38 100644 --- a/packages/grafana-data/src/dataframe/index.ts +++ b/packages/grafana-data/src/dataframe/index.ts @@ -8,4 +8,4 @@ export * from './ArrayDataFrame'; export * from './DataFrameJSON'; export * from './frameComparisons'; export { anySeriesWithTimeField, isTimeSeriesFrame, isTimeSeriesFrames } from './utils'; -export { StreamingDataFrame, StreamingFrameAction, type StreamingFrameOptions } from './StreamingDataFrame'; +export { StreamingDataFrame, StreamingFrameAction, type StreamingFrameOptions, closestIdx } from './StreamingDataFrame'; diff --git a/public/app/features/live/data/amendTimeSeries.ts b/public/app/features/live/data/amendTimeSeries.ts index cafc0714ec5..ead006ef89b 100644 --- a/public/app/features/live/data/amendTimeSeries.ts +++ b/public/app/features/live/data/amendTimeSeries.ts @@ -1,4 +1,4 @@ -import { closestIdx } from '@grafana/data/src/dataframe/StreamingDataFrame'; +import { closestIdx } from '@grafana/data'; export type Table = [times: number[], ...values: any[][]]; diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts index 94ce874ba23..59308d9208c 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.ts @@ -14,13 +14,13 @@ import { FieldType, formatLabels, getDisplayProcessor, + getFieldDisplayName, Labels, + renderLegendFormat, ScopedVars, TIME_SERIES_TIME_FIELD_NAME, TIME_SERIES_VALUE_FIELD_NAME, - renderLegendFormat, } from '@grafana/data'; -import { calculateFieldDisplayName } from '@grafana/data/src/field/fieldState'; import { config, FetchResponse, getDataSourceSrv, getTemplateSrv } from '@grafana/runtime'; import { @@ -79,7 +79,7 @@ export function transformV2( f.fields.forEach((field) => { if (field.labels?.__name__ && field.labels?.__name__ === field.name) { const fieldCopy = { ...field, name: TIME_SERIES_VALUE_FIELD_NAME }; - field.config.displayNameFromDS = calculateFieldDisplayName(fieldCopy, f, response.data); + field.config.displayNameFromDS = getFieldDisplayName(fieldCopy, f, response.data); } }); }