diff --git a/package.json b/package.json index 4b7f3ca6efc..bb179a21e63 100644 --- a/package.json +++ b/package.json @@ -266,7 +266,7 @@ "@grafana/lezer-logql": "0.1.2", "@grafana/monaco-logql": "^0.0.7", "@grafana/runtime": "workspace:*", - "@grafana/scenes": "^0.2.0", + "@grafana/scenes": "^0.3.0", "@grafana/schema": "workspace:*", "@grafana/ui": "workspace:*", "@kusto/monaco-kusto": "5.3.6", diff --git a/public/app/features/scenes/apps/SceneRadioToggle.tsx b/public/app/features/scenes/apps/SceneRadioToggle.tsx index 060b9327de2..b821a420f18 100644 --- a/public/app/features/scenes/apps/SceneRadioToggle.tsx +++ b/public/app/features/scenes/apps/SceneRadioToggle.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { SelectableValue } from '@grafana/data'; -import { SceneComponentProps, SceneObjectBase, SceneObjectStatePlain } from '@grafana/scenes'; +import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes'; import { RadioButtonGroup } from '@grafana/ui'; -export interface SceneRadioToggleState extends SceneObjectStatePlain { +export interface SceneRadioToggleState extends SceneObjectState { options: Array>; value: string; onChange: (value: string) => void; diff --git a/public/app/features/scenes/apps/SceneSearchBox.tsx b/public/app/features/scenes/apps/SceneSearchBox.tsx index 0a4a5dfb57c..1e5ebd6a24d 100644 --- a/public/app/features/scenes/apps/SceneSearchBox.tsx +++ b/public/app/features/scenes/apps/SceneSearchBox.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { SceneComponentProps, SceneObjectStatePlain, SceneObjectBase } from '@grafana/scenes'; +import { SceneComponentProps, SceneObjectState, SceneObjectBase } from '@grafana/scenes'; import { Input } from '@grafana/ui'; -export interface SceneSearchBoxState extends SceneObjectStatePlain { +export interface SceneSearchBoxState extends SceneObjectState { value: string; } diff --git a/public/app/features/scenes/dashboard/DashboardScene.tsx b/public/app/features/scenes/dashboard/DashboardScene.tsx index 433c7e65926..8f3a8ffcdb2 100644 --- a/public/app/features/scenes/dashboard/DashboardScene.tsx +++ b/public/app/features/scenes/dashboard/DashboardScene.tsx @@ -3,18 +3,12 @@ import React from 'react'; import { GrafanaTheme2, PageLayoutType } from '@grafana/data'; import { config, locationService } from '@grafana/runtime'; -import { - UrlSyncManager, - SceneObjectBase, - SceneComponentProps, - SceneObject, - SceneObjectStatePlain, -} from '@grafana/scenes'; +import { UrlSyncManager, SceneObjectBase, SceneComponentProps, SceneObject, SceneObjectState } from '@grafana/scenes'; import { PageToolbar, ToolbarButton, useStyles2 } from '@grafana/ui'; import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate'; import { Page } from 'app/core/components/Page/Page'; -interface DashboardSceneState extends SceneObjectStatePlain { +interface DashboardSceneState extends SceneObjectState { title: string; uid?: string; body: SceneObject; diff --git a/yarn.lock b/yarn.lock index b49d85f229d..7f087daffcb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3107,14 +3107,14 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:^9.4.3": - version: 9.4.3 - resolution: "@grafana/e2e-selectors@npm:9.4.3" +"@grafana/e2e-selectors@npm:canary": + version: 9.5.0-109075pre + resolution: "@grafana/e2e-selectors@npm:9.5.0-109075pre" dependencies: "@grafana/tsconfig": ^1.2.0-rc1 - tslib: 2.4.1 + tslib: 2.5.0 typescript: 4.8.4 - checksum: 85a88cdf4adb643ff863b15f96fc6c04ecb7567c27cc526a00c157eb02575e55adc1e7701d58e1b48f00f24951c332fbb191cd2b5a8e74cd0c545543777e82af + checksum: 46b7853aeaab0ac2823a0add250c421632eb324f4f74e3633e0db58bf68920ef8bcbdc3666b17dbb4ac0af7c1d52777016fc7796a1b0a19bf5d3451945aca270 languageName: node linkType: hard @@ -3326,17 +3326,17 @@ __metadata: languageName: unknown linkType: soft -"@grafana/scenes@npm:^0.2.0": - version: 0.2.0 - resolution: "@grafana/scenes@npm:0.2.0" +"@grafana/scenes@npm:^0.3.0": + version: 0.3.0 + resolution: "@grafana/scenes@npm:0.3.0" dependencies: - "@grafana/e2e-selectors": ^9.4.3 + "@grafana/e2e-selectors": canary "@grafana/experimental": 1.0.1 react-grid-layout: 1.3.4 react-use: 17.4.0 react-virtualized-auto-sizer: 1.0.7 uuid: ^9.0.0 - checksum: a04fe353eec8f048de7c51079e7f7bef461b372c3c086d5ff3be46fc0e70a21e907272f0ed05a41633847a3736c5e65e441ffa20b2c18eedea813decf3eef636 + checksum: 3610cedcc150b9d6e3d6948056bb1bbbfe58d7fa0ff6e762eec6619bb0940504db867ea87e56160f27e4d93772f6203493bf87d353a1b18d2664e74a03f03a05 languageName: node linkType: hard @@ -20110,7 +20110,7 @@ __metadata: "@grafana/lezer-logql": 0.1.2 "@grafana/monaco-logql": ^0.0.7 "@grafana/runtime": "workspace:*" - "@grafana/scenes": ^0.2.0 + "@grafana/scenes": ^0.3.0 "@grafana/schema": "workspace:*" "@grafana/toolkit": "workspace:*" "@grafana/tsconfig": ^1.2.0-rc1 @@ -35667,13 +35667,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.4.1": - version: 2.4.1 - resolution: "tslib@npm:2.4.1" - checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca - languageName: node - linkType: hard - "tslib@npm:2.5.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.4.1": version: 2.5.0 resolution: "tslib@npm:2.5.0"