IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

LibraryPanels: Separates name from panel title (#38707)

Browse Source 
* LibraryPanels: Separates name from panel title

* WIP

* Chore: fixes update for duplicate lib panels

* Chore: reverts implementation

* Chore: show library options only for library panels

* Chore: ui fixes after PR comments

* Chore: fixes issue when creating library panels
This commit is contained in:
Hugo Häggmark
2021-09-01 13:27:43 +02:00
committed by GitHub
parent 6cfb640a0b
commit 55e20bbf04
11 changed files with 115 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/libraryelements/database.go
View File

@@ -41,9 +41,7 @@ func syncFieldsWithModel(libraryElement *LibraryElement) error {
return err
}
if models.LibraryElementKind(libraryElement.Kind) == models.PanelElement {
model["title"] = libraryElement.Name
} else if models.LibraryElementKind(libraryElement.Kind) == models.VariableElement {
if models.LibraryElementKind(libraryElement.Kind) == models.VariableElement {
model["name"] = libraryElement.Name
}
if model["type"] != nil {

4
pkg/services/libraryelements/libraryelements_create_test.go
View File

@@ -59,7 +59,7 @@ func TestCreateLibraryElement(t *testing.T) {
}
})
testScenario(t, "When an admin tries to create a library panel where name and panel title differ, it should update panel title",
testScenario(t, "When an admin tries to create a library panel where name and panel title differ, it should not update panel title",
func(t *testing.T, sc scenarioContext) {
command := getCreatePanelCommand(1, "Library Panel Name")
resp := sc.service.createHandler(sc.reqContext, command)
@@ -78,7 +78,7 @@ func TestCreateLibraryElement(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Library Panel Name",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,

16
pkg/services/libraryelements/libraryelements_get_all_test.go
View File

@@ -229,7 +229,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -293,7 +293,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -549,7 +549,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -679,7 +679,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -743,7 +743,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -872,7 +872,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -1018,7 +1018,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A Library Panel",
"id": float64(1),
"title": "Some Other",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,
@@ -1119,7 +1119,7 @@ func TestGetAllLibraryElements(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "A description",
"id": float64(1),
"title": "Text - Library Panel2",
"title": "Text - Library Panel",
"type": "text",
},
Version: 1,

16
pkg/services/libraryelements/libraryelements_patch_test.go
View File

@@ -54,7 +54,7 @@ func TestPatchLibraryElement(t *testing.T) {
"datasource": "${DS_GDEV-TESTDATA}",
"description": "An updated description",
"id": float64(1),
"title": "Panel - New name",
"title": "Model - New name",
"type": "graph",
},
Version: 2,
@@ -101,7 +101,7 @@ func TestPatchLibraryElement(t *testing.T) {
}
})
scenarioWithPanel(t, "When an admin tries to patch a library panel with name only, it should change name successfully, sync title and return correct result",
scenarioWithPanel(t, "When an admin tries to patch a library panel with name only, it should change name successfully and return correct result",
func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{
FolderID: -1,
@@ -115,14 +115,14 @@ func TestPatchLibraryElement(t *testing.T) {
sc.initialResult.Result.Name = "New Name"
sc.initialResult.Result.Meta.CreatedBy.Name = userInDbName
sc.initialResult.Result.Meta.CreatedBy.AvatarURL = userInDbAvatar
sc.initialResult.Result.Model["title"] = "New Name"
sc.initialResult.Result.Model["title"] = "Text - Library Panel"
sc.initialResult.Result.Version = 2
if diff := cmp.Diff(sc.initialResult.Result, result.Result, getCompareOptions()...); diff != "" {
t.Fatalf("Result mismatch (-want +got):\n%s", diff)
}
})
scenarioWithPanel(t, "When an admin tries to patch a library panel with model only, it should change model successfully, sync name, type and description fields and return correct result",
scenarioWithPanel(t, "When an admin tries to patch a library panel with model only, it should change model successfully, sync type and description fields and return correct result",
func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{
FolderID: -1,
@@ -136,7 +136,7 @@ func TestPatchLibraryElement(t *testing.T) {
sc.initialResult.Result.Type = "graph"
sc.initialResult.Result.Description = "New description"
sc.initialResult.Result.Model = map[string]interface{}{
"title": "Text - Library Panel",
"title": "New Model Title",
"name": "New Model Name",
"type": "graph",
"description": "New description",
@@ -149,7 +149,7 @@ func TestPatchLibraryElement(t *testing.T) {
}
})
scenarioWithPanel(t, "When an admin tries to patch a library panel with model.description only, it should change model successfully, sync name, type and description fields and return correct result",
scenarioWithPanel(t, "When an admin tries to patch a library panel with model.description only, it should change model successfully, sync type and description fields and return correct result",
func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{
FolderID: -1,
@@ -163,7 +163,6 @@ func TestPatchLibraryElement(t *testing.T) {
sc.initialResult.Result.Type = "text"
sc.initialResult.Result.Description = "New description"
sc.initialResult.Result.Model = map[string]interface{}{
"title": "Text - Library Panel",
"type": "text",
"description": "New description",
}
@@ -175,7 +174,7 @@ func TestPatchLibraryElement(t *testing.T) {
}
})
scenarioWithPanel(t, "When an admin tries to patch a library panel with model.type only, it should change model successfully, sync name, type and description fields and return correct result",
scenarioWithPanel(t, "When an admin tries to patch a library panel with model.type only, it should change model successfully, sync type and description fields and return correct result",
func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{
FolderID: -1,
@@ -189,7 +188,6 @@ func TestPatchLibraryElement(t *testing.T) {
sc.initialResult.Result.Type = "graph"
sc.initialResult.Result.Description = "A description"
sc.initialResult.Result.Model = map[string]interface{}{
"title": "Text - Library Panel",
"type": "graph",
"description": "A description",
}