Schema: Add schema for library panels (#62169)

pkg/services/libraryelements/database.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -166,15 +167,15 @@ func (l *LibraryElementService) createLibraryElement(c context.Context, signedIn
 			ConnectedDashboards: 0,
 			Created:             element.Created,
 			Updated:             element.Updated,
-			CreatedBy: LibraryElementDTOMetaUser{
-				ID:        element.CreatedBy,
+			CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+				Id:        element.CreatedBy,
 				Name:      signedInUser.Login,
-				AvatarURL: dtos.GetGravatarUrl(signedInUser.Email),
+				AvatarUrl: dtos.GetGravatarUrl(signedInUser.Email),
 			},
-			UpdatedBy: LibraryElementDTOMetaUser{
-				ID:        element.UpdatedBy,
+			UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+				Id:        element.UpdatedBy,
 				Name:      signedInUser.Login,
-				AvatarURL: dtos.GetGravatarUrl(signedInUser.Email),
+				AvatarUrl: dtos.GetGravatarUrl(signedInUser.Email),
 			},
 		},
 	}
@@ -279,15 +280,15 @@ func getLibraryElements(c context.Context, store db.DB, cfg *setting.Cfg, signed
 				ConnectedDashboards: libraryElement.ConnectedDashboards,
 				Created:             libraryElement.Created,
 				Updated:             libraryElement.Updated,
-				CreatedBy: LibraryElementDTOMetaUser{
-					ID:        libraryElement.CreatedBy,
+				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+					Id:        libraryElement.CreatedBy,
 					Name:      libraryElement.CreatedByName,
-					AvatarURL: dtos.GetGravatarUrl(libraryElement.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(libraryElement.CreatedByEmail),
 				},
-				UpdatedBy: LibraryElementDTOMetaUser{
-					ID:        libraryElement.UpdatedBy,
+				UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+					Id:        libraryElement.UpdatedBy,
 					Name:      libraryElement.UpdatedByName,
-					AvatarURL: dtos.GetGravatarUrl(libraryElement.UpdatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(libraryElement.UpdatedByEmail),
 				},
 			},
 		}
@@ -392,15 +393,15 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 					ConnectedDashboards: element.ConnectedDashboards,
 					Created:             element.Created,
 					Updated:             element.Updated,
-					CreatedBy: LibraryElementDTOMetaUser{
-						ID:        element.CreatedBy,
+					CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+						Id:        element.CreatedBy,
 						Name:      element.CreatedByName,
-						AvatarURL: dtos.GetGravatarUrl(element.CreatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(element.CreatedByEmail),
 					},
-					UpdatedBy: LibraryElementDTOMetaUser{
-						ID:        element.UpdatedBy,
+					UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+						Id:        element.UpdatedBy,
 						Name:      element.UpdatedByName,
-						AvatarURL: dtos.GetGravatarUrl(element.UpdatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(element.UpdatedByEmail),
 					},
 				},
 			})
@@ -541,15 +542,15 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
 				ConnectedDashboards: elementInDB.ConnectedDashboards,
 				Created:             libraryElement.Created,
 				Updated:             libraryElement.Updated,
-				CreatedBy: LibraryElementDTOMetaUser{
-					ID:        elementInDB.CreatedBy,
+				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+					Id:        elementInDB.CreatedBy,
 					Name:      elementInDB.CreatedByName,
-					AvatarURL: dtos.GetGravatarUrl(elementInDB.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(elementInDB.CreatedByEmail),
 				},
-				UpdatedBy: LibraryElementDTOMetaUser{
-					ID:        libraryElement.UpdatedBy,
+				UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+					Id:        libraryElement.UpdatedBy,
 					Name:      signedInUser.Login,
-					AvatarURL: dtos.GetGravatarUrl(signedInUser.Email),
+					AvatarUrl: dtos.GetGravatarUrl(signedInUser.Email),
 				},
 			},
 		}
@@ -589,10 +590,10 @@ func (l *LibraryElementService) getConnections(c context.Context, signedInUser *
 				ConnectionID:  connection.ConnectionID,
 				ConnectionUID: connection.ConnectionUID,
 				Created:       connection.Created,
-				CreatedBy: LibraryElementDTOMetaUser{
-					ID:        connection.CreatedBy,
+				CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+					Id:        connection.CreatedBy,
 					Name:      connection.CreatedByName,
-					AvatarURL: dtos.GetGravatarUrl(connection.CreatedByEmail),
+					AvatarUrl: dtos.GetGravatarUrl(connection.CreatedByEmail),
 				},
 			})
 		}
