From 8f37295b02f4ceab9ba4d293e3599e1788c8246b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 14 Jan 2023 09:30:43 +0100 Subject: [PATCH] Scenes: Panel repeater change (#61302) * Update scene panel repeater by change in scenes package * Use latest scenes package * Fix package.json * lock update * Fix lock Co-authored-by: Dominik Prokop --- package.json | 9 +--- public/app/features/scenes/scenes/demo.tsx | 61 +++++++++++++--------- yarn.lock | 33 ++++++++---- 3 files changed, 61 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 1f25f7c4400..d1c7d835bde 100644 --- a/package.json +++ b/package.json @@ -253,7 +253,7 @@ "@grafana/lezer-logql": "0.1.1", "@grafana/monaco-logql": "^0.0.6", "@grafana/runtime": "workspace:*", - "@grafana/scenes": "0.0.4", + "@grafana/scenes": "latest", "@grafana/schema": "workspace:*", "@grafana/ui": "workspace:*", "@jaegertracing/jaeger-ui-components": "workspace:*", @@ -429,10 +429,5 @@ "engines": { "node": ">= 16" }, - "packageManager": "yarn@3.3.0", - "dependenciesMeta": { - "@grafana/scenes@0.0.3": { - "unplugged": true - } - } + "packageManager": "yarn@3.3.0" } diff --git a/public/app/features/scenes/scenes/demo.tsx b/public/app/features/scenes/scenes/demo.tsx index a8c3c861987..bf63f63c019 100644 --- a/public/app/features/scenes/scenes/demo.tsx +++ b/public/app/features/scenes/scenes/demo.tsx @@ -2,11 +2,12 @@ import { SceneFlexLayout, SceneTimeRange, SceneTimePicker, - ScenePanelRepeater, + SceneByFrameRepeater, VizPanel, SceneCanvasText, SceneToolbarInput, EmbeddedScene, + SceneDataNode, } from '@grafana/scenes'; import { panelBuilders } from '../builders/panelBuilders'; @@ -76,33 +77,41 @@ export function getScenePanelRepeaterTest(standalone: boolean): Scene | Embedded const state = { title: 'Panel repeater test', - body: new ScenePanelRepeater({ - layout: new SceneFlexLayout({ + body: new SceneByFrameRepeater({ + body: new SceneFlexLayout({ direction: 'column', - children: [ - new SceneFlexLayout({ - direction: 'row', - placement: { minHeight: 200 }, - children: [ - new VizPanel({ - pluginId: 'timeseries', - title: 'Title', - options: { - legend: { displayMode: 'hidden' }, - }, - }), - new VizPanel({ - placement: { width: 300 }, - pluginId: 'stat', - fieldConfig: { defaults: { displayName: 'Last' }, overrides: [] }, - options: { - graphMode: 'none', - }, - }), - ], - }), - ], + children: [], }), + getLayoutChild: (data, frame, frameIndex) => { + return new SceneFlexLayout({ + key: `panel-${frameIndex}`, + $data: new SceneDataNode({ + data: { + ...data, + series: [frame], + }, + }), + direction: 'row', + placement: { minHeight: 200 }, + children: [ + new VizPanel({ + pluginId: 'timeseries', + title: 'Title', + options: { + legend: { displayMode: 'hidden' }, + }, + }), + new VizPanel({ + placement: { width: 300 }, + pluginId: 'stat', + fieldConfig: { defaults: { displayName: 'Last' }, overrides: [] }, + options: { + graphMode: 'none', + }, + }), + ], + }); + }, }), $editor: new SceneEditManager({}), $timeRange: new SceneTimeRange(), diff --git a/yarn.lock b/yarn.lock index 794a19e5195..45fa0fb762d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4922,6 +4922,17 @@ __metadata: languageName: unknown linkType: soft +"@grafana/e2e-selectors@npm:canary": + version: 9.4.0-96193pre + resolution: "@grafana/e2e-selectors@npm:9.4.0-96193pre" + dependencies: + "@grafana/tsconfig": ^1.2.0-rc1 + tslib: 2.4.1 + typescript: 4.8.4 + checksum: 1ce663607c0c816ec02cad33d80c38731c4dfafdc7d1693baa989b8eff6588e3cc1d8a031c4f30f888bbd8aa8768cce7c5dd4cb2455306040f39dcac933ceae4 + languageName: node + linkType: hard + "@grafana/e2e@workspace:*, @grafana/e2e@workspace:packages/grafana-e2e": version: 0.0.0-use.local resolution: "@grafana/e2e@workspace:packages/grafana-e2e" @@ -5109,10 +5120,17 @@ __metadata: languageName: unknown linkType: soft -"@grafana/scenes@npm:0.0.4": - version: 0.0.4 - resolution: "@grafana/scenes@npm:0.0.4" - checksum: adbc69e4033bdd40a5c2fe13ee7af2b787c236e548c389b6820b057f76ae3727fc4f85d2205d6658e008f69f75bbf84c04453fedb29f9979a76517267f1f91ad +"@grafana/scenes@npm:latest": + version: 0.0.5 + resolution: "@grafana/scenes@npm:0.0.5" + dependencies: + "@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: 7388aaccb0788801f94734126d1abab71df3f81131eec41c967b0c462223a13fcfbc5a65ce7a45bf6761032d8efd1330cb85ac8e86136cba9e4dd244f41b1054 languageName: node linkType: hard @@ -22015,7 +22033,7 @@ __metadata: "@grafana/lezer-logql": 0.1.1 "@grafana/monaco-logql": ^0.0.6 "@grafana/runtime": "workspace:*" - "@grafana/scenes": 0.0.4 + "@grafana/scenes": latest "@grafana/schema": "workspace:*" "@grafana/toolkit": "workspace:*" "@grafana/tsconfig": ^1.2.0-rc1 @@ -22304,9 +22322,6 @@ __metadata: webpack-manifest-plugin: 5.0.0 webpack-merge: 5.8.0 whatwg-fetch: 3.6.2 - dependenciesMeta: - "@grafana/scenes@0.0.3": - unplugged: true languageName: unknown linkType: soft @@ -38417,7 +38432,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:9.0.0": +"uuid@npm:9.0.0, uuid@npm:^9.0.0": version: 9.0.0 resolution: "uuid@npm:9.0.0" bin: