Dashboards: Avoid adding unused revision property (#64362)

This commit is contained in:
Ryan McKinley
2023-03-08 08:26:38 -08:00
committed by GitHub
parent a186f036dd
commit 5f2fecfda7
11 changed files with 7 additions and 14 deletions
@@ -40,8 +40,8 @@ type ImportDashboardResponse struct {
DashboardId int64 `json:"dashboardId"`
FolderId int64 `json:"folderId"`
FolderUID string `json:"folderUid"`
ImportedRevision int64 `json:"importedRevision"`
Revision int64 `json:"revision"`
ImportedRevision int64 `json:"importedRevision,omitempty"` // Only used for plugin imports
Revision int64 `json:"revision,omitempty"` // Only used for plugin imports
Description string `json:"description"`
Path string `json:"path"`
Removed bool `json:"removed"`
@@ -136,17 +136,18 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
return nil, err
}
revision := savedDashboard.Data.Get("revision").MustInt64(0)
return &dashboardimport.ImportDashboardResponse{
UID: savedDashboard.UID,
PluginId: req.PluginId,
Title: savedDashboard.Title,
Path: req.Path,
Revision: savedDashboard.Data.Get("revision").MustInt64(1),
Revision: revision, // only used for plugin version tracking
FolderId: savedDashboard.FolderID,
FolderUID: req.FolderUid,
ImportedUri: "db/" + savedDashboard.Slug,
ImportedUrl: savedDashboard.GetURL(),
ImportedRevision: savedDashboard.Data.Get("revision").MustInt64(1),
ImportedRevision: revision,
Imported: true,
DashboardId: savedDashboard.ID,
Slug: savedDashboard.Slug,