public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FS: Preserve buildInfo.edition from backend (#113967)

Browse Source
This commit is contained in:
Josh Hunt
2025-11-17 11:32:16 +00:00
committed by GitHub
parent d0fe342cfe
commit aa26cc4254
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/frontend/index.html
+8 -3
View File
@@ -288,16 +288,21 @@
user: [[.DefaultUser]],
}
// tenant-specific config
// TODO split this into separate API calls
// Preserve a mix of values from the initial boot data, and from the backend
// - nav tree and user info come from the backend
// - merge settings from both. FS settings contains less values
// - build info edition comes from the backend
const { navTree, settings, user } = await loadBootData();
window.grafanaBootData.settings = {
...settings,
...window.grafanaBootData.settings, // preserve frontend-service settings
...window.grafanaBootData.settings,
}
window.grafanaBootData.navTree = navTree;
window.grafanaBootData.user = user;
if (settings?.buildInfo?.edition) {
window.grafanaBootData.settings.buildInfo.edition = settings.buildInfo.edition;
}
// The per-theme CSS still contains some global styles needed
// to render the page correctly.