@@ -638,15 +639,15 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das
 					ConnectedDashboards: element.ConnectedDashboards,
 					Created:             element.Created,
 					Updated:             element.Updated,
-					CreatedBy: LibraryElementDTOMetaUser{
-						ID:        element.CreatedBy,
+					CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+						Id:        element.CreatedBy,
 						Name:      element.CreatedByName,
-						AvatarURL: dtos.GetGravatarUrl(element.CreatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(element.CreatedByEmail),
 					},
-					UpdatedBy: LibraryElementDTOMetaUser{
-						ID:        element.UpdatedBy,
+					UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+						Id:        element.UpdatedBy,
 						Name:      element.UpdatedByName,
-						AvatarURL: dtos.GetGravatarUrl(element.UpdatedByEmail),
+						AvatarUrl: dtos.GetGravatarUrl(element.UpdatedByEmail),
 					},
 				},
 			}

pkg/services/libraryelements/libraryelements_create_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -45,15 +46,15 @@ func TestCreateLibraryElement(t *testing.T) {
 						ConnectedDashboards: 0,
 						Created:             sc.initialResult.Result.Meta.Created,
 						Updated:             sc.initialResult.Result.Meta.Updated,
-						CreatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
-						UpdatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
 					},
 				},
@@ -94,15 +95,15 @@ func TestCreateLibraryElement(t *testing.T) {
 						ConnectedDashboards: 0,
 						Created:             result.Result.Meta.Created,
 						Updated:             result.Result.Meta.Updated,
-						CreatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
-						UpdatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
 					},
 				},
@@ -169,15 +170,15 @@ func TestCreateLibraryElement(t *testing.T) {
 						ConnectedDashboards: 0,
 						Created:             result.Result.Meta.Created,
 						Updated:             result.Result.Meta.Updated,
-						CreatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
-						UpdatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
 					},
 				},

pkg/services/libraryelements/libraryelements_get_all_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/search"
@@ -81,15 +82,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -146,15 +147,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -208,15 +209,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -243,15 +244,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[1].Meta.Created,
 								Updated:             result.Result.Elements[1].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -308,15 +309,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -343,15 +344,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[1].Meta.Created,
 								Updated:             result.Result.Elements[1].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -429,15 +430,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -464,15 +465,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[1].Meta.Created,
 								Updated:             result.Result.Elements[1].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -568,15 +569,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -665,15 +666,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -700,15 +701,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[1].Meta.Created,
 								Updated:             result.Result.Elements[1].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -765,15 +766,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -830,15 +831,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -896,15 +897,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -971,15 +972,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -1044,15 +1045,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -1079,15 +1080,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[1].Meta.Created,
 								Updated:             result.Result.Elements[1].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},
@@ -1146,15 +1147,15 @@ func TestGetAllLibraryElements(t *testing.T) {
 								ConnectedDashboards: 0,
 								Created:             result.Result.Elements[0].Meta.Created,
 								Updated:             result.Result.Elements[0].Meta.Updated,
-								CreatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
-								UpdatedBy: LibraryElementDTOMetaUser{
-									ID:        1,
+								UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+									Id:        1,
 									Name:      userInDbName,
-									AvatarURL: userInDbAvatar,
+									AvatarUrl: userInDbAvatar,
 								},
 							},
 						},

pkg/services/libraryelements/libraryelements_get_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/web"
@@ -54,15 +55,15 @@ func TestGetLibraryElement(t *testing.T) {
 							ConnectedDashboards: 0,
 							Created:             res.Result.Meta.Created,
 							Updated:             res.Result.Meta.Updated,
-							CreatedBy: LibraryElementDTOMetaUser{
-								ID:        1,
+							CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+								Id:        1,
 								Name:      userInDbName,
-								AvatarURL: userInDbAvatar,
+								AvatarUrl: userInDbAvatar,
 							},
-							UpdatedBy: LibraryElementDTOMetaUser{
-								ID:        1,
+							UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+								Id:        1,
 								Name:      userInDbName,
-								AvatarURL: userInDbAvatar,
+								AvatarUrl: userInDbAvatar,
 							},
 						},
 					},
