[MM-56399][MM-56397][MM-56456][MM-56269] Various changes for user reporting for admins (#25839)
* [MM-56399] Add user count endpoint for reporting * [MM-56397] Added search term to user report filter * Missing translation * [MM-56456] Rename up/down to prev/next for reporting cursoring * [MM-56269] Add DeleteAt, MfaActive and AuthService fields to UserReport * PR feedback * Fix test --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
bb88b92b4c
Коммит
0a4e9eeb92
@@ -24,7 +24,7 @@ var (
|
||||
|
||||
type ReportingBaseOptions struct {
|
||||
SortDesc bool
|
||||
Direction string // Accepts only "up" or "down"
|
||||
Direction string // Accepts only "prev" or "next"
|
||||
PageSize int
|
||||
SortColumn string
|
||||
FromColumnValue string
|
||||
@@ -66,12 +66,7 @@ type UserReportQuery struct {
|
||||
}
|
||||
|
||||
type UserReport struct {
|
||||
Id string `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Email string `json:"email"`
|
||||
CreateAt int64 `json:"create_at,omitempty"`
|
||||
DisplayName string `json:"display_name"`
|
||||
Roles string `json:"roles"`
|
||||
User
|
||||
UserPostStats
|
||||
}
|
||||
|
||||
@@ -82,6 +77,7 @@ type UserReportOptions struct {
|
||||
HasNoTeam bool
|
||||
HideActive bool
|
||||
HideInactive bool
|
||||
SearchTerm string
|
||||
}
|
||||
|
||||
func (u *UserReportOptions) IsValid() *AppError {
|
||||
@@ -99,12 +95,7 @@ func (u *UserReportOptions) IsValid() *AppError {
|
||||
|
||||
func (u *UserReportQuery) ToReport() *UserReport {
|
||||
return &UserReport{
|
||||
Id: u.Id,
|
||||
Username: u.Username,
|
||||
Email: u.Email,
|
||||
CreateAt: u.CreateAt,
|
||||
DisplayName: u.GetDisplayName(ShowNicknameFullName),
|
||||
Roles: u.Roles,
|
||||
User: u.User,
|
||||
UserPostStats: u.UserPostStats,
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user