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

Refactoring dashboard data access

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-12-22 12:25:08 +01:00
parent 22bf20a135
commit a55a606a55
6 changed files with 99 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/api/api_dashboard.go
View File

@@ -1,16 +1,16 @@
package api
import (
"github.com/torkelo/grafana-pro/pkg/api/dtos"
"github.com/torkelo/grafana-pro/pkg/bus"
"github.com/torkelo/grafana-pro/pkg/middleware"
"github.com/torkelo/grafana-pro/pkg/models"
m "github.com/torkelo/grafana-pro/pkg/models"
"github.com/torkelo/grafana-pro/pkg/utils"
)
func GetDashboard(c *middleware.Context) {
slug := c.Params(":slug")
dash, err := models.GetDashboard(slug, c.GetAccountId())
dash, err := m.GetDashboard(slug, c.GetAccountId())
if err != nil {
c.JsonApiErr(404, "Dashboard not found", nil)
return
@@ -24,13 +24,13 @@ func GetDashboard(c *middleware.Context) {
func DeleteDashboard(c *middleware.Context) {
slug := c.Params(":slug")
dash, err := models.GetDashboard(slug, c.GetAccountId())
dash, err := m.GetDashboard(slug, c.GetAccountId())
if err != nil {
c.JsonApiErr(404, "Dashboard not found", nil)
return
}
err = models.DeleteDashboard(slug, c.GetAccountId())
err = m.DeleteDashboard(slug, c.GetAccountId())
if err != nil {
c.JsonApiErr(500, "Failed to delete dashboard", err)
return
@@ -44,7 +44,7 @@ func DeleteDashboard(c *middleware.Context) {
func Search(c *middleware.Context) {
query := c.Query("q")
results, err := models.SearchQuery(query, c.GetAccountId())
results, err := m.SearchQuery(query, c.GetAccountId())
if err != nil {
c.JsonApiErr(500, "Search failed", err)
return
@@ -53,39 +53,21 @@ func Search(c *middleware.Context) {
c.JSON(200, results)
}
func convertToStringArray(arr []interface{}) []string {
b := make([]string, len(arr))
for i := range arr {
b[i] = arr[i].(string)
}
return b
}
func PostDashboard(c *middleware.Context) {
var command dtos.SaveDashboardCommand
var cmd m.SaveDashboardCommand
if !c.JsonBody(&command) {
if !c.JsonBody(&cmd) {
c.JsonApiErr(400, "bad request", nil)
return
}
dashboard := models.NewDashboard("test")
dashboard.Data = command.Dashboard
dashboard.Title = dashboard.Data["title"].(string)
dashboard.AccountId = c.GetAccountId()
dashboard.Tags = convertToStringArray(dashboard.Data["tags"].([]interface{}))
dashboard.UpdateSlug()
cmd.AccountId = c.GetAccountId()
if dashboard.Data["id"] != nil {
dashboard.Id = int64(dashboard.Data["id"].(float64))
}
err := models.SaveDashboard(dashboard)
err := bus.Dispatch(cmd)
if err != nil {
c.JsonApiErr(500, "Failed to save dashboard", err)
return
}
c.JSON(200, utils.DynMap{"status": "success", "slug": dashboard.Slug})
c.JSON(200, utils.DynMap{"status": "success", "slug": cmd.Result.Slug})
}

11
pkg/api/dtos/commands.go
View File

@@ -1,11 +0,0 @@
package dtos
type AddCollaboratorCommand struct {
Email string `json:"email" binding:"required"`
}
type SaveDashboardCommand struct {
Id string `json:"id"`
Title string `json:"title"`
Dashboard map[string]interface{} `json:"dashboard"`
}