From 58a3e0ae869b7161b94993b2c0057e972b8eb7c0 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:48:19 +0100
Subject: [PATCH] Remove @grafana/experimental in @grafana/o11y-ds-frontend and
 @grafana/sql (#99501)

* Remove @grafana/experimental in @grafana/o11y-ds-frontend

* Remove @grafana/experimental in @grafana/sql

* Fix mock in test
---
 packages/grafana-o11y-ds-frontend/package.json                | 2 +-
 .../src/NodeGraph/NodeGraphSettings.tsx                       | 2 +-
 .../grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx  | 2 +-
 .../src/TraceToLogs/TraceToLogsSettings.tsx                   | 2 +-
 .../src/TraceToMetrics/TraceToMetricsSettings.tsx             | 2 +-
 .../src/TraceToProfiles/TraceToProfilesSettings.tsx           | 2 +-
 packages/grafana-sql/package.json                             | 2 +-
 packages/grafana-sql/src/components/QueryEditor.tsx           | 2 +-
 packages/grafana-sql/src/components/QueryHeader.tsx           | 2 +-
 .../src/components/configuration/ConnectionLimits.tsx         | 4 ++--
 .../src/components/query-editor-raw/QueryEditorRaw.tsx        | 2 +-
 .../src/components/visual-query-builder/GroupByRow.tsx        | 2 +-
 .../src/components/visual-query-builder/OrderByRow.tsx        | 2 +-
 .../src/components/visual-query-builder/SelectColumn.tsx      | 2 +-
 .../visual-query-builder/SelectFunctionParameters.tsx         | 2 +-
 .../src/components/visual-query-builder/SelectRow.test.tsx    | 1 +
 .../src/components/visual-query-builder/SelectRow.tsx         | 2 +-
 .../src/components/visual-query-builder/VisualEditor.tsx      | 2 +-
 packages/grafana-sql/src/datasource/SqlDatasource.ts          | 2 +-
 packages/grafana-sql/src/defaults.ts                          | 2 +-
 packages/grafana-sql/src/types.ts                             | 2 +-
 yarn.lock                                                     | 4 ++--
 22 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
index fbd1ee55713..4da97db322a 100644
--- a/packages/grafana-o11y-ds-frontend/package.json
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -20,7 +20,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "11.5.0-pre",
     "@grafana/e2e-selectors": "11.5.0-pre",
-    "@grafana/experimental": "2.1.6",
+    "@grafana/plugin-ui": "0.9.6",
     "@grafana/runtime": "11.5.0-pre",
     "@grafana/schema": "11.5.0-pre",
     "@grafana/ui": "11.5.0-pre",
diff --git a/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx b/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
index 8b6f3c5f4b6..fd9ba9cd6c9 100644
--- a/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/NodeGraph/NodeGraphSettings.tsx
@@ -7,7 +7,7 @@ import {
   GrafanaTheme2,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
 import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui';
 
 export interface NodeGraphOptions {
diff --git a/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx b/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx
index a612dee380d..11710cef528 100644
--- a/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/SpanBar/SpanBarSettings.tsx
@@ -7,7 +7,7 @@ import {
   toOption,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/plugin-ui';
 import { InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui';
 
 export interface SpanBarOptions {
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
index d94e09b0411..b5bca15f317 100644
--- a/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToLogs/TraceToLogsSettings.tsx
@@ -3,7 +3,7 @@ import { useCallback, useMemo } from 'react';
 import * as React from 'react';
 
 import { DataSourceJsonData, DataSourceInstanceSettings, DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/plugin-ui';
 import { DataSourcePicker } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui';
 
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
index 98cff44f304..966c1703b54 100644
--- a/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/TraceToMetricsSettings.tsx
@@ -7,7 +7,7 @@ import {
   GrafanaTheme2,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/plugin-ui';
 import { DataSourcePicker } from '@grafana/runtime';
 import { Button, InlineField, InlineFieldRow, Input, useStyles2 } from '@grafana/ui';
 
diff --git a/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx
index 9b2d5ca31cc..cb5af242966 100644
--- a/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx
+++ b/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/TraceToProfilesSettings.tsx
@@ -9,7 +9,7 @@ import {
   DataSourcePluginOptionsEditorProps,
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
-import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental';
+import { ConfigDescriptionLink, ConfigSection } from '@grafana/plugin-ui';
 import { DataSourcePicker, DataSourceWithBackend, getDataSourceSrv } from '@grafana/runtime';
 import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui';
 
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index 509a4b9832f..d2a690cde8e 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -17,7 +17,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "11.5.0-pre",
     "@grafana/e2e-selectors": "11.5.0-pre",
-    "@grafana/experimental": "2.1.6",
+    "@grafana/plugin-ui": "0.9.6",
     "@grafana/runtime": "11.5.0-pre",
     "@grafana/ui": "11.5.0-pre",
     "@react-awesome-query-builder/ui": "6.6.4",
diff --git a/packages/grafana-sql/src/components/QueryEditor.tsx b/packages/grafana-sql/src/components/QueryEditor.tsx
index 487c4f2c1c9..fa7bc199209 100644
--- a/packages/grafana-sql/src/components/QueryEditor.tsx
+++ b/packages/grafana-sql/src/components/QueryEditor.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { QueryEditorProps } from '@grafana/data';
-import { EditorMode } from '@grafana/experimental';
+import { EditorMode } from '@grafana/plugin-ui';
 import { Space } from '@grafana/ui';
 
 import { SqlDatasource } from '../datasource/SqlDatasource';
diff --git a/packages/grafana-sql/src/components/QueryHeader.tsx b/packages/grafana-sql/src/components/QueryHeader.tsx
index f1bede6cb4f..d7f7412d453 100644
--- a/packages/grafana-sql/src/components/QueryHeader.tsx
+++ b/packages/grafana-sql/src/components/QueryHeader.tsx
@@ -3,7 +3,7 @@ import { useCopyToClipboard } from 'react-use';
 
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect } from '@grafana/experimental';
+import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect } from '@grafana/plugin-ui';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, InlineSwitch, RadioButtonGroup, Tooltip, Space } from '@grafana/ui';
 
diff --git a/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx b/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
index 17218d5188a..50bc7e82ae7 100644
--- a/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
+++ b/packages/grafana-sql/src/components/configuration/ConnectionLimits.tsx
@@ -1,7 +1,7 @@
 import { DataSourceSettings } from '@grafana/data';
-import { ConfigSubSection, Stack } from '@grafana/experimental';
+import { ConfigSubSection } from '@grafana/plugin-ui';
 import { config } from '@grafana/runtime';
-import { Field, Icon, InlineLabel, Label, Switch, Tooltip } from '@grafana/ui';
+import { Field, Icon, InlineLabel, Label, Stack, Switch, Tooltip } from '@grafana/ui';
 
 import { SQLConnectionLimits, SQLOptions } from '../../types';
 
diff --git a/packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx b/packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx
index 2f9f7bd6eeb..ed79057cd55 100644
--- a/packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx
+++ b/packages/grafana-sql/src/components/query-editor-raw/QueryEditorRaw.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react';
 import * as React from 'react';
 
-import { LanguageDefinition, SQLEditor } from '@grafana/experimental';
+import { LanguageDefinition, SQLEditor } from '@grafana/plugin-ui';
 
 import { SQLQuery } from '../../types';
 
diff --git a/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
index 33460b4e169..8f6b463c8ee 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { AccessoryButton, EditorList, InputGroup } from '@grafana/experimental';
+import { AccessoryButton, EditorList, InputGroup } from '@grafana/plugin-ui';
 import { Select } from '@grafana/ui';
 
 import { QueryEditorGroupByExpression } from '../../expressions';
diff --git a/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
index 3c2c274eeab..8e7286153a9 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/OrderByRow.tsx
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import * as React from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { EditorField, InputGroup } from '@grafana/experimental';
+import { EditorField, InputGroup } from '@grafana/plugin-ui';
 import { Input, RadioButtonGroup, Select, Space } from '@grafana/ui';
 
 import { SQLExpression } from '../../types';
diff --git a/packages/grafana-sql/src/components/visual-query-builder/SelectColumn.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectColumn.tsx
index 774ef7501f8..cea8b01e72a 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/SelectColumn.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectColumn.tsx
@@ -2,7 +2,7 @@ import { useId } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorField } from '@grafana/experimental';
+import { EditorField } from '@grafana/plugin-ui';
 import { Select } from '@grafana/ui';
 
 interface Props {
diff --git a/packages/grafana-sql/src/components/visual-query-builder/SelectFunctionParameters.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectFunctionParameters.tsx
index 3d5c2203447..16241e3aac4 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/SelectFunctionParameters.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectFunctionParameters.tsx
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useId, useState } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorField } from '@grafana/experimental';
+import { EditorField } from '@grafana/plugin-ui';
 import { InlineLabel, Input, Select, Stack, useStyles2 } from '@grafana/ui';
 
 import { QueryEditorExpressionType } from '../../expressions';
diff --git a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.test.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.test.tsx
index a54e1ef72ab..3b31add19ad 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.test.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.test.tsx
@@ -12,6 +12,7 @@ import { SelectRow } from './SelectRow';
 
 // Mock featureToggle sqlQuerybuilderFunctionParameters
 jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
   config: {
     featureToggles: {
       sqlQuerybuilderFunctionParameters: true,
diff --git a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
index 302977d88cd..a553ece4a6c 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
@@ -4,7 +4,7 @@ import { useCallback } from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { EditorField } from '@grafana/experimental';
+import { EditorField } from '@grafana/plugin-ui';
 import { config } from '@grafana/runtime';
 import { Button, Select, Stack, useStyles2 } from '@grafana/ui';
 
diff --git a/packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx b/packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx
index ca5e37fd41d..3a267301163 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/VisualEditor.tsx
@@ -1,6 +1,6 @@
 import { useAsync } from 'react-use';
 
-import { EditorRows, EditorRow, EditorField } from '@grafana/experimental';
+import { EditorRows, EditorRow, EditorField } from '@grafana/plugin-ui';
 
 import { DB, QueryEditorProps, QueryRowFilter } from '../../types';
 import { QueryToolbox } from '../query-editor-raw/QueryToolbox';
diff --git a/packages/grafana-sql/src/datasource/SqlDatasource.ts b/packages/grafana-sql/src/datasource/SqlDatasource.ts
index 121d30a4731..ca4675034c7 100644
--- a/packages/grafana-sql/src/datasource/SqlDatasource.ts
+++ b/packages/grafana-sql/src/datasource/SqlDatasource.ts
@@ -17,7 +17,7 @@ import {
   VariableWithMultiSupport,
   TimeRange,
 } from '@grafana/data';
-import { EditorMode } from '@grafana/experimental';
+import { EditorMode } from '@grafana/plugin-ui';
 import {
   BackendDataSourceResponse,
   DataSourceWithBackend,
diff --git a/packages/grafana-sql/src/defaults.ts b/packages/grafana-sql/src/defaults.ts
index 4532bdcc3a6..06930dcc8cc 100644
--- a/packages/grafana-sql/src/defaults.ts
+++ b/packages/grafana-sql/src/defaults.ts
@@ -1,4 +1,4 @@
-import { EditorMode } from '@grafana/experimental';
+import { EditorMode } from '@grafana/plugin-ui';
 
 import { QueryFormat, SQLQuery } from './types';
 import { createFunctionField, setGroupByField } from './utils/sql.utils';
diff --git a/packages/grafana-sql/src/types.ts b/packages/grafana-sql/src/types.ts
index dd2af526b81..00c1a6e0456 100644
--- a/packages/grafana-sql/src/types.ts
+++ b/packages/grafana-sql/src/types.ts
@@ -9,7 +9,7 @@ import {
   TimeRange,
   toOption as toOptionFromData,
 } from '@grafana/data';
-import { CompletionItemKind, EditorMode, LanguageDefinition } from '@grafana/experimental';
+import { CompletionItemKind, EditorMode, LanguageDefinition } from '@grafana/plugin-ui';
 
 import { QueryWithDefaults } from './defaults';
 import {
diff --git a/yarn.lock b/yarn.lock
index dfca5abd1a2..899a9ca41b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3497,7 +3497,7 @@ __metadata:
     "@emotion/css": "npm:11.13.5"
     "@grafana/data": "npm:11.5.0-pre"
     "@grafana/e2e-selectors": "npm:11.5.0-pre"
-    "@grafana/experimental": "npm:2.1.6"
+    "@grafana/plugin-ui": "npm:0.9.6"
     "@grafana/runtime": "npm:11.5.0-pre"
     "@grafana/schema": "npm:11.5.0-pre"
     "@grafana/tsconfig": "npm:^2.0.0"
@@ -3875,7 +3875,7 @@ __metadata:
     "@emotion/css": "npm:11.13.5"
     "@grafana/data": "npm:11.5.0-pre"
     "@grafana/e2e-selectors": "npm:11.5.0-pre"
-    "@grafana/experimental": "npm:2.1.6"
+    "@grafana/plugin-ui": "npm:0.9.6"
     "@grafana/runtime": "npm:11.5.0-pre"
     "@grafana/tsconfig": "npm:^2.0.0"
     "@grafana/ui": "npm:11.5.0-pre"