@@ -149,15 +150,15 @@ func TestGetLibraryElement(t *testing.T) {
 							ConnectedDashboards: 1,
 							Created:             res.Result.Meta.Created,
 							Updated:             res.Result.Meta.Updated,
-							CreatedBy: LibraryElementDTOMetaUser{
-								ID:        1,
+							CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+								Id:        1,
 								Name:      userInDbName,
-								AvatarURL: userInDbAvatar,
+								AvatarUrl: userInDbAvatar,
 							},
-							UpdatedBy: LibraryElementDTOMetaUser{
-								ID:        1,
+							UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+								Id:        1,
 								Name:      userInDbName,
-								AvatarURL: userInDbAvatar,
+								AvatarUrl: userInDbAvatar,
 							},
 						},
 					},

pkg/services/libraryelements/libraryelements_patch_test.go

@@ -3,6 +3,7 @@ package libraryelements
 import (
 	"testing"
 
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/util"
 
 	"github.com/google/go-cmp/cmp"
@@ -68,15 +69,15 @@ func TestPatchLibraryElement(t *testing.T) {
 						ConnectedDashboards: 0,
 						Created:             sc.initialResult.Result.Meta.Created,
 						Updated:             result.Result.Meta.Updated,
-						CreatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      userInDbName,
-							AvatarURL: userInDbAvatar,
+							AvatarUrl: userInDbAvatar,
 						},
-						UpdatedBy: LibraryElementDTOMetaUser{
-							ID:        1,
+						UpdatedBy: librarypanel.LibraryElementDTOMetaUser{
+							Id:        1,
 							Name:      "signed_in_user",
-							AvatarURL: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
+							AvatarUrl: "/avatar/37524e1eb8b3e32850b57db0a19af93b",
 						},
 					},
 				},
