Jelajahi Sumber

Search: Fixed search issue introduced in recent PR (#16652)

Torkel Ödegaard 6 tahun lalu
induk
melakukan
36d64fecea

+ 15 - 0
pkg/services/sqlstore/dashboard_test.go

@@ -288,6 +288,21 @@ func TestDashboardDataAccess(t *testing.T) {
 				So(query.Result[0].Title, ShouldEqual, "test dash 23")
 			})
 
+			Convey("Should be able to filter by tag and type", func() {
+				query := search.FindPersistedDashboardsQuery{
+					OrgId:        1,
+					Type:         "dash-db",
+					Tags:         []string{"prod"},
+					SignedInUser: &m.SignedInUser{OrgId: 1, OrgRole: m.ROLE_EDITOR},
+				}
+
+				err := SearchDashboards(&query)
+				So(err, ShouldBeNil)
+
+				So(len(query.Result), ShouldEqual, 3)
+				So(query.Result[0].Title, ShouldEqual, "test dash 23")
+			})
+
 			Convey("Should be able to search for a dashboard folder's children", func() {
 				query := search.FindPersistedDashboardsQuery{
 					OrgId:        1,

+ 1 - 1
pkg/services/sqlstore/search_builder.go

@@ -149,7 +149,7 @@ func (sb *SearchBuilder) buildTagQuery() {
 	sb.buildSearchWhereClause()
 
 	// this ends the inner select (tag filtered part)
-	sb.sql.WriteString(`GROUP BY dashboard.id HAVING COUNT(dashboard.id) >= ? `)
+	sb.sql.WriteString(` GROUP BY dashboard.id HAVING COUNT(dashboard.id) >= ? `)
 	sb.params = append(sb.params, len(sb.tags))
 }