From 7e64b93b5faf253bbde62e9b9ce330a63d07aebd Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Sun, 25 May 2025 21:59:40 +0200 Subject: [PATCH] fix some types --- .betterer.results | 5 ++++- .../components/metrics-browser/MetricsBrowserContext.tsx | 4 ++-- .../components/metrics-browser/useMetricsLabelsValues.ts | 6 +++--- .../components/monaco-query-field/MonacoQueryFieldProps.ts | 4 ++-- .../monaco-completion-provider/data_provider.ts | 7 +++---- .../grafana-prometheus/src/components/useMetricsState.ts | 4 ++-- .../src/components/usePromQueryFieldEffects.ts | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.betterer.results b/.betterer.results index 74eec4a6c9a..3674904b72b 100644 --- a/.betterer.results +++ b/.betterer.results @@ -437,7 +437,10 @@ exports[`better eslint`] = { ], "packages/grafana-prometheus/src/language_provider.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"], + [0, 0, 0, "Unexpected any. Specify a different type.", "3"], + [0, 0, 0, "Unexpected any. Specify a different type.", "4"] ], "packages/grafana-prometheus/src/language_utils.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] diff --git a/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.tsx b/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.tsx index 4ad3266e2a9..5f1db29be6f 100644 --- a/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.tsx +++ b/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.tsx @@ -2,7 +2,7 @@ import { createContext, PropsWithChildren, useCallback, useContext, useMemo } fr import { TimeRange } from '@grafana/data'; -import PromQlLanguageProvider from '../../language_provider'; +import { PrometheusLanguageProviderInterface } from '../../language_provider'; import { buildSelector } from './selectorBuilder'; import { Metric } from './types'; @@ -50,7 +50,7 @@ const MetricsBrowserContext = createContext void; }; diff --git a/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.ts b/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.ts index ad163361e7e..e9e11115339 100644 --- a/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.ts +++ b/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.ts @@ -1,14 +1,14 @@ -import { useCallback, useEffect, useRef, useState, useMemo } from 'react'; +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useDebounce } from 'react-use'; import { TimeRange } from '@grafana/data'; -import PromQlLanguageProvider from '../../language_provider'; +import { PrometheusLanguageProviderInterface } from '../../language_provider'; import { buildSelector } from './selectorBuilder'; import { DEFAULT_SERIES_LIMIT, EMPTY_SELECTOR, LAST_USED_LABELS_KEY, Metric, METRIC_LABEL } from './types'; -export const useMetricsLabelsValues = (timeRange: TimeRange, languageProvider: PromQlLanguageProvider) => { +export const useMetricsLabelsValues = (timeRange: TimeRange, languageProvider: PrometheusLanguageProviderInterface) => { const timeRangeRef = useRef(timeRange); const lastSeriesLimitRef = useRef(DEFAULT_SERIES_LIMIT); const isInitializedRef = useRef(false); diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts index ac2995273e5..48bebaeecce 100644 --- a/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts +++ b/packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryFieldProps.ts @@ -2,7 +2,7 @@ import { HistoryItem, TimeRange } from '@grafana/data'; import { PrometheusDatasource } from '../../datasource'; -import type PromQlLanguageProvider from '../../language_provider'; +import { PrometheusLanguageProviderInterface } from '../../language_provider'; import { PromQuery } from '../../types'; // we need to store this in a separate file, @@ -11,7 +11,7 @@ import { PromQuery } from '../../types'; // props as the sync-component. export type Props = { initialValue: string; - languageProvider: PromQlLanguageProvider; + languageProvider: PrometheusLanguageProviderInterface; history: Array>; placeholder: string; onRunQuery: (value: string) => void; diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/data_provider.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/data_provider.ts index b1baad9a770..cda67c521ba 100644 --- a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/data_provider.ts +++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/data_provider.ts @@ -1,7 +1,6 @@ import { HistoryItem } from '@grafana/data'; -import type { Monaco } from '@grafana/ui'; // used in TSDoc `@link` below -import PromQlLanguageProvider from '../../../language_provider'; +import { PrometheusLanguageProviderInterface } from '../../../language_provider'; import { PromQuery } from '../../../types'; import { isValidLegacyName } from '../../../utf8_support'; @@ -31,12 +30,12 @@ interface Metric { } export interface DataProviderParams { - languageProvider: PromQlLanguageProvider; + languageProvider: PrometheusLanguageProviderInterface; historyProvider: Array>; } export class DataProvider { - readonly languageProvider: PromQlLanguageProvider; + readonly languageProvider: PrometheusLanguageProviderInterface; readonly historyProvider: Array>; readonly getSeriesLabels: typeof this.languageProvider.getSeriesLabels; readonly getSeriesValues: typeof this.languageProvider.getSeriesValues; diff --git a/packages/grafana-prometheus/src/components/useMetricsState.ts b/packages/grafana-prometheus/src/components/useMetricsState.ts index a85e7980f40..86ea0cced30 100644 --- a/packages/grafana-prometheus/src/components/useMetricsState.ts +++ b/packages/grafana-prometheus/src/components/useMetricsState.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react'; import { PrometheusDatasource } from '../datasource'; -import PromQlLanguageProvider from '../language_provider'; +import { PrometheusLanguageProviderInterface } from '../language_provider'; function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasMetrics: boolean) { if (metricsLookupDisabled) { @@ -21,7 +21,7 @@ function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasM export function useMetricsState( datasource: PrometheusDatasource, - languageProvider: PromQlLanguageProvider, + languageProvider: PrometheusLanguageProviderInterface, syntaxLoaded: boolean ) { return useMemo(() => { diff --git a/packages/grafana-prometheus/src/components/usePromQueryFieldEffects.ts b/packages/grafana-prometheus/src/components/usePromQueryFieldEffects.ts index b8ec88f413d..b2371e57236 100644 --- a/packages/grafana-prometheus/src/components/usePromQueryFieldEffects.ts +++ b/packages/grafana-prometheus/src/components/usePromQueryFieldEffects.ts @@ -2,13 +2,13 @@ import { MutableRefObject, useEffect, useRef } from 'react'; import { DataFrame, DateTime, TimeRange } from '@grafana/data'; -import PromQlLanguageProvider from '../language_provider'; +import { PrometheusLanguageProviderInterface } from '../language_provider'; import { roundMsToMin } from '../language_utils'; import { CancelablePromise } from './cancelable-promise'; export function usePromQueryFieldEffects( - languageProvider: PromQlLanguageProvider, + languageProvider: PrometheusLanguageProviderInterface, range: TimeRange | undefined, series: DataFrame[] | undefined, refreshMetrics: (languageProviderInitRef: MutableRefObject | null>) => Promise,