feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings

pkg/api/dtos/app_plugin.go

@@ -1,13 +0,0 @@
-package dtos
-
-import "github.com/grafana/grafana/pkg/plugins"
-
-type AppPlugin struct {
-	Name     string                 `json:"name"`
-	Type     string                 `json:"type"`
-	Enabled  bool                   `json:"enabled"`
-	Pinned   bool                   `json:"pinned"`
-	Module   string                 `json:"module"`
-	Info     *plugins.PluginInfo    `json:"info"`
-	JsonData map[string]interface{} `json:"jsonData"`
-}

pkg/api/dtos/apps.go

@@ -0,0 +1,31 @@
+package dtos
+
+import (
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/plugins"
+)
+
+type AppSettings struct {
+	Name     string                 `json:"name"`
+	AppId    string                 `json:"appId"`
+	Enabled  bool                   `json:"enabled"`
+	Pinned   bool                   `json:"pinned"`
+	Info     *plugins.PluginInfo    `json:"info"`
+	JsonData map[string]interface{} `json:"jsonData"`
+}
+
+func NewAppSettingsDto(def *plugins.AppPlugin, data *models.AppSettings) *AppSettings {
+	dto := &AppSettings{
+		AppId: def.Id,
+		Name:  def.Name,
+		Info:  &def.Info,
+	}
+
+	if data != nil {
+		dto.Enabled = data.Enabled
+		dto.Pinned = data.Pinned
+		dto.Info = &def.Info
+	}
+
+	return dto
+}