From 3aba08f708d72acb2218b966946b275aa8b9c3e1 Mon Sep 17 00:00:00 2001 From: Kevin Minehart Date: Wed, 26 May 2021 12:27:28 -0500 Subject: [PATCH] hide caching settings when its disabled (#34756) --- packages/grafana-runtime/src/config.ts | 3 +++ pkg/api/frontendsettings.go | 3 +++ public/app/features/datasources/state/navModel.ts | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts index d1306c1fc35..032df34f46c 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -83,6 +83,9 @@ export class GrafanaBootConfig implements GrafanaConfig { azure: AzureSettings = { managedIdentityEnabled: false, }; + caching = { + enabled: false, + }; constructor(options: GrafanaBootConfig) { const mode = options.bootData.user.lightTheme ? 'light' : 'dark'; diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index c430e75b9c7..649dbd018ee 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -255,6 +255,9 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i "cloud": hs.Cfg.Azure.Cloud, "managedIdentityEnabled": hs.Cfg.Azure.ManagedIdentityEnabled, }, + "caching": map[string]bool{ + "enabled": hs.Cfg.SectionWithEnvOverrides("caching").Key("enabled").MustBool(true), + }, } return jsonObj, nil diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts index 28471d50eb7..6c10870693d 100644 --- a/public/app/features/datasources/state/navModel.ts +++ b/public/app/features/datasources/state/navModel.ts @@ -68,7 +68,7 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat id: `datasource-cache-${dataSource.id}`, text: 'Cache', url: `datasources/edit/${dataSource.id}/cache`, - hideFromTabs: !pluginMeta.isBackend, + hideFromTabs: !pluginMeta.isBackend || !config.caching.enabled, }); }