From af02dc8460041da3227bb9fbe6cffdc647db7bdc Mon Sep 17 00:00:00 2001 From: L2D2Grafana Date: Tue, 3 Feb 2026 14:43:27 -0800 Subject: [PATCH 1/8] chore(deps): update grafana deps --- package.json | 3 +- packages/scenes-app/package.json | 14 +- .../scenes-app/src/demos/filteringData.tsx | 47 +- .../scenes-app/src/monitoring-app/scenes.tsx | 5 - .../scenes-app/src/monitoring-app/traffic.tsx | 5 +- packages/scenes-app/webpack.config.ts | 16 + packages/scenes-react/package.json | 10 +- packages/scenes-react/rollup.config.ts | 2 + packages/scenes/package.json | 10 +- packages/scenes/rollup.config.ts | 2 + .../VizPanelBuilder.test.ts.snap | 5 - .../scenes/src/core/SceneTimeRange.test.tsx | 8 +- yarn.lock | 1345 ++++++++--------- 13 files changed, 647 insertions(+), 825 deletions(-) diff --git a/package.json b/package.json index 943cbb313..c39ab0cb6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ }, "resolutions": { "@types/react": "18.2.74", - "@rollup/plugin-eslint/eslint": "^9.28.0" + "@rollup/plugin-eslint/eslint": "^9.28.0", + "rxjs": "7.8.1" }, "packageManager": "yarn@4.1.1", "workspaces": [ diff --git a/packages/scenes-app/package.json b/packages/scenes-app/package.json index c814e108a..86edaf614 100644 --- a/packages/scenes-app/package.json +++ b/packages/scenes-app/package.json @@ -20,12 +20,12 @@ "@babel/core": "^7.16.7", "@eslint/compat": "1.3.0", "@grafana/e2e": "9.2.1", - "@grafana/e2e-selectors": "^11.5.0", + "@grafana/e2e-selectors": "^12.3.0", "@grafana/eslint-config": "8.1.0", "@grafana/tsconfig": "1.3.0-rc1", "@stylistic/eslint-plugin-ts": "3.1.0", "@swc/core": "^1.2.144", - "@swc/helpers": "^0.3.6", + "@swc/helpers": "~0.5.0", "@swc/jest": "^0.2.36", "@testing-library/jest-dom": "^6.4.2", "@testing-library/react": "^12.1.3", @@ -64,13 +64,13 @@ }, "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "^11.6.0", - "@grafana/runtime": "^11.6.0", + "@grafana/data": "^12.3.0", + "@grafana/runtime": "^12.3.0", "@grafana/scenes": "workspace:*", - "@grafana/scenes-ml": "^0.2.0", + "@grafana/scenes-ml": "^0.5.0", "@grafana/scenes-react": "workspace:*", - "@grafana/schema": "^11.6.0", - "@grafana/ui": "^11.6.0", + "@grafana/schema": "^12.3.0", + "@grafana/ui": "^12.3.0", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/scenes-app/src/demos/filteringData.tsx b/packages/scenes-app/src/demos/filteringData.tsx index fdace1952..3d2d4eaa1 100644 --- a/packages/scenes-app/src/demos/filteringData.tsx +++ b/packages/scenes-app/src/demos/filteringData.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { EmbeddedScene, PanelBuilders, - PanelOptionsBuilders, SceneAppPage, SceneAppPageState, SceneComponentProps, @@ -10,12 +9,10 @@ import { SceneFlexItem, SceneFlexLayout, SceneObjectBase, - SceneObjectRef, SceneObjectState, SceneQueryRunner, - VizPanel, } from '@grafana/scenes'; -import { InlineSwitch, Input } from '@grafana/ui'; +import { Input } from '@grafana/ui'; import { getEmbeddedSceneDefaults } from './utils'; import { ControlsLabel } from '@grafana/scenes/src/utils/ControlsLabel'; import { DataTransformerConfig, MatcherConfig } from '@grafana/schema'; @@ -54,7 +51,6 @@ export function getDataFilteringTest(defaults: SceneAppPageState) { }); const tablePanel = PanelBuilders.table().setData(filteredData).build(); - const paginationControl = new PaginationControl({ vizPanelRef: new SceneObjectRef(tablePanel) }); return new SceneAppPage({ ...defaults, @@ -72,51 +68,12 @@ export function getDataFilteringTest(defaults: SceneAppPageState) { ], }), - controls: [searchBox, paginationControl], + controls: [searchBox], }); }, }); } -interface PaginationControlState extends SceneObjectState { - vizPanelRef: SceneObjectRef; - isEnabled: boolean; -} - -class PaginationControl extends SceneObjectBase { - static Component = PaginationControlRenderer; - - public constructor(initialState: Omit) { - super({ - isEnabled: false, - ...initialState, - }); - } - - onChange = () => { - const isEnabled = !this.state.isEnabled; - this.setState({ isEnabled }); - - const nextOptions = PanelOptionsBuilders.table() - .setOption('footer', { - enablePagination: isEnabled, - }) - .build(); - - this.state.vizPanelRef.resolve().onOptionsChange(nextOptions); - }; -} - -function PaginationControlRenderer({ model }: SceneComponentProps) { - const { isEnabled } = model.useState(); - return ( -
- - -
- ); -} - export interface SearchBoxState extends SceneObjectState { value: string; } diff --git a/packages/scenes-app/src/monitoring-app/scenes.tsx b/packages/scenes-app/src/monitoring-app/scenes.tsx index 4bc2ed6ae..60977a7f5 100644 --- a/packages/scenes-app/src/monitoring-app/scenes.tsx +++ b/packages/scenes-app/src/monitoring-app/scenes.tsx @@ -52,15 +52,10 @@ export function getHttpHandlerListScene(): EmbeddedScene { const httpHandlersTable = PanelBuilders.table() .setTitle('Handlers') .setData(httpHandlerQueriesFiltered) - .setOption('footer', { - enablePagination: true, - }) .setOverrides((b) => b .matchFieldsWithNameByRegex('.*') .overrideFilterable(false) - .matchFieldsWithName('Time') - .overrideCustomFieldConfig('hidden', true) .matchFieldsWithName('Value') .overrideDisplayName('Duration (Avg)') .matchFieldsWithName('handler') diff --git a/packages/scenes-app/src/monitoring-app/traffic.tsx b/packages/scenes-app/src/monitoring-app/traffic.tsx index 9f395c0a0..370d6d671 100644 --- a/packages/scenes-app/src/monitoring-app/traffic.tsx +++ b/packages/scenes-app/src/monitoring-app/traffic.tsx @@ -29,13 +29,10 @@ export function getTrafficScene(): EmbeddedScene { }) ) .setTitle('Handlers') - .setOption('footer', { enablePagination: true }) .setOverrides((b) => b .matchFieldsWithNameByRegex('.*') .overrideFilterable(false) - .matchFieldsWithName('Time') - .overrideCustomFieldConfig('hidden', true) .matchFieldsWithName('Value') .overrideDisplayName('Duration (Avg)') .matchFieldsWithName('handler') @@ -103,7 +100,7 @@ export class HandlerDrilldownViewBehavior extends SceneObjectBase this.setState({ handler: undefined })} /> +