From 82e6fdfaf9e63e5e67ee1ca48fbb13200f2b0e82 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 23 Nov 2022 11:15:43 +0100 Subject: [PATCH] [v9.3.x] Navigation: use correct id to find cloud access policies page (#59187) Navigation: use correct id to find cloud access policies page (#59123) use correct id to find cloud access policies page (cherry picked from commit 8761a71da2746f681faf51ba163d00f9299312c0) Co-authored-by: Ashley Harrison --- pkg/services/navtree/models.go | 2 +- pkg/services/navtree/navtreeimpl/applinks.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go index 0ff907e17fa..e73929d123a 100644 --- a/pkg/services/navtree/models.go +++ b/pkg/services/navtree/models.go @@ -206,7 +206,7 @@ func ApplyAdminIA(root *NavTreeRoot) { accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams")) accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts")) accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys")) - accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("plugin-page-grafana-auth-app")) // Cloud Access Policies + accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies generalNode := &NavLink{ Text: "General", diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go index 40f2692cc34..f34121eddc7 100644 --- a/pkg/services/navtree/navtreeimpl/applinks.go +++ b/pkg/services/navtree/navtreeimpl/applinks.go @@ -244,7 +244,6 @@ func (s *ServiceImpl) readNavigationSettings() { "grafana-incident-app": {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incident"}, "grafana-ml-app": {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"}, "grafana-cloud-link-app": {SectionID: navtree.NavIDCfg}, - "grafana-auth-app": {SectionID: navtree.NavIDCfg}, "grafana-easystart-app": {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightSavedItems + 1, Text: "Connections"}, }