opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 09:32:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

frontend for trim/apply defaults and some bug fixing (#33561)

Browse Source 
* remove empty object and workaround on list

* frontend

* add toggle on frontend
This commit is contained in:
ying-jeanne
2021-05-04 15:03:42 +08:00
committed by GitHub
parent 7ccc0e838e
commit 22b2d3c38a
8 changed files with 167 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/plugins.go
View File

@ -206,10 +206,19 @@ func (hs *HTTPServer) GetPluginMarkdown(c *models.ReqContext) response.Response
}
func (hs *HTTPServer) ImportDashboard(c *models.ReqContext, apiCmd dtos.ImportDashboardCommand) response.Response {
var err error
if apiCmd.PluginId == "" && apiCmd.Dashboard == nil {
return response.Error(422, "Dashboard must be set", nil)
}
trimDefaults := c.QueryBoolWithDefault("trimdefaults", true)
if trimDefaults && !hs.LoadSchemaService.IsDisabled() {
apiCmd.Dashboard, err = hs.LoadSchemaService.DashboardApplyDefaults(apiCmd.Dashboard)
if err != nil {
return response.Error(500, "Error while applying default value to the dashboard json", err)
}
}
dashInfo, err := hs.PluginManager.ImportDashboard(apiCmd.PluginId, apiCmd.Path, c.OrgId, apiCmd.FolderId,
apiCmd.Dashboard, apiCmd.Overwrite, apiCmd.Inputs, c.SignedInUser, hs.DataService)
if err != nil {