Make frontend-service settings overwrite those that come from /bootdata (#112268)

2025-10-10 14:11:37 +00:00
parent 5e8267fcf8
commit c9fafc270e
3 changed files with 50 additions and 3 deletions
@@ -261,7 +261,11 @@
          // tenant-specific config
          // TODO split this into separate API calls
          const { navTree, settings, user } = await loadBootData();
-          window.grafanaBootData.settings = settings;
+
+          window.grafanaBootData.settings = {
+            ...settings,
+            ...window.grafanaBootData.settings, // preserve frontend-service settings
+          }
          window.grafanaBootData.navTree = navTree;
          window.grafanaBootData.user = user;