[MM-21517] Team Member Manage User Modal not display correct roles (#14043)

* join on the users table and order by username

* don't inclue users who have been deleted

* Address PR comments

* update tests

* fix linting

* fix linting

* include ExcludeDeletedUsers flag

* fix gofmt

* fix nil teamMembersGetOptions

* fix gofmt error

* Add Unit Tests

* fix gofmt bugs

* partially address comments

* fix incorrect import

* Address Comments and fix golint errors

* store mocks

* address PR comments about tests and styling

* Update model/team_member.go

Co-Authored-By: Jesse Hallam <jesse.hallam@gmail.com>

* Address PR comments

* update client function name

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Jesse Hallam <jesse.hallam@gmail.com>
Этот коммит содержится в:
Hossein Ahmadian-Yazdi
2020-03-30 10:48:03 -04:00
коммит произвёл GitHub
родитель 7ce68e89d7
Коммит bd2c1f4522
15 изменённых файлов: 305 добавлений и 62 удалений

Просмотреть файл

@@ -11,6 +11,10 @@ import (
"strings"
)
const (
USERNAME = "Username"
)
type TeamMember struct {
TeamId string `json:"team_id"`
UserId string `json:"user_id"`
@@ -44,6 +48,17 @@ type EmailInviteWithError struct {
Error *AppError `json:"error"`
}
type TeamMembersGetOptions struct {
// Sort the team members. Accepts "Username", but defaults to "Id".
Sort string
// If true, exclude team members whose corresponding user is deleted.
ExcludeDeletedUsers bool
// Restrict to search in a list of teams and channels
ViewRestrictions *ViewUsersRestrictions
}
func (o *TeamMember) ToJson() string {
b, _ := json.Marshal(o)
return string(b)