refactoring: moved dashboard history item formating (message) and fixed dashboard history migration issue, and removed from frontend tests that where no longer needed

pkg/api/dashboard.go

@@ -276,6 +276,22 @@ func GetDashboardVersions(c *middleware.Context) Response {
 		return ApiError(404, fmt.Sprintf("No versions found for dashboardId %d", dashboardId), err)
 	}
 
+	for _, version := range query.Result {
+		if version.RestoredFrom == version.Version {
+			version.Message = "Initial save (created migration)"
+			continue
+		}
+
+		if version.RestoredFrom > 0 {
+			version.Message = fmt.Sprintf("Restored from version %d", version.RestoredFrom)
+			continue
+		}
+
+		if version.ParentVersion == 0 {
+			version.Message = "Initial save"
+		}
+	}
+
 	return Json(200, query.Result)
 }
 
@@ -417,11 +433,12 @@ func RestoreDashboardVersion(c *middleware.Context, apiCmd dtos.RestoreDashboard
 	version := versionQuery.Result
 
 	saveCmd := m.SaveDashboardCommand{}
+	saveCmd.RestoredFrom = version.Version
 	saveCmd.OrgId = c.OrgId
 	saveCmd.UserId = c.UserId
 	saveCmd.Dashboard = version.Data
 	saveCmd.Dashboard.Set("version", dashboard.Version)
-	saveCmd.Message = fmt.Sprintf("Dashboard restored from version %d", version.Version)
+	saveCmd.Message = fmt.Sprintf("Restored from version %d", version.Version)
 
 	return PostDashboard(c, saveCmd)
 }

pkg/models/dashboards.go

@@ -131,12 +131,13 @@ func (dash *Dashboard) UpdateSlug() {
 //
 
 type SaveDashboardCommand struct {
-	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
-	UserId    int64            `json:"userId"`
-	OrgId     int64            `json:"-"`
-	Overwrite bool             `json:"overwrite"`
-	PluginId  string           `json:"-"`
-	Message   string           `json:"message"`
+	Dashboard    *simplejson.Json `json:"dashboard" binding:"Required"`
+	UserId       int64            `json:"userId"`
+	Overwrite    bool             `json:"overwrite"`
+	Message      string           `json:"message"`
+	OrgId        int64            `json:"-"`
+	RestoredFrom int              `json:"-"`
+	PluginId     string           `json:"-"`
 
 	Result *Dashboard
 }

pkg/services/sqlstore/dashboard.go

@@ -93,7 +93,7 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error {
 		dashVersion := &m.DashboardVersion{
 			DashboardId:   dash.Id,
 			ParentVersion: parentVersion,
-			RestoredFrom:  -1,
+			RestoredFrom:  cmd.RestoredFrom,
 			Version:       dash.Version,
 			Created:       time.Now(),
 			CreatedBy:     dash.UpdatedBy,

pkg/services/sqlstore/migrations/dashboard_version_mig.go

@@ -39,7 +39,7 @@ func addDashboardVersionMigration(mg *Migrator) {
 )
 SELECT
 	dashboard.id,
-	dashboard.version + 1,
+	dashboard.version,
 	dashboard.version,
 	dashboard.version,
 	dashboard.updated,