diff --git a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx index 907c1f48177..03c30178b6e 100644 --- a/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx @@ -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 diff --git a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx index 43c6d63bd26..c4a46e09690 100644 --- a/public/app/plugins/datasource/loki/components/LokiContextUi.tsx +++ b/public/app/plugins/datasource/loki/components/LokiContextUi.tsx @@ -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, diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx index 47626e222f7..a821cdf8c38 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx index eba24c05762..a6da1b06ff8 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx index 7e3bcc24d54..950b5ca8e7a 100644 --- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx +++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx @@ -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({ diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx index 2908238f7b6..34e5420c53d 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx index 8a72856117e..652824719cb 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx index c5f956bf472..9aed106dca0 100644 --- a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx +++ b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/modifyQuery.ts b/public/app/plugins/datasource/loki/modifyQuery.ts index af192631f83..429f451ab14 100644 --- a/public/app/plugins/datasource/loki/modifyQuery.ts +++ b/public/app/plugins/datasource/loki/modifyQuery.ts @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts index ebb5aeefbb7..079d037a40c 100644 --- a/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts +++ b/public/app/plugins/datasource/loki/querybuilder/LokiQueryModeller.ts @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts b/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts index e41955641fd..287efd21fe1 100644 --- a/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts +++ b/public/app/plugins/datasource/loki/querybuilder/binaryScalarOperations.ts @@ -2,7 +2,7 @@ import { QueryBuilderOperation, QueryBuilderOperationDefinition, QueryBuilderOperationParamDef, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; import { defaultAddOperationHandler } from './operationUtils'; import { LokiOperationId, LokiVisualQueryOperationCategory } from './types'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx index 853039fdd64..7095c769d64 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx index f691a652e72..4391f42a2ef 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.tsx @@ -7,7 +7,7 @@ import { QueryBuilderOperationParamValue, VisualQuery, VisualQueryModeller, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; import { Select } from '@grafana/ui'; import { getOperationParamId } from '../operationUtils'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx index d364ae12dce..96e7a1fa79c 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx index 5af777c20e7..7829316538a 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderExplained.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx index 29d02331867..2d36a70f1af 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx index 7ab95dcb781..a22eb8144ec 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx index 574a70509af..7edaf3ead6d 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPattern.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx index e5f5b51a482..e84096c9789 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/QueryPreview.tsx @@ -1,4 +1,4 @@ -import { EditorRow, EditorFieldGroup, RawQuery } from '@grafana/experimental'; +import { EditorRow, EditorFieldGroup, RawQuery } from '@grafana/plugin-ui'; import { lokiGrammar } from '../../syntax'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx index 467808c92a1..bf69d3587fb 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx index c50b8b5ae54..630cb285568 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.tsx @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts b/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts index 4ea7b5fed24..c6c98c1d478 100644 --- a/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts +++ b/public/app/plugins/datasource/loki/querybuilder/operationUtils.test.ts @@ -1,4 +1,4 @@ -import { QueryBuilderOperation, QueryBuilderOperationDefinition } from '@grafana/experimental'; +import { QueryBuilderOperation, QueryBuilderOperationDefinition } from '@grafana/plugin-ui'; import { createAggregationOperation, diff --git a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts index 2ac580b9dc3..a3eb6702008 100644 --- a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts +++ b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts @@ -8,7 +8,7 @@ import { QueryBuilderOperationParamValue, VisualQuery, VisualQueryModeller, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; import { escapeLabelValueInExactSelector } from '../languageUtils'; import { FUNCTIONS } from '../syntax'; diff --git a/public/app/plugins/datasource/loki/querybuilder/operations.ts b/public/app/plugins/datasource/loki/querybuilder/operations.ts index 5fb91ce0f2f..65c40392005 100644 --- a/public/app/plugins/datasource/loki/querybuilder/operations.ts +++ b/public/app/plugins/datasource/loki/querybuilder/operations.ts @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.ts index ea2f0003e84..200746b154f 100644 --- a/public/app/plugins/datasource/loki/querybuilder/parsing.ts +++ b/public/app/plugins/datasource/loki/querybuilder/parsing.ts @@ -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'; diff --git a/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts index adc17113435..bb545d4e053 100644 --- a/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts +++ b/public/app/plugins/datasource/loki/querybuilder/parsingUtils.ts @@ -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; diff --git a/public/app/plugins/datasource/loki/querybuilder/state.test.ts b/public/app/plugins/datasource/loki/querybuilder/state.test.ts index 8335414f6e6..89fbc81b4d4 100644 --- a/public/app/plugins/datasource/loki/querybuilder/state.test.ts +++ b/public/app/plugins/datasource/loki/querybuilder/state.test.ts @@ -1,4 +1,4 @@ -import { QueryEditorMode } from '@grafana/experimental'; +import { QueryEditorMode } from '@grafana/plugin-ui'; import { changeEditorMode, getQueryWithDefaults } from './state'; diff --git a/public/app/plugins/datasource/loki/querybuilder/state.ts b/public/app/plugins/datasource/loki/querybuilder/state.ts index 590aeffdd8a..5f8aaecad55 100644 --- a/public/app/plugins/datasource/loki/querybuilder/state.ts +++ b/public/app/plugins/datasource/loki/querybuilder/state.ts @@ -1,4 +1,4 @@ -import { QueryEditorMode } from '@grafana/experimental'; +import { QueryEditorMode } from '@grafana/plugin-ui'; import { LokiQuery, LokiQueryType } from '../types'; diff --git a/public/app/plugins/datasource/loki/querybuilder/types.ts b/public/app/plugins/datasource/loki/querybuilder/types.ts index 055edb20dc8..0d655c54172 100644 --- a/public/app/plugins/datasource/loki/querybuilder/types.ts +++ b/public/app/plugins/datasource/loki/querybuilder/types.ts @@ -3,7 +3,7 @@ import { QueryBuilderLabelFilter, QueryBuilderOperation, BINARY_OPERATIONS_KEY, -} from '@grafana/experimental'; +} from '@grafana/plugin-ui'; /** * Visual query model diff --git a/public/app/plugins/datasource/loki/tracking.test.ts b/public/app/plugins/datasource/loki/tracking.test.ts index 7048692c7f1..2c46e75ffe2 100644 --- a/public/app/plugins/datasource/loki/tracking.test.ts +++ b/public/app/plugins/datasource/loki/tracking.test.ts @@ -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'; diff --git a/public/app/plugins/datasource/loki/tracking.ts b/public/app/plugins/datasource/loki/tracking.ts index 1b1ebfcc7cc..6810ce40876 100644 --- a/public/app/plugins/datasource/loki/tracking.ts +++ b/public/app/plugins/datasource/loki/tracking.ts @@ -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 {