@@ -101,7 +102,7 @@ func TestPatchLibraryElement(t *testing.T) {
 			var result = validateAndUnMarshalResponse(t, resp)
 			sc.initialResult.Result.FolderID = newFolder.ID
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			sc.initialResult.Result.Meta.FolderName = "NewFolder"
@@ -125,7 +126,7 @@ func TestPatchLibraryElement(t *testing.T) {
 			var result = validateAndUnMarshalResponse(t, resp)
 			sc.initialResult.Result.Name = "New Name"
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Model["title"] = "Text - Library Panel"
 			sc.initialResult.Result.Version = 2
@@ -148,7 +149,7 @@ func TestPatchLibraryElement(t *testing.T) {
 			var result = validateAndUnMarshalResponse(t, resp)
 			sc.initialResult.Result.UID = cmd.UID
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Model["title"] = "Text - Library Panel"
 			sc.initialResult.Result.Version = 2
@@ -225,7 +226,7 @@ func TestPatchLibraryElement(t *testing.T) {
 				"description": "New description",
 			}
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {
@@ -252,7 +253,7 @@ func TestPatchLibraryElement(t *testing.T) {
 				"description": "New description",
 			}
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {
@@ -279,7 +280,7 @@ func TestPatchLibraryElement(t *testing.T) {
 				"description": "A description",
 			}
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {
@@ -295,9 +296,9 @@ func TestPatchLibraryElement(t *testing.T) {
 			sc.ctx.Req.Body = mockRequestBody(cmd)
 			resp := sc.service.patchHandler(sc.reqContext)
 			var result = validateAndUnMarshalResponse(t, resp)
-			sc.initialResult.Result.Meta.UpdatedBy.ID = int64(2)
+			sc.initialResult.Result.Meta.UpdatedBy.Id = int64(2)
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {
@@ -393,7 +394,7 @@ func TestPatchLibraryElement(t *testing.T) {
 				"description": "A description",
 			}
 			sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
-			sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+			sc.initialResult.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 			sc.initialResult.Result.Meta.Updated = result.Result.Meta.Updated
 			sc.initialResult.Result.Version = 2
 			if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {

pkg/services/libraryelements/libraryelements_permissions_test.go

@@ -252,9 +252,9 @@ func TestLibraryElementPermissions(t *testing.T) {
 					resp := sc.service.createHandler(sc.reqContext)
 					result := validateAndUnMarshalResponse(t, resp)
 					result.Result.Meta.CreatedBy.Name = userInDbName
-					result.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+					result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 					result.Result.Meta.UpdatedBy.Name = userInDbName
-					result.Result.Meta.UpdatedBy.AvatarURL = userInDbAvatar
+					result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
 					result.Result.Meta.FolderName = folder.Title
 					result.Result.Meta.FolderUID = folder.UID
 					results = append(results, result.Result)
@@ -275,9 +275,9 @@ func TestLibraryElementPermissions(t *testing.T) {
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
 				result.Result.Meta.CreatedBy.Name = userInDbName
-				result.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+				result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 				result.Result.Meta.UpdatedBy.Name = userInDbName
-				result.Result.Meta.UpdatedBy.AvatarURL = userInDbAvatar
+				result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
 				result.Result.Meta.FolderName = "General"
 				result.Result.Meta.FolderUID = ""
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
@@ -315,9 +315,9 @@ func TestLibraryElementPermissions(t *testing.T) {
 					resp := sc.service.createHandler(sc.reqContext)
 					result := validateAndUnMarshalResponse(t, resp)
 					result.Result.Meta.CreatedBy.Name = userInDbName
-					result.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+					result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 					result.Result.Meta.UpdatedBy.Name = userInDbName
-					result.Result.Meta.UpdatedBy.AvatarURL = userInDbAvatar
+					result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
 					result.Result.Meta.FolderName = folder.Title
 					result.Result.Meta.FolderUID = folder.UID
 					results = append(results, result.Result)
@@ -367,9 +367,9 @@ func TestLibraryElementPermissions(t *testing.T) {
 				resp := sc.service.createHandler(sc.reqContext)
 				result := validateAndUnMarshalResponse(t, resp)
 				result.Result.Meta.CreatedBy.Name = userInDbName
-				result.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
+				result.Result.Meta.CreatedBy.AvatarUrl = userInDbAvatar
 				result.Result.Meta.UpdatedBy.Name = userInDbName
-				result.Result.Meta.UpdatedBy.AvatarURL = userInDbAvatar
+				result.Result.Meta.UpdatedBy.AvatarUrl = userInDbAvatar
 				result.Result.Meta.FolderName = "General"
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 

pkg/services/libraryelements/libraryelements_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 	"github.com/grafana/grafana/pkg/models"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/alerting"
@@ -165,10 +166,10 @@ func TestGetLibraryPanelConnections(t *testing.T) {
 							ConnectionID:  dashInDB.ID,
 							ConnectionUID: dashInDB.UID,
 							Created:       res.Result[0].Created,
-							CreatedBy: LibraryElementDTOMetaUser{
-								ID:        1,
+							CreatedBy: librarypanel.LibraryElementDTOMetaUser{
+								Id:        1,
 								Name:      userInDbName,
-								AvatarURL: userInDbAvatar,
+								AvatarUrl: userInDbAvatar,
 							},
 						},
 					},

pkg/services/libraryelements/models.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"time"
+
+	"github.com/grafana/grafana/pkg/kinds/librarypanel"
 )
 
 type LibraryConnectionKind int
@@ -93,15 +95,8 @@ type LibraryElementDTOMeta struct {
 	Created time.Time `json:"created"`
 	Updated time.Time `json:"updated"`
 
-	CreatedBy LibraryElementDTOMetaUser `json:"createdBy"`
-	UpdatedBy LibraryElementDTOMetaUser `json:"updatedBy"`
-}
-
-// LibraryElementDTOMetaUser is the meta information for user that creates/changes the library element.
-type LibraryElementDTOMetaUser struct {
-	ID        int64  `json:"id"`
-	Name      string `json:"name"`
-	AvatarURL string `json:"avatarUrl"`
+	CreatedBy librarypanel.LibraryElementDTOMetaUser `json:"createdBy"`
+	UpdatedBy librarypanel.LibraryElementDTOMetaUser `json:"updatedBy"`
 }
 
 // libraryElementConnection is the model for library element connections.
@@ -129,13 +124,13 @@ type libraryElementConnectionWithMeta struct {
 
 // LibraryElementConnectionDTO is the frontend DTO for element connections.
 type LibraryElementConnectionDTO struct {
-	ID            int64                     `json:"id"`
-	Kind          int64                     `json:"kind"`
-	ElementID     int64                     `json:"elementId"`
-	ConnectionID  int64                     `json:"connectionId"`
-	ConnectionUID string                    `json:"connectionUid"`
-	Created       time.Time                 `json:"created"`
-	CreatedBy     LibraryElementDTOMetaUser `json:"createdBy"`
+	ID            int64                                  `json:"id"`
+	Kind          int64                                  `json:"kind"`
+	ElementID     int64                                  `json:"elementId"`
+	ConnectionID  int64                                  `json:"connectionId"`
+	ConnectionUID string                                 `json:"connectionUid"`
+	Created       time.Time                              `json:"created"`
+	CreatedBy     librarypanel.LibraryElementDTOMetaUser `json:"createdBy"`
 }
 
 var (