opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 15:18:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

dashboards: extract short uid generator to util package. #7883

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-01-29 18:52:19 +01:00
parent fc7bab8bf0
commit e229f8aea8
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/models/dashboards.go
View File

@ -7,7 +7,7 @@ import (
"github.com/gosimple/slug"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/teris-io/shortid"
"github.com/grafana/grafana/pkg/util"
)
// Typed errors
@ -63,7 +63,7 @@ type Dashboard struct {
// NewDashboard creates a new dashboard
func NewDashboard(title string) *Dashboard {
dash := &Dashboard{}
dash.Uid = DashboardUid()
dash.Uid, _ = util.GenerateShortUid()
dash.Data = simplejson.New()
dash.Data.Set("title", title)
dash.Title = title
@ -113,18 +113,12 @@ func NewDashboardFromJson(data *simplejson.Json) *Dashboard {
if uid, err := dash.Data.Get("uid").String(); err == nil {
dash.Uid = uid
} else {
dash.Uid = DashboardUid()
dash.Uid, _ = util.GenerateShortUid()
}
return dash
}
func DashboardUid() string {
gen, _ := shortid.New(1, shortid.DefaultABC, 1)
uid, _ := gen.Generate()
return uid
}
// GetDashboardModel turns the command into the savable model
func (cmd *SaveDashboardCommand) GetDashboardModel() *Dashboard {
dash := NewDashboardFromJson(cmd.Dashboard)