From eb7fe074010e18a46deb086e8fb55c66404b2604 Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Fri, 16 Sep 2022 12:18:37 +0530 Subject: [PATCH] Loki: Rename public/app/plugins/datasource/loki/language_utils.ts file to follow convention (#55181) --- .../app/plugins/datasource/loki/components/LokiLabelBrowser.tsx | 2 +- .../app/plugins/datasource/loki/components/LokiQueryField.tsx | 2 +- public/app/plugins/datasource/loki/datasource.ts | 2 +- .../loki/{language_utils.test.ts => languageUtils.test.ts} | 2 +- .../datasource/loki/{language_utils.ts => languageUtils.ts} | 0 .../loki/querybuilder/components/LokiQueryBuilder.tsx | 2 +- .../loki/querybuilder/components/UnwrapParamEditor.tsx | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename public/app/plugins/datasource/loki/{language_utils.test.ts => languageUtils.test.ts} (93%) rename public/app/plugins/datasource/loki/{language_utils.ts => languageUtils.ts} (100%) diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx index dd27cbfb1ba..a9903e08db1 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx @@ -19,7 +19,7 @@ import { import PromQlLanguageProvider from '../../prometheus/language_provider'; import LokiLanguageProvider from '../LanguageProvider'; -import { escapeLabelValueInExactSelector, escapeLabelValueInRegexSelector } from '../language_utils'; +import { escapeLabelValueInExactSelector, escapeLabelValueInRegexSelector } from '../languageUtils'; // Hard limit on labels to render const MAX_LABEL_COUNT = 1000; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx index d5ad0e9cc89..bfcf3e2c9bc 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryField.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryField.tsx @@ -19,7 +19,7 @@ import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValue import LokiLanguageProvider from '../LanguageProvider'; import { LokiDatasource } from '../datasource'; -import { escapeLabelValueInSelector, shouldRefreshLabels } from '../language_utils'; +import { escapeLabelValueInSelector, shouldRefreshLabels } from '../languageUtils'; import { LokiQuery, LokiOptions } from '../types'; import { LokiLabelBrowser } from './LokiLabelBrowser'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index da5c2d32605..5d96329a0de 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -49,7 +49,7 @@ import LanguageProvider from './LanguageProvider'; import { LiveStreams, LokiLiveTarget } from './LiveStreams'; import { transformBackendResult } from './backendResultTransformer'; import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor'; -import { escapeLabelValueInSelector } from './language_utils'; +import { escapeLabelValueInSelector } from './languageUtils'; import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations'; import { addLabelFormatToQuery, diff --git a/public/app/plugins/datasource/loki/language_utils.test.ts b/public/app/plugins/datasource/loki/languageUtils.test.ts similarity index 93% rename from public/app/plugins/datasource/loki/language_utils.test.ts rename to public/app/plugins/datasource/loki/languageUtils.test.ts index b70c3023e6a..f9fa3c975e7 100644 --- a/public/app/plugins/datasource/loki/language_utils.test.ts +++ b/public/app/plugins/datasource/loki/languageUtils.test.ts @@ -1,4 +1,4 @@ -import { isBytesString } from './language_utils'; +import { isBytesString } from './languageUtils'; describe('isBytesString', () => { it('correctly matches bytes string with integers', () => { diff --git a/public/app/plugins/datasource/loki/language_utils.ts b/public/app/plugins/datasource/loki/languageUtils.ts similarity index 100% rename from public/app/plugins/datasource/loki/language_utils.ts rename to public/app/plugins/datasource/loki/languageUtils.ts diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx index f643002fa57..b135eb14b62 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx @@ -15,7 +15,7 @@ import { } from 'app/plugins/datasource/prometheus/querybuilder/shared/types'; import { LokiDatasource } from '../../datasource'; -import { escapeLabelValueInSelector } from '../../language_utils'; +import { escapeLabelValueInSelector } from '../../languageUtils'; import logqlGrammar from '../../syntax'; import { lokiQueryModeller } from '../LokiQueryModeller'; import { buildVisualQueryFromString } from '../parsing'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx index 92dbb9179b1..54c1070b0f6 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx @@ -7,7 +7,7 @@ import { Select } from '@grafana/ui'; import { getOperationParamId } from '../../../prometheus/querybuilder/shared/operationUtils'; import { QueryBuilderOperationParamEditorProps } from '../../../prometheus/querybuilder/shared/types'; import { LokiDatasource } from '../../datasource'; -import { isBytesString } from '../../language_utils'; +import { isBytesString } from '../../languageUtils'; import { getLogQueryFromMetricsQuery, isValidQuery } from '../../query_utils'; import { lokiQueryModeller } from '../LokiQueryModeller'; import { LokiVisualQuery } from '../types';