Chore: Removes HideAngularDeprecation configuration (#110665)

* Chore: cleans up HideAngularDeprecation

* Trigger build

conf/defaults.ini

@@ -1903,8 +1903,6 @@ public_key_retrieval_disabled = false
 public_key_retrieval_on_startup = false
 # Enter a comma-separated list of plugin identifiers to avoid loading (including core plugins). These plugins will be hidden in the catalog.
 disable_plugins =
-# Comma separated list of plugin ids for which angular deprecation UI should be disabled
-hide_angular_deprecation =
 # Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled.
 forward_host_env_vars =
 # Comma separated list of plugin ids to install as part of the startup process.

pkg/plugins/config/config.go

@@ -24,8 +24,6 @@ type PluginManagementCfg struct {
 	GrafanaAppURL string
 
 	Features Features
-
-	HideAngularDeprecation []string
 }
 
 // Features contains the feature toggles used for the plugin management system.
@@ -42,20 +40,19 @@ type Features struct {
 // NewPluginManagementCfg returns a new PluginManagementCfg.
 func NewPluginManagementCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
 	pluginsCDNURLTemplate string, appURL string, features Features,
-	grafanaComAPIURL string, disablePlugins []string, hideAngularDeprecation []string, forwardHostEnvVars []string, grafanaComAPIToken string,
+	grafanaComAPIURL string, disablePlugins []string, forwardHostEnvVars []string, grafanaComAPIToken string,
 ) *PluginManagementCfg {
 	return &PluginManagementCfg{
-		PluginsPath:            pluginsPath,
-		DevMode:                devMode,
-		PluginSettings:         pluginSettings,
-		PluginsAllowUnsigned:   pluginsAllowUnsigned,
-		DisablePlugins:         disablePlugins,
-		PluginsCDNURLTemplate:  pluginsCDNURLTemplate,
-		GrafanaComAPIURL:       grafanaComAPIURL,
-		GrafanaAppURL:          appURL,
-		Features:               features,
-		HideAngularDeprecation: hideAngularDeprecation,
-		ForwardHostEnvVars:     forwardHostEnvVars,
-		GrafanaComAPIToken:     grafanaComAPIToken,
+		PluginsPath:           pluginsPath,
+		DevMode:               devMode,
+		PluginSettings:        pluginSettings,
+		PluginsAllowUnsigned:  pluginsAllowUnsigned,
+		DisablePlugins:        disablePlugins,
+		PluginsCDNURLTemplate: pluginsCDNURLTemplate,
+		GrafanaComAPIURL:      grafanaComAPIURL,
+		GrafanaAppURL:         appURL,
+		Features:              features,
+		ForwardHostEnvVars:    forwardHostEnvVars,
+		GrafanaComAPIToken:    grafanaComAPIToken,
 	}
 }

pkg/plugins/manager/pipeline/validation/steps.go

@@ -3,7 +3,6 @@ package validation
 import (
 	"context"
 	"errors"
-	"slices"
 	"time"
 
 	"github.com/grafana/grafana/pkg/plugins"
@@ -117,6 +116,5 @@ func (a *AngularDetector) Validate(ctx context.Context, p *plugins.Plugin) error
 			}).WithMessage("angular plugins are not supported")
 		}
 	}
-	p.Angular.HideDeprecation = slices.Contains(a.cfg.HideAngularDeprecation, p.ID)
 	return nil
 }

pkg/plugins/plugins.go

@@ -79,8 +79,7 @@ var (
 )
 
 type AngularMeta struct {
-	Detected        bool `json:"detected"`
-	HideDeprecation bool `json:"hideDeprecation"`
+	Detected bool `json:"detected"`
 }
 
 // JSONData represents the plugin's plugin.json

pkg/services/pluginsintegration/loader/loader_test.go

@@ -1219,38 +1219,6 @@ func TestLoader_Load_Angular(t *testing.T) {
 	}
 }
 
