Chore: Remove `navAdminSubsections` toggle (#78179)

* remove navAdminSubsections toggle

* missed one!

docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md

@@ -143,7 +143,6 @@ Experimental features might be changed or removed without prior notice.
 | `formatString`                              | Enable format string transformer                                                                                                                                                                                                                                                  |
 | `transformationsVariableSupport`            | Allows using variables in transformations                                                                                                                                                                                                                                         |
 | `kubernetesPlaylists`                       | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s                                                                                                                                                                                     |
-| `navAdminSubsections`                       | Splits the administration section of the nav tree into subsections                                                                                                                                                                                                                |
 | `recoveryThreshold`                         | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                                                                                                                                                                                          |
 | `lokiStructuredMetadata`                    | Enables the loki data source to request structured metadata from the Loki server                                                                                                                                                                                                  |
 | `teamHttpHeaders`                           | Enables datasources to apply team headers to the client requests                                                                                                                                                                                                                  |

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -136,7 +136,6 @@ export interface FeatureToggles {
   transformationsVariableSupport?: boolean;
   kubernetesPlaylists?: boolean;
   cloudWatchBatchQueries?: boolean;
-  navAdminSubsections?: boolean;
   recoveryThreshold?: boolean;
   lokiStructuredMetadata?: boolean;
   teamHttpHeaders?: boolean;

pkg/api/index.go

@@ -166,7 +166,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 
 	hs.HooksService.RunIndexDataHooks(&data, c)
 
-	data.NavTree.ApplyAdminIA(hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagNavAdminSubsections))
+	data.NavTree.ApplyAdminIA()
 	data.NavTree.Sort()
 
 	return &data, nil

pkg/services/featuremgmt/registry.go

@@ -878,13 +878,6 @@ var (
 			Stage:       FeatureStagePublicPreview,
 			Owner:       awsDatasourcesSquad,
 		},
-		{
-			Name:         "navAdminSubsections",
-			Description:  "Splits the administration section of the nav tree into subsections",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaFrontendPlatformSquad,
-		},
 		{
 			Name:            "recoveryThreshold",
 			Description:     "Enables feature recovery threshold (aka hysteresis) for threshold server-side expression",

pkg/services/featuremgmt/toggles_gen.csv

@@ -117,7 +117,6 @@ formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true
 transformationsVariableSupport,experimental,@grafana/grafana-bi-squad,false,false,false,true
 kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,true,false
 cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false,false
-navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false
 recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false
 lokiStructuredMetadata,experimental,@grafana/observability-logs,false,false,false,false
 teamHttpHeaders,experimental,@grafana/identity-access-team,false,false,false,false

pkg/services/featuremgmt/toggles_gen.go

@@ -479,10 +479,6 @@ const (
 	// Runs CloudWatch metrics queries as separate batches
 	FlagCloudWatchBatchQueries = "cloudWatchBatchQueries"
 
-	// FlagNavAdminSubsections
-	// Splits the administration section of the nav tree into subsections
-	FlagNavAdminSubsections = "navAdminSubsections"
-
 	// FlagRecoveryThreshold
 	// Enables feature recovery threshold (aka hysteresis) for threshold server-side expression
 	FlagRecoveryThreshold = "recoveryThreshold"

pkg/services/navtree/models.go

@@ -120,13 +120,12 @@ func Sort(nodes []*NavLink) {
 	}
 }
 
-func (root *NavTreeRoot) ApplyAdminIA(navAdminSubsectionsEnabled bool) {
+func (root *NavTreeRoot) ApplyAdminIA() {
 	orgAdminNode := root.FindById(NavIDCfg)
 
 	if orgAdminNode != nil {
 		adminNodeLinks := []*NavLink{}
 
-		if navAdminSubsectionsEnabled {
 		generalNodeLinks := []*NavLink{}
 		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading")) // TODO does this even exist
 		generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("licensing"))
@@ -214,29 +213,6 @@ func (root *NavTreeRoot) ApplyAdminIA(navAdminSubsectionsEnabled bool) {
 		if costManagementLogsNode != nil && logVolumeExplorerNode != nil {
 			costManagementLogsNode.Children = append(costManagementLogsNode.Children, logVolumeExplorerNode)
 		}
-		} else {
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("datasources"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugins"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-users"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("teams"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("serviceaccounts"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("apikeys"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("org-settings"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("authentication"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("feature-toggles"))
-
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("upgrading"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("licensing"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("recordedQueries")) // enterprise only
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("correlations"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
-
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("ldap"))
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies
-			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("storage"))
-		}
 
 		if len(adminNodeLinks) > 0 {
 			orgAdminNode.Children = adminNodeLinks

pkg/services/navtree/navtreeimpl/applinks.go

@@ -267,7 +267,7 @@ func (s *ServiceImpl) readNavigationSettings() {
 		"k6-app":                           {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightAlertsAndIncidents + 1, Text: "Performance testing", Icon: "k6"},
 	}
 
-	if s.features.IsEnabledGlobally(featuremgmt.FlagNavAdminSubsections) && s.features.IsEnabledGlobally(featuremgmt.FlagCostManagementUi) {
+	if s.features.IsEnabledGlobally(featuremgmt.FlagCostManagementUi) {
 		// if cost management is enabled we want to nest adaptive metrics and log volume explorer under that plugin
 		// in the admin section
 		s.navigationAppConfig["grafana-adaptive-metrics-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg}