Skip to content

Commit 3fa881d

Browse files
authored
Merge pull request #1922 from grafana/ivana/deprecate-experimental
Replace `@grafana/experimental` with `@grafana/plugin-ui`
2 parents e3c3c11 + fa7fca7 commit 3fa881d

File tree

3 files changed

+236
-46
lines changed

3 files changed

+236
-46
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
"dependencies": {
3232
"@emotion/css": "11.10.6",
3333
"@grafana/data": "10.4.2",
34-
"@grafana/experimental": "^1.7.4",
34+
"@grafana/plugin-ui": "^0.9.1",
3535
"@grafana/runtime": "10.4.2",
3636
"@grafana/schema": "10.4.2",
3737
"@grafana/ui": "10.4.2",
38+
"react": "18.2.0",
3839
"react-dom": "18.2.0",
3940
"react-router-dom": "^5.2.0",
40-
"react": "18.2.0",
4141
"rxjs": "7.8.1",
4242
"tslib": "2.5.3"
4343
},
@@ -64,42 +64,42 @@
6464
"copy-webpack-plugin": "^11.0.0",
6565
"cspell": "6.13.3",
6666
"css-loader": "^6.7.3",
67+
"eslint": "8.42.0",
6768
"eslint-plugin-deprecation": "^2.0.0",
6869
"eslint-plugin-jsdoc": "^46.8.2",
6970
"eslint-plugin-prettier": "^5.0.0",
70-
"eslint-plugin-react-hooks": "^4.6.0",
7171
"eslint-plugin-react": "^7.33.2",
72+
"eslint-plugin-react-hooks": "^4.6.0",
7273
"eslint-webpack-plugin": "^4.0.1",
73-
"eslint": "8.42.0",
7474
"fork-ts-checker-webpack-plugin": "^8.0.0",
7575
"glob": "^10.2.7",
7676
"identity-obj-proxy": "3.0.0",
77-
"jest-environment-jsdom": "^29.5.0",
7877
"jest": "^29.5.0",
78+
"jest-environment-jsdom": "^29.5.0",
7979
"lodash": "4.17.21",
8080
"mini-css-extract-plugin": "2.6.1",
8181
"moment": "2.29.4",
82+
"postcss": "8.4.31",
8283
"postcss-loader": "7.0.1",
8384
"postcss-reporter": "7.0.5",
8485
"postcss-scss": "4.0.4",
85-
"postcss": "8.4.31",
8686
"prettier": "^3.0.3",
8787
"prop-types": "15.7.2",
8888
"react-table-6": "6.11.0",
8989
"react-use": "17.4.0",
9090
"replace-in-file-webpack-plugin": "^1.0.6",
91-
"sass-loader": "13.3.1",
9291
"sass": "1.63.2",
92+
"sass-loader": "13.3.1",
9393
"semver": "7.5.4",
9494
"style-loader": "3.3.3",
9595
"swc-loader": "^0.2.3",
9696
"ts-node": "^10.9.1",
9797
"tsconfig-paths": "^4.2.0",
9898
"typescript": "4.8.4",
99+
"webpack": "^5.94.0",
99100
"webpack-cli": "^5.1.4",
100101
"webpack-livereload-plugin": "^3.0.2",
101-
"webpack-remove-empty-scripts": "^1.0.1",
102-
"webpack": "^5.94.0"
102+
"webpack-remove-empty-scripts": "^1.0.1"
103103
},
104104
"resolutions": {
105105
"uplot": "1.6.31",

src/datasource/components/ConfigEditor.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import {
1919
Auth,
2020
ConfigSection,
2121
ConfigSubSection,
22-
Stack,
22+
EditorStack,
2323
convertLegacyAuthProps,
2424
ConnectionSettings,
2525
DataSourceDescription,
2626
AdvancedHttpSettings,
27-
} from '@grafana/experimental';
27+
} from '@grafana/plugin-ui';
2828
import { Divider } from './Divider';
2929
import { css } from '@emotion/css';
3030

@@ -185,7 +185,7 @@ export const ConfigEditor = (props: Props) => {
185185
<Field
186186
label={
187187
<Label>
188-
<Stack gap={0.5}>
188+
<EditorStack gap={0.5}>
189189
<span>Cache TTL</span>
190190
<Tooltip
191191
content={
@@ -196,7 +196,7 @@ export const ConfigEditor = (props: Props) => {
196196
>
197197
<Icon name="info-circle" size="sm" />
198198
</Tooltip>
199-
</Stack>
199+
</EditorStack>
200200
</Label>
201201
}
202202
>
@@ -211,12 +211,12 @@ export const ConfigEditor = (props: Props) => {
211211
<Field
212212
label={
213213
<Label>
214-
<Stack gap={0.5}>
214+
<EditorStack gap={0.5}>
215215
<span>Timeout</span>
216216
<Tooltip content={<span>Zabbix API connection timeout in seconds. Default is 30.</span>}>
217217
<Icon name="info-circle" size="sm" />
218218
</Tooltip>
219-
</Stack>
219+
</EditorStack>
220220
</Label>
221221
}
222222
>
@@ -248,7 +248,7 @@ export const ConfigEditor = (props: Props) => {
248248
<Field
249249
label={
250250
<Label>
251-
<Stack gap={0.5}>
251+
<EditorStack gap={0.5}>
252252
<span>After</span>
253253
<Tooltip
254254
content={
@@ -260,7 +260,7 @@ export const ConfigEditor = (props: Props) => {
260260
>
261261
<Icon name="info-circle" size="sm" />
262262
</Tooltip>
263-
</Stack>
263+
</EditorStack>
264264
</Label>
265265
}
266266
>
@@ -274,7 +274,7 @@ export const ConfigEditor = (props: Props) => {
274274
<Field
275275
label={
276276
<Label>
277-
<Stack gap={0.5}>
277+
<EditorStack gap={0.5}>
278278
<span>Range</span>
279279
<Tooltip
280280
content={
@@ -286,7 +286,7 @@ export const ConfigEditor = (props: Props) => {
286286
>
287287
<Icon name="info-circle" size="sm" />
288288
</Tooltip>
289-
</Stack>
289+
</EditorStack>
290290
</Label>
291291
}
292292
>
@@ -353,7 +353,7 @@ export const ConfigEditor = (props: Props) => {
353353
<Field
354354
label={
355355
<Label>
356-
<Stack gap={0.5}>
356+
<EditorStack gap={0.5}>
357357
<span>Disable data alignment</span>
358358
<Tooltip
359359
content={
@@ -368,7 +368,7 @@ export const ConfigEditor = (props: Props) => {
368368
>
369369
<Icon name="info-circle" size="sm" />
370370
</Tooltip>
371-
</Stack>
371+
</EditorStack>
372372
</Label>
373373
}
374374
>

0 commit comments

Comments
 (0)