Navigation: Fixed double settings menus (#18349)

pkg/api/index.go

@@ -242,92 +242,68 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		}
 	}
 
-	if c.IsGrafanaAdmin || c.OrgRole == m.ROLE_ADMIN {
+	configNodes := []*dtos.NavLink{}
-		cfgNode := &dtos.NavLink{
+
-			Id:       "cfg",
+	if c.OrgRole == m.ROLE_ADMIN {
-			Text:     "Configuration",
+		configNodes = append(configNodes, &dtos.NavLink{
-			SubTitle: "Organization: " + c.OrgName,
-			Icon:     "gicon gicon-cog",
-			Url:      setting.AppSubUrl + "/datasources",
-			Children: []*dtos.NavLink{
-				{
 			Text:        "Data Sources",
 			Icon:        "gicon gicon-datasources",
 			Description: "Add and configure data sources",
 			Id:          "datasources",
 			Url:         setting.AppSubUrl + "/datasources",
-				},
+		})
-				{
+		configNodes = append(configNodes, &dtos.NavLink{
 			Text:        "Users",
 			Id:          "users",
 			Description: "Manage org members",
 			Icon:        "gicon gicon-user",
 			Url:         setting.AppSubUrl + "/org/users",
-				},
+		})
-				{
+	}
+
+	if c.OrgRole == m.ROLE_ADMIN || hs.Cfg.EditorsCanAdmin {
+		configNodes = append(configNodes, &dtos.NavLink{
 			Text:        "Teams",
 			Id:          "teams",
 			Description: "Manage org groups",
 			Icon:        "gicon gicon-team",
 			Url:         setting.AppSubUrl + "/org/teams",
-				},
+		})
-				{
+	}
+
+	configNodes = append(configNodes, &dtos.NavLink{
 		Text:        "Plugins",
 		Id:          "plugins",
 		Description: "View and configure plugins",
 		Icon:        "gicon gicon-plugins",
 		Url:         setting.AppSubUrl + "/plugins",
-				},
+	})
-				{
+
+	if c.OrgRole == m.ROLE_ADMIN {
+		configNodes = append(configNodes, &dtos.NavLink{
 			Text:        "Preferences",
 			Id:          "org-settings",
 			Description: "Organization preferences",
 			Icon:        "gicon gicon-preferences",
 			Url:         setting.AppSubUrl + "/org",
-				},
+		})
-
+		configNodes = append(configNodes, &dtos.NavLink{
-				{
 			Text:        "API Keys",
 			Id:          "apikeys",
 			Description: "Create & manage API keys",
 			Icon:        "gicon gicon-apikeys",
 			Url:         setting.AppSubUrl + "/org/apikeys",
-				},
+		})
-			},
 	}
 
-		if c.OrgRole != m.ROLE_ADMIN {
+	data.NavTree = append(data.NavTree, &dtos.NavLink{
-			cfgNode = &dtos.NavLink{
 		Id:       "cfg",
 		Text:     "Configuration",
 		SubTitle: "Organization: " + c.OrgName,
 		Icon:     "gicon gicon-cog",
-				Url:      setting.AppSubUrl + "/admin/users",
+		Url:      configNodes[0].Url,
-				Children: make([]*dtos.NavLink, 0),
+		Children: configNodes,
-			}
+	})
-		}
-
-		data.NavTree = append(data.NavTree, cfgNode)
-	} else {
-		cfgNode := &dtos.NavLink{
-			Id:       "cfg",
-			Text:     "Configuration",
-			SubTitle: "Organization: " + c.OrgName,
-			Icon:     "gicon gicon-cog",
-			Url:      setting.AppSubUrl + "/plugins",
-			Children: []*dtos.NavLink{
-				{
-					Text:        "Plugins",
-					Id:          "plugins",
-					Description: "View and configure plugins",
-					Icon:        "gicon gicon-plugins",
-					Url:         setting.AppSubUrl + "/plugins",
-				},
-			},
-		}
-
-		data.NavTree = append(data.NavTree, cfgNode)
-	}
 
 	if c.IsGrafanaAdmin {
 		data.NavTree = append(data.NavTree, &dtos.NavLink{
@@ -346,27 +322,6 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		})
 	}
 
-	if (c.OrgRole == m.ROLE_EDITOR || c.OrgRole == m.ROLE_VIEWER) && hs.Cfg.EditorsCanAdmin {
-		cfgNode := &dtos.NavLink{
-			Id:       "cfg",
-			Text:     "Configuration",
-			SubTitle: "Organization: " + c.OrgName,
-			Icon:     "gicon gicon-cog",
-			Url:      setting.AppSubUrl + "/org/teams",
-			Children: []*dtos.NavLink{
-				{
-					Text:        "Teams",
-					Id:          "teams",
-					Description: "Manage org groups",
-					Icon:        "gicon gicon-team",
-					Url:         setting.AppSubUrl + "/org/teams",
-				},
-			},
-		}
-
-		data.NavTree = append(data.NavTree, cfgNode)
-	}
-
 	data.NavTree = append(data.NavTree, &dtos.NavLink{
 		Text:         "Help",
 		SubTitle:     fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit),