diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go index 9193f3d6354..d63dbe3db21 100644 --- a/pkg/api/dtos/frontend_settings.go +++ b/pkg/api/dtos/frontend_settings.go @@ -2,6 +2,7 @@ package dtos import ( "github.com/grafana/grafana-azure-sdk-go/v2/azsettings" + "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/setting" ) @@ -221,29 +222,29 @@ type FrontendSettingsDTO struct { LicenseInfo FrontendSettingsLicenseInfoDTO `json:"licenseInfo"` - FeatureToggles map[string]bool `json:"featureToggles"` - AnonymousEnabled bool `json:"anonymousEnabled"` - AnonymousDeviceLimit int64 `json:"anonymousDeviceLimit"` - RendererAvailable bool `json:"rendererAvailable"` - RendererVersion string `json:"rendererVersion"` - RendererDefaultImageWidth int `json:"rendererDefaultImageWidth"` - RendererDefaultImageHeight int `json:"rendererDefaultImageHeight"` - RendererDefaultImageScale float64 `json:"rendererDefaultImageScale"` - Http2Enabled bool `json:"http2Enabled"` - GrafanaJavascriptAgent setting.GrafanaJavascriptAgent `json:"grafanaJavascriptAgent"` - PluginCatalogURL string `json:"pluginCatalogURL"` - PluginAdminEnabled bool `json:"pluginAdminEnabled"` - PluginAdminExternalManageEnabled bool `json:"pluginAdminExternalManageEnabled"` - PluginCatalogHiddenPlugins []string `json:"pluginCatalogHiddenPlugins"` - PluginCatalogManagedPlugins []string `json:"pluginCatalogManagedPlugins"` - PluginCatalogPreinstalledPlugins []setting.InstallPlugin `json:"pluginCatalogPreinstalledPlugins"` - ExpressionsEnabled bool `json:"expressionsEnabled"` - AwsAllowedAuthProviders []string `json:"awsAllowedAuthProviders"` - AwsAssumeRoleEnabled bool `json:"awsAssumeRoleEnabled"` - SupportBundlesEnabled bool `json:"supportBundlesEnabled"` - SnapshotEnabled bool `json:"snapshotEnabled"` - SecureSocksDSProxyEnabled bool `json:"secureSocksDSProxyEnabled"` - ReportingStaticContext map[string]string `json:"reportingStaticContext"` + FeatureToggles map[string]bool `json:"featureToggles"` + AnonymousEnabled bool `json:"anonymousEnabled"` + AnonymousDeviceLimit int64 `json:"anonymousDeviceLimit"` + RendererAvailable bool `json:"rendererAvailable"` + RendererVersion string `json:"rendererVersion"` + RendererDefaultImageWidth int `json:"rendererDefaultImageWidth"` + RendererDefaultImageHeight int `json:"rendererDefaultImageHeight"` + RendererDefaultImageScale float64 `json:"rendererDefaultImageScale"` + Http2Enabled bool `json:"http2Enabled"` + GrafanaJavascriptAgent setting.GrafanaJavascriptAgent `json:"grafanaJavascriptAgent"` + PluginCatalogURL string `json:"pluginCatalogURL"` + PluginAdminEnabled bool `json:"pluginAdminEnabled"` + PluginAdminExternalManageEnabled bool `json:"pluginAdminExternalManageEnabled"` + PluginCatalogHiddenPlugins []string `json:"pluginCatalogHiddenPlugins"` + PluginCatalogManagedPlugins []string `json:"pluginCatalogManagedPlugins"` + PluginCatalogPreinstalledPlugins []setting.InstallPlugin `json:"pluginCatalogPreinstalledPlugins"` + ExpressionsEnabled bool `json:"expressionsEnabled"` + AwsAllowedAuthProviders []string `json:"awsAllowedAuthProviders"` + AwsAssumeRoleEnabled bool `json:"awsAssumeRoleEnabled"` + SupportBundlesEnabled bool `json:"supportBundlesEnabled"` + SnapshotEnabled bool `json:"snapshotEnabled"` + SecureSocksDSProxyEnabled bool `json:"secureSocksDSProxyEnabled"` + ReportingStaticContext map[string]string `json:"reportingStaticContext"` PluginDependencies map[string][]plugins.Dependency `json:"pluginDependants"` Azure FrontendSettingsAzureDTO `json:"azure"` diff --git a/public/app/features/plugins/admin/helpers.test.ts b/public/app/features/plugins/admin/helpers.test.ts index d59a1b80835..027a623f7cf 100644 --- a/public/app/features/plugins/admin/helpers.test.ts +++ b/public/app/features/plugins/admin/helpers.test.ts @@ -349,6 +349,7 @@ describe('Plugins/Helpers', () => { isFullyInstalled: true, angularDetected: false, url: 'https://github.com/alexanderzobnin/grafana-zabbix', + dependantPlugins: [], }); });