IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add filter to search users by active (#38637)

Browse Source 
* Add filter to search users by active

* Fix query
This commit is contained in:
Selene 2021-08-31 11:35:16 +02:00 committed by GitHub
parent f1529b83a2
commit e47a60f511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/user.go
View File

@ -290,8 +290,9 @@ func searchUser(c *models.ReqContext) (*models.SearchUsersQuery, error) {
} }
searchQuery := c.Query("query") searchQuery := c.Query("query")
filter := c.Query("filter")
query := &models.SearchUsersQuery{Query: searchQuery, Page: page, Limit: perPage} query := &models.SearchUsersQuery{Query: searchQuery, Filter: models.SearchUsersFilter(filter), Page: page, Limit: perPage}
if err := bus.Dispatch(query); err != nil { if err := bus.Dispatch(query); err != nil {
return nil, err return nil, err
} }

5
pkg/models/user.go
View File

@ -138,12 +138,17 @@ type GetUserProfileQuery struct {
Result UserProfileDTO Result UserProfileDTO
} }
type SearchUsersFilter string
const ActiveLast30Days SearchUsersFilter = "activeLast30Days"
type SearchUsersQuery struct { type SearchUsersQuery struct {
OrgId int64 OrgId int64
Query string Query string
Page int Page int
Limit int Limit int
AuthModule string AuthModule string
Filter SearchUsersFilter
IsDisabled *bool IsDisabled *bool

7
pkg/services/sqlstore/user.go
View File

@ -588,7 +588,6 @@ func SearchUsers(query *models.SearchUsersQuery) error {
ORDER BY user_auth.created DESC ` ORDER BY user_auth.created DESC `
joinCondition = "user_auth.id=" + joinCondition + dialect.Limit(1) + ")" joinCondition = "user_auth.id=" + joinCondition + dialect.Limit(1) + ")"
sess.Join("LEFT", "user_auth", joinCondition) sess.Join("LEFT", "user_auth", joinCondition)
if query.OrgId > 0 { if query.OrgId > 0 {
whereConditions = append(whereConditions, "org_id = ?") whereConditions = append(whereConditions, "org_id = ?")
whereParams = append(whereParams, query.OrgId) whereParams = append(whereParams, query.OrgId)
@ -609,6 +608,12 @@ func SearchUsers(query *models.SearchUsersQuery) error {
whereParams = append(whereParams, query.AuthModule) whereParams = append(whereParams, query.AuthModule)
} }
if query.Filter == models.ActiveLast30Days {
activeUserDeadlineDate := time.Now().Add(-activeUserTimeLimit)
whereConditions = append(whereConditions, `last_seen_at > ?`)
whereParams = append(whereParams, activeUserDeadlineDate)
}
if len(whereConditions) > 0 { if len(whereConditions) > 0 {
sess.Where(strings.Join(whereConditions, " AND "), whereParams...) sess.Where(strings.Join(whereConditions, " AND "), whereParams...)
} }