diff --git a/package.json b/package.json index b46c9f643be..54bdf49ae1c 100644 --- a/package.json +++ b/package.json @@ -254,7 +254,7 @@ "@grafana/prometheus": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/saga-icons": "workspace:*", - "@grafana/scenes": "^4.12.0", + "@grafana/scenes": "^4.14.0", "@grafana/schema": "workspace:*", "@grafana/sql": "workspace:*", "@grafana/ui": "workspace:*", diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts index b94b3f7e2aa..dbbf225c129 100644 --- a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts +++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts @@ -160,6 +160,7 @@ export function getAdHocFilterVariableFor(scene: DashboardScene, ds: DataSourceR const newVariable = new AdHocFiltersVariable({ name: 'Filters', datasource: ds, + useQueriesAsFilterForOptions: true, }); // Add it to the scene diff --git a/yarn.lock b/yarn.lock index 69bcb20ab82..be039e9343c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -133,27 +133,27 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2": - version: 7.24.1 - resolution: "@babel/generator@npm:7.24.1" +"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2": + version: 7.24.4 + resolution: "@babel/generator@npm:7.24.4" dependencies: "@babel/types": "npm:^7.24.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/c6160e9cd63d7ed7168dee27d827f9c46fab820c45861a5df56cd5c78047f7c3fc97c341e9ccfa1a6f97c87ec2563d9903380b5f92794e3540a6c5f99eb8f075 + checksum: 10/69e1772dcf8f95baec951f422cca091d59a3f29b5eedc989ad87f7262289b94625983f6fe654302ca17aae0a32f9232332b83fcc85533311d6267b09c58b1061 languageName: node linkType: hard -"@babel/generator@npm:^7.24.4": - version: 7.24.4 - resolution: "@babel/generator@npm:7.24.4" +"@babel/generator@npm:^7.23.0": + version: 7.24.1 + resolution: "@babel/generator@npm:7.24.1" dependencies: "@babel/types": "npm:^7.24.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/69e1772dcf8f95baec951f422cca091d59a3f29b5eedc989ad87f7262289b94625983f6fe654302ca17aae0a32f9232332b83fcc85533311d6267b09c58b1061 + checksum: 10/c6160e9cd63d7ed7168dee27d827f9c46fab820c45861a5df56cd5c78047f7c3fc97c341e9ccfa1a6f97c87ec2563d9903380b5f92794e3540a6c5f99eb8f075 languageName: node linkType: hard @@ -3964,17 +3964,6 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:10.3.3": - version: 10.3.3 - resolution: "@grafana/e2e-selectors@npm:10.3.3" - dependencies: - "@grafana/tsconfig": "npm:^1.2.0-rc1" - tslib: "npm:2.6.0" - typescript: "npm:5.2.2" - checksum: 10/11fcbf80d61d30a1ab5a99a6c24c5044c187bf6bb52c5d0a1c99b46ed6b28ea5865ff0b9fdfc66c22a744ba5fe9ea2f5030256d952f3b76302cc8cb8ffc01a73 - languageName: node - linkType: hard - "@grafana/e2e-selectors@npm:11.0.0, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": version: 0.0.0-use.local resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors" @@ -3993,6 +3982,17 @@ __metadata: languageName: unknown linkType: soft +"@grafana/e2e-selectors@npm:^10.4.1": + version: 10.4.2 + resolution: "@grafana/e2e-selectors@npm:10.4.2" + dependencies: + "@grafana/tsconfig": "npm:^1.2.0-rc1" + tslib: "npm:2.6.2" + typescript: "npm:5.3.3" + checksum: 10/a8eb622ff0137eb759cead6d7cc81c1fc9e00a6666655cf3043ea8ba23aada8e1148810471ac92911b412854028a527fd75be7a9519e4fa7826a111c555b5ffb + languageName: node + linkType: hard + "@grafana/e2e@npm:11.0.0, @grafana/e2e@workspace:packages/grafana-e2e": version: 0.0.0-use.local resolution: "@grafana/e2e@workspace:packages/grafana-e2e" @@ -4492,23 +4492,23 @@ __metadata: languageName: unknown linkType: soft -"@grafana/scenes@npm:^4.12.0": - version: 4.12.0 - resolution: "@grafana/scenes@npm:4.12.0" +"@grafana/scenes@npm:^4.14.0": + version: 4.14.0 + resolution: "@grafana/scenes@npm:4.14.0" dependencies: - "@grafana/e2e-selectors": "npm:10.3.3" + "@grafana/e2e-selectors": "npm:^10.4.1" react-grid-layout: "npm:1.3.4" react-use: "npm:17.4.0" react-virtualized-auto-sizer: "npm:1.0.7" uuid: "npm:^9.0.0" peerDependencies: - "@grafana/data": ^10.0.3 - "@grafana/runtime": ^10.0.3 - "@grafana/schema": ^10.0.3 - "@grafana/ui": ^10.0.3 + "@grafana/data": ^10.4.1 + "@grafana/runtime": ^10.4.1 + "@grafana/schema": ^10.4.1 + "@grafana/ui": ^10.4.1 react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10/d59564176f432e947d88e1c25dc901dd424aa61b4a0fa91b5f30704ec1da698b0c67b3c0a79caf112df83a0b84b583a8732d157a7eec87cd43cdbb4949007d3f + checksum: 10/f8b5dc7e8b6aa5c7fa96d0b579292822ce1cbe274af6b9af7221660c3c960897a9744e2eaa1847ae0381cac72f8250e6e95a881a387fe42f8eeaebdd0241031e languageName: node linkType: hard @@ -19061,7 +19061,7 @@ __metadata: "@grafana/prometheus": "workspace:*" "@grafana/runtime": "workspace:*" "@grafana/saga-icons": "workspace:*" - "@grafana/scenes": "npm:^4.12.0" + "@grafana/scenes": "npm:^4.14.0" "@grafana/schema": "workspace:*" "@grafana/sql": "workspace:*" "@grafana/tsconfig": "npm:^1.3.0-rc1"