public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
co-authored by achatterjee-grafana
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
pkg/plugins/app_plugin.go
+1 -1
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
}
if include.Type == "dashboard" && include.DefaultNav {
app.DefaultNavUrl = cfg.AppSubURL + "/dashboard/db/" + include.Slug
app.DefaultNavUrl = cfg.AppSubURL + include.GetSlugOrUIDLink()
}
}
pkg/plugins/models.go
+9
View File
@@ -95,10 +95,19 @@ type PluginInclude struct {
DefaultNav bool `json:"defaultNav"`
Slug string `json:"slug"`
Icon string `json:"icon"`
UID string `json:"uid"`
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 string `json:"type"`
Id string `json:"id"`