-func TestLoader_HideAngularDeprecation(t *testing.T) {
-	fakePluginSource := &fakes.FakePluginSource{
-		PluginClassFunc: func(ctx context.Context) plugins.Class {
-			return plugins.ClassExternal
-		},
-		DiscoverFunc: sources.NewLocalSource(plugins.ClassExternal, []string{filepath.Join(testDataDir(t), "valid-v2-signature")}).Discover,
-	}
-	for _, tc := range []struct {
-		name string
-		cfg  *config.PluginManagementCfg
-	}{
-		{name: "with plugin id in HideAngularDeprecation list", cfg: &config.PluginManagementCfg{
-			HideAngularDeprecation: []string{"one-app", "two-panel", "test-datasource", "three-datasource"},
-		}},
-		{name: "without plugin id in HideAngularDeprecation list", cfg: &config.PluginManagementCfg{
-			HideAngularDeprecation: []string{"one-app", "two-panel", "three-datasource"},
-		}},
-		{name: "with empty HideAngularDeprecation", cfg: &config.PluginManagementCfg{
-			HideAngularDeprecation: nil,
-		}},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			l := newLoaderWithOpts(t, tc.cfg, loaderDepOpts{
-				angularInspector: angularinspector.AlwaysAngularFakeInspector,
-			})
-			p, err := l.Load(context.Background(), fakePluginSource)
-			require.NoError(t, err)
-			require.Empty(t, p, "plugin shouldn't have been loaded")
-		})
-	}
-}
-
 func TestLoader_Load_NestedPlugins(t *testing.T) {
 	parent := &plugins.Plugin{
 		JSONData: plugins.JSONData{

pkg/services/pluginsintegration/pluginconfig/config.go

@@ -37,7 +37,6 @@ func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Pro
 		},
 		cfg.GrafanaComAPIURL,
 		cfg.DisablePlugins,
-		cfg.HideAngularDeprecation,
 		cfg.ForwardHostEnvVars,
 		cfg.GrafanaComSSOAPIToken,
 	), nil

pkg/setting/setting.go

@@ -205,7 +205,6 @@ type Cfg struct {
 	PluginForcePublicKeyDownload     bool
 	PluginSkipPublicKeyDownload      bool
 	DisablePlugins                   []string
-	HideAngularDeprecation           []string
 	ForwardHostEnvVars               []string
 	PreinstallPluginsAsync           []InstallPlugin
 	PreinstallPluginsSync            []InstallPlugin

pkg/setting/setting_plugins.go

@@ -141,7 +141,6 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
 
 	cfg.PluginsAllowUnsigned = util.SplitString(pluginsSection.Key("allow_loading_unsigned_plugins").MustString(""))
 	cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString(""))
-	cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").MustString(""))
 	cfg.ForwardHostEnvVars = util.SplitString(pluginsSection.Key("forward_host_env_vars").MustString(""))
 	disablePreinstall := pluginsSection.Key("preinstall_disabled").MustBool(false)
 	if !disablePreinstall {

pkg/setting/setting_plugins_test.go

@@ -85,14 +85,10 @@ func Test_readPluginSettings(t *testing.T) {
 				_, err = sec.NewKey("plugin_catalog_hidden_plugins", tc.f("plugin3"))
 				require.NoError(t, err)
 
-				_, err = sec.NewKey("hide_angular_deprecation", tc.f("a", "b", "c"))
-				require.NoError(t, err)
-
 				err = cfg.readPluginSettings(cfg.Raw)
 				require.NoError(t, err)
 				require.Equal(t, []string{"plugin1", "plugin2"}, cfg.DisablePlugins)
 				require.Equal(t, []string{"plugin3", "plugin1", "plugin2"}, cfg.PluginCatalogHiddenPlugins)
-				require.Equal(t, []string{"a", "b", "c"}, cfg.HideAngularDeprecation)
 			})
 		}
 	})

public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.tsx

@@ -204,7 +204,4 @@ const getStyles = (theme: GrafanaTheme2) => ({
     borderTop: 'none',
     flexGrow: 1,
   }),
-  angularDeprecationWrapper: css({
-    padding: theme.spacing(1),
-  }),
 });