From e420252d45cd48fdcf5cc68ad84f89e36d5c936c Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 26 Apr 2022 11:27:01 +0100
Subject: [PATCH] move saved items feature behind separate feature toggle
 (#48117)

---
 packages/grafana-data/src/types/featureToggles.gen.ts | 1 +
 pkg/api/index.go                                      | 2 +-
 pkg/services/featuremgmt/registry.go                  | 5 +++++
 pkg/services/featuremgmt/toggles_gen.go               | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index e2bdfadde9d..acc2a12fa63 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -56,4 +56,5 @@ export interface FeatureToggles {
   explore2Dashboard?: boolean;
   persistNotifications?: boolean;
   commandPalette?: boolean;
+  savedItems?: boolean;
 }
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 42c0c18948c..e0f0707ea26 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -172,7 +172,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool, prefs *
 	hasAccess := ac.HasAccess(hs.AccessControl, c)
 	navTree := []*dtos.NavLink{}
 
-	if hs.Features.IsEnabled(featuremgmt.FlagNewNavigation) {
+	if hs.Features.IsEnabled(featuremgmt.FlagSavedItems) {
 		savedItemsLinks, err := hs.buildSavedItemsNavLinks(c, prefs)
 		if err != nil {
 			return nil, err
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1266e6f75f1..12871130853 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -226,5 +226,10 @@ var (
 			Description: "Enable command palette",
 			State:       FeatureStateAlpha,
 		},
+		{
+			Name:        "savedItems",
+			Description: "Enable Saved Items in the navbar.",
+			State:       FeatureStateAlpha,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 1966db6a137..3b9b0e59a67 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -166,4 +166,8 @@ const (
 	// FlagCommandPalette
 	// Enable command palette
 	FlagCommandPalette = "commandPalette"
+
+	// FlagSavedItems
+	// Enable Saved Items in the navbar.
+	FlagSavedItems = "savedItems"
 )