fix some types
This commit is contained in:
+4
-1
@@ -437,7 +437,10 @@ exports[`better eslint`] = {
|
|||||||
],
|
],
|
||||||
"packages/grafana-prometheus/src/language_provider.ts:5381": [
|
"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.", "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": [
|
"packages/grafana-prometheus/src/language_utils.ts:5381": [
|
||||||
[0, 0, 0, "Do not use any type assertions.", "0"]
|
[0, 0, 0, "Do not use any type assertions.", "0"]
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@ import { createContext, PropsWithChildren, useCallback, useContext, useMemo } fr
|
|||||||
|
|
||||||
import { TimeRange } from '@grafana/data';
|
import { TimeRange } from '@grafana/data';
|
||||||
|
|
||||||
import PromQlLanguageProvider from '../../language_provider';
|
import { PrometheusLanguageProviderInterface } from '../../language_provider';
|
||||||
|
|
||||||
import { buildSelector } from './selectorBuilder';
|
import { buildSelector } from './selectorBuilder';
|
||||||
import { Metric } from './types';
|
import { Metric } from './types';
|
||||||
@@ -50,7 +50,7 @@ const MetricsBrowserContext = createContext<MetricsBrowserContextType | undefine
|
|||||||
|
|
||||||
type MetricsBrowserProviderProps = {
|
type MetricsBrowserProviderProps = {
|
||||||
timeRange: TimeRange;
|
timeRange: TimeRange;
|
||||||
languageProvider: PromQlLanguageProvider;
|
languageProvider: PrometheusLanguageProviderInterface;
|
||||||
onChange: (selector: string) => void;
|
onChange: (selector: string) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -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 { useDebounce } from 'react-use';
|
||||||
|
|
||||||
import { TimeRange } from '@grafana/data';
|
import { TimeRange } from '@grafana/data';
|
||||||
|
|
||||||
import PromQlLanguageProvider from '../../language_provider';
|
import { PrometheusLanguageProviderInterface } from '../../language_provider';
|
||||||
|
|
||||||
import { buildSelector } from './selectorBuilder';
|
import { buildSelector } from './selectorBuilder';
|
||||||
import { DEFAULT_SERIES_LIMIT, EMPTY_SELECTOR, LAST_USED_LABELS_KEY, Metric, METRIC_LABEL } from './types';
|
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>(timeRange);
|
const timeRangeRef = useRef<TimeRange>(timeRange);
|
||||||
const lastSeriesLimitRef = useRef(DEFAULT_SERIES_LIMIT);
|
const lastSeriesLimitRef = useRef(DEFAULT_SERIES_LIMIT);
|
||||||
const isInitializedRef = useRef(false);
|
const isInitializedRef = useRef(false);
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
import { HistoryItem, TimeRange } from '@grafana/data';
|
import { HistoryItem, TimeRange } from '@grafana/data';
|
||||||
|
|
||||||
import { PrometheusDatasource } from '../../datasource';
|
import { PrometheusDatasource } from '../../datasource';
|
||||||
import type PromQlLanguageProvider from '../../language_provider';
|
import { PrometheusLanguageProviderInterface } from '../../language_provider';
|
||||||
import { PromQuery } from '../../types';
|
import { PromQuery } from '../../types';
|
||||||
|
|
||||||
// we need to store this in a separate file,
|
// we need to store this in a separate file,
|
||||||
@@ -11,7 +11,7 @@ import { PromQuery } from '../../types';
|
|||||||
// props as the sync-component.
|
// props as the sync-component.
|
||||||
export type Props = {
|
export type Props = {
|
||||||
initialValue: string;
|
initialValue: string;
|
||||||
languageProvider: PromQlLanguageProvider;
|
languageProvider: PrometheusLanguageProviderInterface;
|
||||||
history: Array<HistoryItem<PromQuery>>;
|
history: Array<HistoryItem<PromQuery>>;
|
||||||
placeholder: string;
|
placeholder: string;
|
||||||
onRunQuery: (value: string) => void;
|
onRunQuery: (value: string) => void;
|
||||||
|
|||||||
+3
-4
@@ -1,7 +1,6 @@
|
|||||||
import { HistoryItem } from '@grafana/data';
|
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 { PromQuery } from '../../../types';
|
||||||
import { isValidLegacyName } from '../../../utf8_support';
|
import { isValidLegacyName } from '../../../utf8_support';
|
||||||
|
|
||||||
@@ -31,12 +30,12 @@ interface Metric {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface DataProviderParams {
|
export interface DataProviderParams {
|
||||||
languageProvider: PromQlLanguageProvider;
|
languageProvider: PrometheusLanguageProviderInterface;
|
||||||
historyProvider: Array<HistoryItem<PromQuery>>;
|
historyProvider: Array<HistoryItem<PromQuery>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class DataProvider {
|
export class DataProvider {
|
||||||
readonly languageProvider: PromQlLanguageProvider;
|
readonly languageProvider: PrometheusLanguageProviderInterface;
|
||||||
readonly historyProvider: Array<HistoryItem<PromQuery>>;
|
readonly historyProvider: Array<HistoryItem<PromQuery>>;
|
||||||
readonly getSeriesLabels: typeof this.languageProvider.getSeriesLabels;
|
readonly getSeriesLabels: typeof this.languageProvider.getSeriesLabels;
|
||||||
readonly getSeriesValues: typeof this.languageProvider.getSeriesValues;
|
readonly getSeriesValues: typeof this.languageProvider.getSeriesValues;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
import { PrometheusDatasource } from '../datasource';
|
import { PrometheusDatasource } from '../datasource';
|
||||||
import PromQlLanguageProvider from '../language_provider';
|
import { PrometheusLanguageProviderInterface } from '../language_provider';
|
||||||
|
|
||||||
function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasMetrics: boolean) {
|
function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasMetrics: boolean) {
|
||||||
if (metricsLookupDisabled) {
|
if (metricsLookupDisabled) {
|
||||||
@@ -21,7 +21,7 @@ function getChooserText(metricsLookupDisabled: boolean, hasSyntax: boolean, hasM
|
|||||||
|
|
||||||
export function useMetricsState(
|
export function useMetricsState(
|
||||||
datasource: PrometheusDatasource,
|
datasource: PrometheusDatasource,
|
||||||
languageProvider: PromQlLanguageProvider,
|
languageProvider: PrometheusLanguageProviderInterface,
|
||||||
syntaxLoaded: boolean
|
syntaxLoaded: boolean
|
||||||
) {
|
) {
|
||||||
return useMemo(() => {
|
return useMemo(() => {
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ import { MutableRefObject, useEffect, useRef } from 'react';
|
|||||||
|
|
||||||
import { DataFrame, DateTime, TimeRange } from '@grafana/data';
|
import { DataFrame, DateTime, TimeRange } from '@grafana/data';
|
||||||
|
|
||||||
import PromQlLanguageProvider from '../language_provider';
|
import { PrometheusLanguageProviderInterface } from '../language_provider';
|
||||||
import { roundMsToMin } from '../language_utils';
|
import { roundMsToMin } from '../language_utils';
|
||||||
|
|
||||||
import { CancelablePromise } from './cancelable-promise';
|
import { CancelablePromise } from './cancelable-promise';
|
||||||
|
|
||||||
export function usePromQueryFieldEffects(
|
export function usePromQueryFieldEffects(
|
||||||
languageProvider: PromQlLanguageProvider,
|
languageProvider: PrometheusLanguageProviderInterface,
|
||||||
range: TimeRange | undefined,
|
range: TimeRange | undefined,
|
||||||
series: DataFrame[] | undefined,
|
series: DataFrame[] | undefined,
|
||||||
refreshMetrics: (languageProviderInitRef: MutableRefObject<CancelablePromise<unknown> | null>) => Promise<void>,
|
refreshMetrics: (languageProviderInitRef: MutableRefObject<CancelablePromise<unknown> | null>) => Promise<void>,
|
||||||
|
|||||||
Reference in New Issue
Block a user