From e9243f8a385d343dff1f125488692f30639ca7d7 Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Thu, 8 Sep 2022 17:32:32 +0500 Subject: [PATCH] Loki: Rename public/app/plugins/datasource/loki/language_provider.ts file to follow convention (#54819) --- .betterer.results | 10 +++++----- ...guage_provider.test.ts => LanguageProvider.test.ts} | 2 +- .../loki/{language_provider.ts => LanguageProvider.ts} | 0 .../datasource/loki/components/LokiCheatSheet.tsx | 2 +- .../loki/components/LokiExploreQueryEditor.test.tsx | 2 +- .../loki/components/LokiLabelBrowser.test.tsx | 2 +- .../datasource/loki/components/LokiLabelBrowser.tsx | 2 +- .../datasource/loki/components/LokiQueryField.test.tsx | 2 +- .../datasource/loki/components/LokiQueryField.tsx | 2 +- public/app/plugins/datasource/loki/datasource.ts | 2 +- public/app/plugins/datasource/prometheus/promql.ts | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename public/app/plugins/datasource/loki/{language_provider.test.ts => LanguageProvider.test.ts} (99%) rename public/app/plugins/datasource/loki/{language_provider.ts => LanguageProvider.ts} (100%) diff --git a/.betterer.results b/.betterer.results index 09bf2286471..3c70097dbe4 100644 --- a/.betterer.results +++ b/.betterer.results @@ -6906,6 +6906,11 @@ exports[`better eslint`] = { "public/app/plugins/datasource/jaeger/util.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], + "public/app/plugins/datasource/loki/LanguageProvider.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.", "2"] + ], "public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] @@ -6935,11 +6940,6 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] ], - "public/app/plugins/datasource/loki/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.", "2"] - ], "public/app/plugins/datasource/loki/live_streams.test.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], diff --git a/public/app/plugins/datasource/loki/language_provider.test.ts b/public/app/plugins/datasource/loki/LanguageProvider.test.ts similarity index 99% rename from public/app/plugins/datasource/loki/language_provider.test.ts rename to public/app/plugins/datasource/loki/LanguageProvider.test.ts index 7ea2a2eed41..95e4c26d6e4 100644 --- a/public/app/plugins/datasource/loki/language_provider.test.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.test.ts @@ -4,8 +4,8 @@ import { AbstractLabelOperator } from '@grafana/data'; import { TypeaheadInput } from '@grafana/ui'; import { TemplateSrv } from 'app/features/templating/template_srv'; +import LanguageProvider, { LokiHistoryItem } from './LanguageProvider'; import { LokiDatasource } from './datasource'; -import LanguageProvider, { LokiHistoryItem } from './language_provider'; import { createLokiDatasource, createMetadataRequest } from './mocks'; import { LokiQueryType } from './types'; diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/LanguageProvider.ts similarity index 100% rename from public/app/plugins/datasource/loki/language_provider.ts rename to public/app/plugins/datasource/loki/LanguageProvider.ts diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx index f983d2caa72..1ff4d4f61ec 100644 --- a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx +++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx @@ -4,7 +4,7 @@ import React, { PureComponent } from 'react'; import { QueryEditorHelpProps } from '@grafana/data'; import { reportInteraction } from '@grafana/runtime'; -import LokiLanguageProvider from '../language_provider'; +import LokiLanguageProvider from '../LanguageProvider'; import { LokiQuery } from '../types'; const DEFAULT_EXAMPLES = ['{job="default/prometheus"}']; diff --git a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx index 94f18316adc..d4837d0ba04 100644 --- a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx @@ -4,8 +4,8 @@ import React from 'react'; import { LoadingState, PanelData, toUtc, TimeRange, HistoryItem } from '@grafana/data'; import { TemplateSrv } from '@grafana/runtime'; +import LokiLanguageProvider from '../LanguageProvider'; import { LokiDatasource } from '../datasource'; -import LokiLanguageProvider from '../language_provider'; import { createLokiDatasource } from '../mocks'; import { LokiQuery } from '../types'; diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx index ae2b3808da8..fc158203f65 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { createTheme } from '@grafana/data'; -import LokiLanguageProvider from '../language_provider'; +import LokiLanguageProvider from '../LanguageProvider'; import { buildSelector, diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx index 61b0ea93933..dd27cbfb1ba 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx @@ -18,7 +18,7 @@ import { } from '@grafana/ui'; import PromQlLanguageProvider from '../../prometheus/language_provider'; -import LokiLanguageProvider from '../language_provider'; +import LokiLanguageProvider from '../LanguageProvider'; import { escapeLabelValueInExactSelector, escapeLabelValueInRegexSelector } from '../language_utils'; // Hard limit on labels to render diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx index 4a6f2522a24..32429c7bcbc 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx @@ -3,8 +3,8 @@ import React, { ComponentProps } from 'react'; import { dateTime } from '@grafana/data'; +import LokiLanguageProvider from '../LanguageProvider'; import { LokiDatasource } from '../datasource'; -import LokiLanguageProvider from '../language_provider'; import syntax from '../syntax'; import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx index 6fbdfa768b6..d5ad0e9cc89 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx @@ -17,8 +17,8 @@ import { } from '@grafana/ui'; import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider'; +import LokiLanguageProvider from '../LanguageProvider'; import { LokiDatasource } from '../datasource'; -import LokiLanguageProvider from '../language_provider'; import { escapeLabelValueInSelector, shouldRefreshLabels } from '../language_utils'; import { LokiQuery, LokiOptions } from '../types'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index cfac3e9a51a..7ba38064dde 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -44,9 +44,9 @@ import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_sr import { serializeParams } from '../../../core/utils/fetch'; import { renderLegendFormat } from '../prometheus/legend'; +import LanguageProvider from './LanguageProvider'; import { transformBackendResult } from './backendResultTransformer'; import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor'; -import LanguageProvider from './language_provider'; import { escapeLabelValueInSelector } from './language_utils'; import { LiveStreams, LokiLiveTarget } from './live_streams'; import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations'; diff --git a/public/app/plugins/datasource/prometheus/promql.ts b/public/app/plugins/datasource/prometheus/promql.ts index 7d0f2134819..8b4f032989a 100644 --- a/public/app/plugins/datasource/prometheus/promql.ts +++ b/public/app/plugins/datasource/prometheus/promql.ts @@ -3,7 +3,7 @@ import { Grammar } from 'prismjs'; import { CompletionItem } from '@grafana/ui'; // When changing RATE_RANGES, check if Loki/LogQL ranges should be changed too -// @see public/app/plugins/datasource/loki/language_provider.ts +// @see public/app/plugins/datasource/loki/LanguageProvider.ts export const RATE_RANGES: CompletionItem[] = [ { label: '$__interval', sortValue: '$__interval' }, { label: '$__rate_interval', sortValue: '$__rate_interval' },