Merge branch 'apps'

pkg/services/sqlstore/app_settings.go

@@ -0,0 +1,50 @@
+package sqlstore
+
+import (
+	"time"
+
+	"github.com/grafana/grafana/pkg/bus"
+	m "github.com/grafana/grafana/pkg/models"
+)
+
+func init() {
+	bus.AddHandler("sql", GetAppSettings)
+	bus.AddHandler("sql", UpdateAppSettings)
+}
+
+func GetAppSettings(query *m.GetAppSettingsQuery) error {
+	sess := x.Where("org_id=?", query.OrgId)
+
+	query.Result = make([]*m.AppSettings, 0)
+	return sess.Find(&query.Result)
+}
+
+func UpdateAppSettings(cmd *m.UpdateAppSettingsCmd) error {
+	return inTransaction2(func(sess *session) error {
+		var app m.AppSettings
+
+		exists, err := sess.Where("org_id=? and app_id=?", cmd.OrgId, cmd.AppId).Get(&app)
+		sess.UseBool("enabled")
+		sess.UseBool("pinned")
+		if !exists {
+			app = m.AppSettings{
+				AppId:    cmd.AppId,
+				OrgId:    cmd.OrgId,
+				Enabled:  cmd.Enabled,
+				Pinned:   cmd.Pinned,
+				JsonData: cmd.JsonData,
+				Created:  time.Now(),
+				Updated:  time.Now(),
+			}
+			_, err = sess.Insert(&app)
+			return err
+		} else {
+			app.Updated = time.Now()
+			app.Enabled = cmd.Enabled
+			app.JsonData = cmd.JsonData
+			app.Pinned = cmd.Pinned
+			_, err = sess.Id(app.Id).Update(&app)
+			return err
+		}
+	})
+}

pkg/services/sqlstore/migrations/app_settings.go

@@ -2,25 +2,27 @@ package migrations
 
 import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 
-func addPluginBundleMigration(mg *Migrator) {
+func addAppSettingsMigration(mg *Migrator) {
 
-	var pluginBundleV1 = Table{
-		Name: "plugin_bundle",
+	appSettingsV1 := Table{
+		Name: "app_settings",
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "org_id", Type: DB_BigInt, Nullable: true},
-			{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "app_id", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "enabled", Type: DB_Bool, Nullable: false},
+			{Name: "pinned", Type: DB_Bool, Nullable: false},
 			{Name: "json_data", Type: DB_Text, Nullable: true},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
 			{Name: "updated", Type: DB_DateTime, Nullable: false},
 		},
 		Indices: []*Index{
-			{Cols: []string{"org_id", "type"}, Type: UniqueIndex},
+			{Cols: []string{"org_id", "app_id"}, Type: UniqueIndex},
 		},
 	}
-	mg.AddMigration("create plugin_bundle table v1", NewAddTableMigration(pluginBundleV1))
+
+	mg.AddMigration("create app_settings table v1", NewAddTableMigration(appSettingsV1))
 
 	//-------  indexes ------------------
-	addTableIndicesMigrations(mg, "v1", pluginBundleV1)
+	addTableIndicesMigrations(mg, "v3", appSettingsV1)
 }

pkg/services/sqlstore/migrations/migrations.go

@@ -18,7 +18,7 @@ func AddMigrations(mg *Migrator) {
 	addApiKeyMigrations(mg)
 	addDashboardSnapshotMigrations(mg)
 	addQuotaMigration(mg)
-	addPluginBundleMigration(mg)
+	addAppSettingsMigration(mg)
 	addSessionMigration(mg)
 	addPlaylistMigrations(mg)
 }

pkg/services/sqlstore/plugin_bundle.go

@@ -1,46 +0,0 @@
-package sqlstore
-
-import (
-	"time"
-
-	"github.com/grafana/grafana/pkg/bus"
-	m "github.com/grafana/grafana/pkg/models"
-)
-
-func init() {
-	bus.AddHandler("sql", GetPluginBundles)
-	bus.AddHandler("sql", UpdatePluginBundle)
-}
-
-func GetPluginBundles(query *m.GetPluginBundlesQuery) error {
-	sess := x.Where("org_id=?", query.OrgId)
-
-	query.Result = make([]*m.PluginBundle, 0)
-	return sess.Find(&query.Result)
-}
-
-func UpdatePluginBundle(cmd *m.UpdatePluginBundleCmd) error {
-	return inTransaction2(func(sess *session) error {
-		var bundle m.PluginBundle
-
-		exists, err := sess.Where("org_id=? and type=?", cmd.OrgId, cmd.Type).Get(&bundle)
-		sess.UseBool("enabled")
-		if !exists {
-			bundle = m.PluginBundle{
-				Type:     cmd.Type,
-				OrgId:    cmd.OrgId,
-				Enabled:  cmd.Enabled,
-				JsonData: cmd.JsonData,
-				Created:  time.Now(),
-				Updated:  time.Now(),
-			}
-			_, err = sess.Insert(&bundle)
-			return err
-		} else {
-			bundle.Enabled = cmd.Enabled
-			bundle.JsonData = cmd.JsonData
-			_, err = sess.Id(bundle.Id).Update(&bundle)
-			return err
-		}
-	})
-}