ux(): fixes to cards and sorting plugin list, #4364

This commit is contained in:
Torkel Ödegaard 2016-03-15 15:52:29 +01:00
parent dddd155afa
commit 1abdd170d3
3 changed files with 21 additions and 2 deletions

View File

@ -26,6 +26,20 @@ type PluginListItem struct {
Info *plugins.PluginInfo `json:"info"`
}
type PluginList []PluginListItem
func (slice PluginList) Len() int {
return len(slice)
}
func (slice PluginList) Less(i, j int) bool {
return slice[i].Name < slice[j].Name
}
func (slice PluginList) Swap(i, j int) {
slice[i], slice[j] = slice[j], slice[i]
}
type ImportDashboardCommand struct {
PluginId string `json:"pluginId"`
Path string `json:"path"`

View File

@ -1,6 +1,8 @@
package api
import (
"sort"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
@ -19,7 +21,7 @@ func GetPluginList(c *middleware.Context) Response {
return ApiError(500, "Failed to get list of plugins", err)
}
result := make([]*dtos.PluginListItem, 0)
result := make(dtos.PluginList, 0)
for _, pluginDef := range plugins.Plugins {
// filter out app sub plugins
if embeddedFilter == "0" && pluginDef.IncludedInAppId != "" {
@ -31,7 +33,7 @@ func GetPluginList(c *middleware.Context) Response {
continue
}
listItem := &dtos.PluginListItem{
listItem := dtos.PluginListItem{
Id: pluginDef.Id,
Name: pluginDef.Name,
Type: pluginDef.Type,
@ -58,6 +60,7 @@ func GetPluginList(c *middleware.Context) Response {
result = append(result, listItem)
}
sort.Sort(result)
return Json(200, result)
}

View File

@ -76,6 +76,8 @@
.card-item-figure {
margin: 0 $spacer $spacer 0;
height: 6rem;
img {
width: 6rem;
}