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

Pick changes from PR 33811, use UID in dashboard navlinks (#36899)

Browse Source 
* pick changes from PR 33811, use UID in dashboard navlinks

* use proper spelling for UID

* add uid to the plugin schema

* Update docs/sources/developers/plugins/plugin.schema.json

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
This commit is contained in:
Serge Zaitsev
2021-07-22 09:11:33 +02:00
committed by GitHub
parent 3004a650b5
commit 9f36e36c89
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/developers/plugins/plugin.schema.json
View File

@@ -62,6 +62,10 @@
"type": "object", "type": "object",
"additionalItems": false, "additionalItems": false,
"properties": { "properties": {
"uid": {
"type": "string",
"description": "Unique identifier of the included resource"
},
"type": { "type": {
"type": "string", "type": "string",
"enum": ["dashboard", "page", "panel", "datasource"] "enum": ["dashboard", "page", "panel", "datasource"]

2
pkg/api/index.go
View File

@@ -110,7 +110,7 @@ func (hs *HTTPServer) getAppLinks(c *models.ReqContext) ([]*dtos.NavLink, error)
if include.Type == "dashboard" && include.AddToNav { if include.Type == "dashboard" && include.AddToNav {
link := &dtos.NavLink{ link := &dtos.NavLink{
Url: hs.Cfg.AppSubURL + "/dashboard/db/" + include.Slug, Url: hs.Cfg.AppSubURL + include.GetSlugOrUIDLink(),
Text: include.Name, Text: include.Name,
} }
appLink.Children = append(appLink.Children, link) appLink.Children = append(appLink.Children, link)

2
pkg/plugins/app_plugin.go
View File

@@ -117,7 +117,7 @@ func (app *AppPlugin) InitApp(panels map[string]*PanelPlugin, dataSources map[st
app.DefaultNavUrl = cfg.AppSubURL + "/plugins/" + app.Id + "/page/" + include.Slug app.DefaultNavUrl = cfg.AppSubURL + "/plugins/" + app.Id + "/page/" + include.Slug
} }
if include.Type == "dashboard" && include.DefaultNav { if include.Type == "dashboard" && include.DefaultNav {
app.DefaultNavUrl = cfg.AppSubURL + "/dashboard/db/" + include.Slug app.DefaultNavUrl = cfg.AppSubURL + include.GetSlugOrUIDLink()
} }
} }

9
pkg/plugins/models.go
View File

@@ -95,10 +95,19 @@ type PluginInclude struct {
DefaultNav bool `json:"defaultNav"` DefaultNav bool `json:"defaultNav"`
Slug string `json:"slug"` Slug string `json:"slug"`
Icon string `json:"icon"` Icon string `json:"icon"`
UID string `json:"uid"`
Id string `json:"-"` Id string `json:"-"`
} }
func (e PluginInclude) GetSlugOrUIDLink() string {
if len(e.UID) > 0 {
return "/d/" + e.UID
} else {
return "/dashboard/db/" + e.Slug
}
}
type PluginDependencyItem struct { type PluginDependencyItem struct {
Type string `json:"type"` Type string `json:"type"`
Id string `json:"id"` Id string `json:"id"`