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

WIP: remove browse mode for dashboard search

Browse Source 
Dashboard folders included in all searches. If a dashboard matches
a search and has a parent folder then the parent folder is appended
to the search result. A hierarchy is then returned in the result
with child dashboards under their parent folders.
This commit is contained in:
Daniel Lee
2017-05-08 22:23:25 +02:00
parent f1e1da39e3
commit 53d11d50fc
9 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/services/sqlstore/dashboard_test.go
View File

@@ -114,7 +114,7 @@ func TestDashboardDataAccess(t *testing.T) {
So(err, ShouldNotBeNil)
})
Convey("Should be able to search for dashboard", func() {
Convey("Should be able to search for dashboard and return in folder hierarchy", func() {
query := search.FindPersistedDashboardsQuery{
Title: "test dash 23",
OrgId: 1,
@@ -124,10 +124,12 @@ func TestDashboardDataAccess(t *testing.T) {
So(err, ShouldBeNil)
So(len(query.Result), ShouldEqual, 1)
hit := query.Result[0]
hit := query.Result[0].Dashboards[0]
So(len(hit.Tags), ShouldEqual, 2)
So(hit.Type, ShouldEqual, search.DashHitDB)
So(hit.ParentId, ShouldBeGreaterThan, 0)
})
Convey("Should be able to search for dashboard folder", func() {
@@ -144,23 +146,6 @@ func TestDashboardDataAccess(t *testing.T) {
So(hit.Type, ShouldEqual, search.DashHitFolder)
})
Convey("Should be able to browse dashboard folders", func() {
query := search.FindPersistedDashboardsQuery{
OrgId: 1,
BrowseMode: true,
}
err := SearchDashboards(&query)
So(err, ShouldBeNil)
So(len(query.Result), ShouldEqual, 2)
hit := query.Result[0]
So(hit.Type, ShouldEqual, search.DashHitFolder)
So(len(hit.Dashboards), ShouldEqual, 2)
So(hit.Dashboards[0].Title, ShouldEqual, "test dash 23")
})
Convey("Should be able to search for dashboard by dashboard ids", func() {
Convey("should be able to find two dashboards by id", func() {
query := search.FindPersistedDashboardsQuery{
@@ -171,12 +156,12 @@ func TestDashboardDataAccess(t *testing.T) {
err := SearchDashboards(&query)
So(err, ShouldBeNil)
So(len(query.Result), ShouldEqual, 2)
So(len(query.Result[0].Dashboards), ShouldEqual, 2)
hit := query.Result[0]
hit := query.Result[0].Dashboards[0]
So(len(hit.Tags), ShouldEqual, 2)
hit2 := query.Result[1]
hit2 := query.Result[0].Dashboards[1]
So(len(hit2.Tags), ShouldEqual, 1)
})