mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Loki: Replace deprecated @grafana/experimental
with @grafana/plugin-ui
(#99642)
* Loki: Replace @grafana/experimental with @grafana/plugin-ui * Fix imports * Fix incorrect import
This commit is contained in:
parent
4aa495fd02
commit
f637ea225a
@ -2,7 +2,7 @@
|
||||
import { memo } from 'react';
|
||||
|
||||
import { AnnotationQuery } from '@grafana/data';
|
||||
import { EditorField, EditorRow } from '@grafana/experimental';
|
||||
import { EditorField, EditorRow } from '@grafana/plugin-ui';
|
||||
import { Input, Stack } from '@grafana/ui';
|
||||
|
||||
// Types
|
||||
|
@ -3,7 +3,7 @@ import { useRef, useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { useAsync } from 'react-use';
|
||||
|
||||
import { dateTime, GrafanaTheme2, LogRowModel, renderMarkdown, SelectableValue } from '@grafana/data';
|
||||
import { RawQuery } from '@grafana/experimental';
|
||||
import { RawQuery } from '@grafana/plugin-ui';
|
||||
import { reportInteraction } from '@grafana/runtime';
|
||||
import {
|
||||
Alert,
|
||||
|
@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
|
||||
import { cloneDeep, defaultsDeep } from 'lodash';
|
||||
|
||||
import { CoreApp } from '@grafana/data';
|
||||
import { QueryEditorMode } from '@grafana/experimental';
|
||||
import { QueryEditorMode } from '@grafana/plugin-ui';
|
||||
|
||||
import { createLokiDatasource } from '../__mocks__/datasource';
|
||||
import { EXPLAIN_LABEL_FILTER_CONTENT } from '../querybuilder/components/LokiQueryBuilderExplained';
|
||||
|
@ -11,7 +11,7 @@ import {
|
||||
QueryEditorModeToggle,
|
||||
QueryHeaderSwitch,
|
||||
QueryEditorMode,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
import { config, reportInteraction } from '@grafana/runtime';
|
||||
import { Button, ConfirmModal, Space, Stack } from '@grafana/ui';
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
|
||||
import { InlineField, InlineSwitch } from '@grafana/ui';
|
||||
|
||||
export function AlertingSettings({
|
||||
|
@ -8,7 +8,7 @@ import {
|
||||
Auth,
|
||||
convertLegacyAuthProps,
|
||||
AdvancedHttpSettings,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
import { config, reportInteraction } from '@grafana/runtime';
|
||||
import { Divider, SecureSocksProxySettings, Stack } from '@grafana/ui';
|
||||
|
||||
|
@ -2,7 +2,7 @@ import { css } from '@emotion/css';
|
||||
import { useCallback, useState } from 'react';
|
||||
|
||||
import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data';
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
|
||||
import { Button, useTheme2 } from '@grafana/ui';
|
||||
|
||||
import { DerivedFieldConfig } from '../types';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import * as React from 'react';
|
||||
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
|
||||
import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
|
||||
import { config } from '@grafana/runtime';
|
||||
import { Badge, InlineField, InlineFieldRow, Input } from '@grafana/ui';
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
import { NodeType, SyntaxNode } from '@lezer/common';
|
||||
import { sortBy } from 'lodash';
|
||||
|
||||
import { QueryBuilderLabelFilter } from '@grafana/experimental';
|
||||
import {
|
||||
Identifier,
|
||||
LabelFilter,
|
||||
@ -23,6 +22,7 @@ import {
|
||||
Expr,
|
||||
LabelFormatExpr,
|
||||
} from '@grafana/lezer-logql';
|
||||
import { QueryBuilderLabelFilter } from '@grafana/plugin-ui';
|
||||
|
||||
import { unescapeLabelValue } from './languageUtils';
|
||||
import { getNodePositionsFromQuery } from './queryUtils';
|
||||
|
@ -4,7 +4,7 @@ import {
|
||||
VisualQuery,
|
||||
QueryBuilderOperation,
|
||||
VisualQueryBinary,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
|
||||
import { operationDefinitions } from './operations';
|
||||
import { LokiOperationId, LokiQueryPattern, LokiQueryPatternType, LokiVisualQueryOperationCategory } from './types';
|
||||
|
@ -2,7 +2,7 @@ import {
|
||||
QueryBuilderOperation,
|
||||
QueryBuilderOperationDefinition,
|
||||
QueryBuilderOperationParamDef,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
|
||||
import { defaultAddOperationHandler } from './operationUtils';
|
||||
import { LokiOperationId, LokiVisualQueryOperationCategory } from './types';
|
||||
|
@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
|
||||
import { ComponentProps } from 'react';
|
||||
|
||||
import { DataSourceApi } from '@grafana/data';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/experimental';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/plugin-ui';
|
||||
import { config } from '@grafana/runtime';
|
||||
|
||||
import { createLokiDatasource } from '../../__mocks__/datasource';
|
||||
|
@ -7,7 +7,7 @@ import {
|
||||
QueryBuilderOperationParamValue,
|
||||
VisualQuery,
|
||||
VisualQueryModeller,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
import { Select } from '@grafana/ui';
|
||||
|
||||
import { getOperationParamId } from '../operationUtils';
|
||||
|
@ -14,7 +14,7 @@ import {
|
||||
RawQuery,
|
||||
QueryBuilderLabelFilter,
|
||||
QueryBuilderOperation,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
import { config } from '@grafana/runtime';
|
||||
|
||||
import { testIds } from '../../components/LokiQueryEditor';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { memo } from 'react';
|
||||
|
||||
import { OperationExplainedBox, OperationListExplained, RawQuery } from '@grafana/experimental';
|
||||
import { OperationExplainedBox, OperationListExplained, RawQuery } from '@grafana/plugin-ui';
|
||||
import { Stack } from '@grafana/ui';
|
||||
|
||||
import { lokiGrammar } from '../../syntax';
|
||||
|
@ -11,7 +11,7 @@ import {
|
||||
SelectableValue,
|
||||
store,
|
||||
} from '@grafana/data';
|
||||
import { EditorField, EditorRow, QueryOptionGroup } from '@grafana/experimental';
|
||||
import { EditorField, EditorRow, QueryOptionGroup } from '@grafana/plugin-ui';
|
||||
import { config, getAppEvents, reportInteraction } from '@grafana/runtime';
|
||||
import { Alert, AutoSizeInput, RadioButtonGroup, Select } from '@grafana/ui';
|
||||
|
||||
|
@ -2,7 +2,7 @@ import { css } from '@emotion/css';
|
||||
import { memo } from 'react';
|
||||
|
||||
import { GrafanaTheme2, toOption } from '@grafana/data';
|
||||
import { EditorRows, FlexItem } from '@grafana/experimental';
|
||||
import { EditorRows, FlexItem } from '@grafana/plugin-ui';
|
||||
import { AutoSizeInput, IconButton, Select, useStyles2 } from '@grafana/ui';
|
||||
|
||||
import { LokiDatasource } from '../../datasource';
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { css } from '@emotion/css';
|
||||
|
||||
import { GrafanaTheme2 } from '@grafana/data';
|
||||
import { RawQuery } from '@grafana/experimental';
|
||||
import { RawQuery } from '@grafana/plugin-ui';
|
||||
import { Button, Card, useStyles2 } from '@grafana/ui';
|
||||
|
||||
import logqlGrammar from '../../syntax';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { EditorRow, EditorFieldGroup, RawQuery } from '@grafana/experimental';
|
||||
import { EditorRow, EditorFieldGroup, RawQuery } from '@grafana/plugin-ui';
|
||||
|
||||
import { lokiGrammar } from '../../syntax';
|
||||
|
||||
|
@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
|
||||
import { ComponentProps } from 'react';
|
||||
|
||||
import { DataFrame, DataSourceApi, FieldType, toDataFrame } from '@grafana/data';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/experimental';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/plugin-ui';
|
||||
import { config } from '@grafana/runtime';
|
||||
|
||||
import { createLokiDatasource } from '../../__mocks__/datasource';
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { useState } from 'react';
|
||||
|
||||
import { SelectableValue, getDefaultTimeRange, toOption } from '@grafana/data';
|
||||
import { QueryBuilderOperationParamEditorProps, VisualQueryModeller } from '@grafana/experimental';
|
||||
import { QueryBuilderOperationParamEditorProps, VisualQueryModeller } from '@grafana/plugin-ui';
|
||||
import { config } from '@grafana/runtime';
|
||||
import { Select } from '@grafana/ui';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { QueryBuilderOperation, QueryBuilderOperationDefinition } from '@grafana/experimental';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationDefinition } from '@grafana/plugin-ui';
|
||||
|
||||
import {
|
||||
createAggregationOperation,
|
||||
|
@ -8,7 +8,7 @@ import {
|
||||
QueryBuilderOperationParamValue,
|
||||
VisualQuery,
|
||||
VisualQueryModeller,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
|
||||
import { escapeLabelValueInExactSelector } from '../languageUtils';
|
||||
import { FUNCTIONS } from '../syntax';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { QueryBuilderOperationDefinition, QueryBuilderOperationParamValue } from '@grafana/experimental';
|
||||
import { QueryBuilderOperationDefinition, QueryBuilderOperationParamValue } from '@grafana/plugin-ui';
|
||||
|
||||
import { binaryScalarOperations } from './binaryScalarOperations';
|
||||
import { UnwrapParamEditor } from './components/UnwrapParamEditor';
|
||||
|
@ -1,6 +1,5 @@
|
||||
import { SyntaxNode } from '@lezer/common';
|
||||
|
||||
import { QueryBuilderLabelFilter, QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/experimental';
|
||||
import {
|
||||
And,
|
||||
BinOpExpr,
|
||||
@ -54,6 +53,7 @@ import {
|
||||
OnOrIgnoringModifier,
|
||||
OrFilter,
|
||||
} from '@grafana/lezer-logql';
|
||||
import { QueryBuilderLabelFilter, QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/plugin-ui';
|
||||
|
||||
import { binaryScalarDefs } from './binaryScalarOperations';
|
||||
import { checkParamsAreValid, getDefinitionById } from './operations';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { SyntaxNode, TreeCursor } from '@lezer/common';
|
||||
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/experimental';
|
||||
import { QueryBuilderOperation, QueryBuilderOperationParamValue } from '@grafana/plugin-ui';
|
||||
|
||||
// Although 0 isn't explicitly provided in the @grafana/lezer-logql library as the error node ID, it does appear to be the ID of error nodes within lezer.
|
||||
export const ErrorId = 0;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { QueryEditorMode } from '@grafana/experimental';
|
||||
import { QueryEditorMode } from '@grafana/plugin-ui';
|
||||
|
||||
import { changeEditorMode, getQueryWithDefaults } from './state';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { QueryEditorMode } from '@grafana/experimental';
|
||||
import { QueryEditorMode } from '@grafana/plugin-ui';
|
||||
|
||||
import { LokiQuery, LokiQueryType } from '../types';
|
||||
|
||||
|
@ -3,7 +3,7 @@ import {
|
||||
QueryBuilderLabelFilter,
|
||||
QueryBuilderOperation,
|
||||
BINARY_OPERATIONS_KEY,
|
||||
} from '@grafana/experimental';
|
||||
} from '@grafana/plugin-ui';
|
||||
|
||||
/**
|
||||
* Visual query model
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { CoreApp, DashboardLoadedEvent, DataQueryRequest, dateTime } from '@grafana/data';
|
||||
import { QueryEditorMode } from '@grafana/experimental';
|
||||
import { QueryEditorMode } from '@grafana/plugin-ui';
|
||||
import { reportInteraction } from '@grafana/runtime';
|
||||
|
||||
import pluginJson from './plugin.json';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { CoreApp, DashboardLoadedEvent, DataQueryRequest, DataQueryResponse } from '@grafana/data';
|
||||
import { QueryEditorMode } from '@grafana/experimental';
|
||||
import { QueryEditorMode } from '@grafana/plugin-ui';
|
||||
import { reportInteraction, config } from '@grafana/runtime';
|
||||
|
||||
import {
|
||||
|
Loading…
Reference in New Issue
Block a user