IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Fix some missing pages in admin section (#60143)

Browse Source 
* add stats and licensing under admin -> general when topnav is enabled

* add ldap to users and access

* use ID instead of Id

* add enterprise licensing node
This commit is contained in:
Ashley Harrison 2022-12-12 15:23:49 +00:00 committed by GitHub
parent be57419540
commit 39a4ba4396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/licensing/oss.go
View File

@ -59,7 +59,15 @@ func ProvideService(cfg *setting.Cfg, hooksService *hooks.HooksService) *OSSLice
return return
} }
if adminNode := indexData.NavTree.FindById(navtree.NavIDAdmin); adminNode != nil { var adminNodeID string
if cfg.IsFeatureToggleEnabled("topnav") {
adminNodeID = navtree.NavIDCfg
} else {
adminNodeID = navtree.NavIDAdmin
}
if adminNode := indexData.NavTree.FindById(adminNodeID); adminNode != nil {
adminNode.Children = append(adminNode.Children, &navtree.NavLink{ adminNode.Children = append(adminNode.Children, &navtree.NavLink{
Text: "Stats and license", Text: "Stats and license",
Id: "upgrading", Id: "upgrading",

2
pkg/services/navtree/models.go
View File

@ -185,6 +185,7 @@ func ApplyAdminIA(root *NavTreeRoot) {
accessNodeLinks := []*NavLink{} accessNodeLinks := []*NavLink{}
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading")) generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading"))
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("licensing"))
if orgSettings := root.FindById("org-settings"); orgSettings != nil { if orgSettings := root.FindById("org-settings"); orgSettings != nil {
orgSettings.Text = "Default preferences" orgSettings.Text = "Default preferences"
generalNodeLinks = append(generalNodeLinks, orgSettings) generalNodeLinks = append(generalNodeLinks, orgSettings)
@ -205,6 +206,7 @@ func ApplyAdminIA(root *NavTreeRoot) {
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams")) accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts")) accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys")) accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("apikeys"))
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("ldap"))
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("standalone-plugin-page-/a/grafana-auth-app")) // Cloud Access Policies
generalNode := &NavLink{ generalNode := &NavLink{