IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Scenes: support interpolations in TemplateSrv.replace (#86990)

Browse Source 
TemplateSrv.replace takes an optional 'interpolations' argument which
records information about the variables which were found during the
interpolation. Until [this Scenes PR][scenes PR] this wasn't supported
by Scenes so the interpolations argument was being ignored if dashboard
scenes were enabled. This commit bumps the scenes version and passes
the interpolations array along to the scenes function.

[scenes PR]: https://github.com/grafana/scenes/pull/708
This commit is contained in:
Ben Sully 2024-04-26 16:44:36 +01:00 committed by GitHub
parent 9af4607e78
commit f2ca115913
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -252,7 +252,7 @@
"@grafana/prometheus": "workspace:*",
"@grafana/runtime": "workspace:*",
"@grafana/saga-icons": "workspace:*",
"@grafana/scenes": "^4.12.0",
"@grafana/scenes": "^4.13.0",
"@grafana/schema": "workspace:*",
"@grafana/sql": "workspace:*",
"@grafana/ui": "workspace:*",

6
public/app/features/templating/template_srv.ts
View File

@ -253,7 +253,8 @@ export class TemplateSrv implements BaseTemplateSrv {
scopedVars.__sceneObject.value,
target,
scopedVars,
format as string | VariableCustomFormatterFn | undefined
format as string | VariableCustomFormatterFn | undefined,
interpolations
);
}
@ -263,7 +264,8 @@ export class TemplateSrv implements BaseTemplateSrv {
window.__grafanaSceneContext,
target,
scopedVars,
format as string | VariableCustomFormatterFn | undefined
format as string | VariableCustomFormatterFn | undefined,
interpolations
);
}

10
yarn.lock
View File

@ -3796,9 +3796,9 @@ __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.13.0":
version: 4.13.0
resolution: "@grafana/scenes@npm:4.13.0"
dependencies:
"@grafana/e2e-selectors": "npm:10.3.3"
react-grid-layout: "npm:1.3.4"
@ -3812,7 +3812,7 @@ __metadata:
"@grafana/ui": ^10.0.3
react: ^18.0.0
react-dom: ^18.0.0
checksum: 10/d59564176f432e947d88e1c25dc901dd424aa61b4a0fa91b5f30704ec1da698b0c67b3c0a79caf112df83a0b84b583a8732d157a7eec87cd43cdbb4949007d3f
checksum: 10/2785516164ff557b325b7425861f2aee895656ae635d9e9e6b9c882229f75ea19fa0f9402d4e827efcc46103918aa130f236ec850913e56dadc06f1ffeefb1f9
languageName: node
linkType: hard
@ -17879,7 +17879,7 @@ __metadata:
"@grafana/prometheus": "workspace:*"
"@grafana/runtime": "workspace:*"
"@grafana/saga-icons": "workspace:*"
"@grafana/scenes": "npm:^4.12.0"
"@grafana/scenes": "npm:^4.13.0"
"@grafana/schema": "workspace:*"
"@grafana/sql": "workspace:*"
"@grafana/tsconfig": "npm:^1.3.0-rc1"