From aee4af21484cea3155bc80f7013022f7fc18ead1 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 25 Apr 2017 15:17:49 +0200 Subject: [PATCH] api: omit unused fields for /api/datasources Fixes #7822 --- pkg/api/datasources.go | 2 +- pkg/api/dtos/models.go | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index ddf8681c3c8..1d99dac3d40 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -20,7 +20,7 @@ func GetDataSources(c *middleware.Context) Response { result := make(dtos.DataSourceList, 0) for _, ds := range query.Result { - dsItem := dtos.DataSource{ + dsItem := dtos.DataSourceListItemDTO{ Id: ds.Id, OrgId: ds.OrgId, Name: ds.Name, diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 564d86a25bf..2d8bdcbae03 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -84,7 +84,23 @@ type DataSource struct { SecureJsonFields map[string]bool `json:"secureJsonFields"` } -type DataSourceList []DataSource +type DataSourceListItemDTO struct { + Id int64 `json:"id"` + OrgId int64 `json:"orgId"` + Name string `json:"name"` + Type string `json:"type"` + TypeLogoUrl string `json:"typeLogoUrl"` + Access m.DsAccess `json:"access"` + Url string `json:"url"` + Password string `json:"password"` + User string `json:"user"` + Database string `json:"database"` + BasicAuth bool `json:"basicAuth"` + IsDefault bool `json:"isDefault"` + JsonData *simplejson.Json `json:"jsonData,omitempty"` +} + +type DataSourceList []DataSourceListItemDTO func (slice DataSourceList) Len() int { return len(slice)