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

Admin: Combine org and admin user pages (#59365)

Browse Source 
* Admin: Add unified users page

* Admin: Combine admin and org components

* Admin: Add combined route

* Admin: Show combined page in nav

* Admin: Update translation

* Admin: Update description

* Admin: Update description on backend

* Admin: Update translations

* Admin: Use dynamic imports
This commit is contained in:
Alex Khomenko
2022-11-30 15:24:53 +02:00
committed by GitHub
parent 32a498e04f
commit c3d13a0e2f
12 changed files with 207 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/navtree/models.go
+1 -2
View File
@@ -198,9 +198,8 @@ func ApplyAdminIA(root *NavTreeRoot) {
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("plugin-page-grafana-cloud-link-app"))
pluginsNodeLinks = AppendIfNotNil(pluginsNodeLinks, root.FindById("recordedQueries")) // enterprise only
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("users"))
if globalUsers := root.FindById("global-users"); globalUsers != nil {
globalUsers.Text = "Users (All orgs)"
globalUsers.Text = "Users"
accessNodeLinks = append(accessNodeLinks, globalUsers)
}
accessNodeLinks = AppendIfNotNil(accessNodeLinks, root.FindById("teams"))