public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Admin: Remove navigation subheaders (#61344)

Browse Source 
* Admin: Remove navigation subheaders

* Admin: Fix tests
This commit is contained in:
Alex Khomenko
2023-01-13 08:32:09 +02:00
committed by GitHub
parent 8e4922f02f
commit 078f2d4481
9 changed files with 17 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/navtree/models.go
+17 -61
View File
@@ -41,9 +41,6 @@ const (
NavIDDashboardsBrowse = "dashboards/browse"
NavIDCfg = "cfg" // NavIDCfg is the id for org configuration navigation node
NavIDAdmin = "admin"
NavIDAdminGeneral = "admin/general"
NavIDAdminPlugins = "admin/plugins"
NavIDAdminAccess = "admin/access"
NavIDAlertsAndIncidents = "alerts-and-incidents"
NavIDAlerting = "alerting"
NavIDMonitoring = "monitoring"
@@ -180,73 +177,32 @@ func ApplyAdminIA(root *NavTreeRoot) {
orgAdminNode.Url = "/admin"
orgAdminNode.Text = "Administration"
generalNodeLinks := []*NavLink{}
pluginsNodeLinks := []*NavLink{}
accessNodeLinks := []*NavLink{}
adminNodeLinks := []*NavLink{}
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("upgrading"))
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("licensing"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("upgrading"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("licensing"))
if orgSettings := root.FindById("org-settings"); orgSettings != nil {
orgSettings.Text = "Default preferences"
generalNodeLinks = append(generalNodeLinks, orgSettings)
adminNodeLinks = append(adminNodeLinks, orgSettings)
}
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("global-orgs"))
generalNodeLinks = AppendIfNotNil(generalNodeLinks, root.FindById("server-settings"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("global-orgs"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("server-settings"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugins"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("datasources"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("correlations"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("recordedQueries")) // enterprise only
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugins"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("datasources"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("correlations"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("recordedQueries")) // enterprise only
if globalUsers := root.FindById("global-users"); globalUsers != nil {
globalUsers.Text = "Users"
accessNodeLinks = append(accessNodeLinks, globalUsers)
adminNodeLinks = append(adminNodeLinks, globalUsers)
}
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("serviceaccounts"))
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
generalNode := &NavLink{
Text: "General",
Id: NavIDAdminGeneral,
Url: "/admin/general",
Icon: "shield",
Children: generalNodeLinks,
}
pluginsNode := &NavLink{
Text: "Plugins and data",
Id: NavIDAdminPlugins,
Url: "/admin/plugins",
Icon: "shield",
Children: pluginsNodeLinks,
}
accessNode := &NavLink{
Text: "Users and access",
Id: NavIDAdminAccess,
Url: "/admin/access",
Icon: "shield",
Children: accessNodeLinks,
}
adminNodeLinks := []*NavLink{}
if len(generalNode.Children) > 0 {
adminNodeLinks = append(adminNodeLinks, generalNode)
}
if len(pluginsNode.Children) > 0 {
adminNodeLinks = append(adminNodeLinks, pluginsNode)
}
if len(accessNode.Children) > 0 {
adminNodeLinks = append(adminNodeLinks, accessNode)
}
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("teams"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("serviceaccounts"))
adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("apikeys"))
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 {
pkg/services/navtree/models_test.go
-3
View File
@@ -44,9 +44,6 @@ func TestNavTreeRoot(t *testing.T) {
treeRoot.RemoveEmptySectionsAndApplyNewInformationArchitecture(true)
require.Equal(t, "Administration", treeRoot.Children[0].Text)
require.Equal(t, NavIDAdminGeneral, treeRoot.Children[0].Children[0].Id)
require.Equal(t, NavIDAdminPlugins, treeRoot.Children[0].Children[1].Id)
require.Equal(t, NavIDAdminAccess, treeRoot.Children[0].Children[2].Id)
})
t.Run("Should move reports into Dashboards", func(t *testing.T) {