IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 17:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chore move Filter to user service (#53588)

Browse Source
This commit is contained in:
idafurjes
2022-08-11 14:45:29 +02:00
committed by GitHub
parent a14621fff6
commit da72a4ed2e
9 changed files with 120 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/searchusers/searchusers.go
+4 -3
View File
@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/login"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/user"
)
type Service interface {
@@ -17,10 +18,10 @@ type Service interface {
type OSSService struct {
sqlStore sqlstore.Store
searchUserFilter models.SearchUserFilter
searchUserFilter user.SearchUserFilter
}
func ProvideUsersService(sqlStore sqlstore.Store, searchUserFilter models.SearchUserFilter) *OSSService {
func ProvideUsersService(sqlStore sqlstore.Store, searchUserFilter user.SearchUserFilter) *OSSService {
return &OSSService{sqlStore: sqlStore, searchUserFilter: searchUserFilter}
}
@@ -75,7 +76,7 @@ func (s *OSSService) SearchUser(c *models.ReqContext) (*models.SearchUsersQuery,
}
searchQuery := c.Query("query")
filters := make([]models.Filter, 0)
filters := make([]user.Filter, 0)
for filterName := range s.searchUserFilter.GetFilterList() {
filter := s.searchUserFilter.GetFilter(filterName, c.QueryStrings(filterName))
if filter != nil {