WIP: remove browse mode for dashboard search

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.

pkg/services/sqlstore/dashboard.go

@@ -218,6 +218,11 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error {
 		return err
 	}
 
+	res, err = appendDashboardFolders(res)
+	if err != nil {
+		return err
+	}
+
 	query.Result = make([]*search.Hit, 0)
 	hits := make(map[int64]*search.Hit)
 
@@ -240,13 +245,40 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error {
 		}
 	}
 
-	if query.BrowseMode {
-		convertToDashboardFolders(query)
-	}
+	convertToDashboardFolders(query)
 
 	return err
 }
 
+// appends parent folders for any hits to the search result
+func appendDashboardFolders(res []DashboardSearchProjection) ([]DashboardSearchProjection, error) {
+	var dashboardFolderIds []int64
+	for _, item := range res {
+		if item.ParentId > 0 {
+			dashboardFolderIds = append(dashboardFolderIds, item.ParentId)
+		}
+	}
+
+	if len(dashboardFolderIds) > 0 {
+		folderQuery := &m.GetDashboardsQuery{DashboardIds: dashboardFolderIds}
+		err := GetDashboards(folderQuery)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, folder := range folderQuery.Result {
+			res = append(res, DashboardSearchProjection{
+				Id:       folder.Id,
+				IsFolder: true,
+				Slug:     folder.Slug,
+				Title:    folder.Title,
+			})
+		}
+	}
+
+	return res, nil
+}
+
 func getHitType(item DashboardSearchProjection) search.HitType {
 	var hitType search.HitType
 	if item.IsFolder {

pkg/services/sqlstore/dashboard_test.go

@@ -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)
 				})