mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 02:40:26 -06:00
f05607d4c0
* refactor to multiple rows * added name for org user struct * added name getorgusers * added user name to tableview * made test pass * updated userMocks to user name field * added missing UsersTable snapshot * added name on teammembers page, be able to search query for name, login and email * added the updated snapshots * conform to same sorting as output form * conform to previous way of using it * sort first by login and after by email, as it was before
121 lines
2.3 KiB
Go
121 lines
2.3 KiB
Go
package models
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// Typed errors
|
|
var (
|
|
ErrInvalidRoleType = errors.New("Invalid role type")
|
|
ErrLastOrgAdmin = errors.New("Cannot remove last organization admin")
|
|
ErrOrgUserNotFound = errors.New("Cannot find the organization user")
|
|
ErrOrgUserAlreadyAdded = errors.New("User is already added to organization")
|
|
)
|
|
|
|
type RoleType string
|
|
|
|
const (
|
|
ROLE_VIEWER RoleType = "Viewer"
|
|
ROLE_EDITOR RoleType = "Editor"
|
|
ROLE_ADMIN RoleType = "Admin"
|
|
)
|
|
|
|
func (r RoleType) IsValid() bool {
|
|
return r == ROLE_VIEWER || r == ROLE_ADMIN || r == ROLE_EDITOR
|
|
}
|
|
|
|
func (r RoleType) Includes(other RoleType) bool {
|
|
if r == ROLE_ADMIN {
|
|
return true
|
|
}
|
|
|
|
if r == ROLE_EDITOR {
|
|
return other != ROLE_ADMIN
|
|
}
|
|
|
|
return r == other
|
|
}
|
|
|
|
func (r *RoleType) UnmarshalJSON(data []byte) error {
|
|
var str string
|
|
err := json.Unmarshal(data, &str)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
*r = RoleType(str)
|
|
|
|
if !(*r).IsValid() {
|
|
if (*r) != "" {
|
|
return fmt.Errorf("JSON validation error: invalid role value: %s", *r)
|
|
}
|
|
|
|
*r = ROLE_VIEWER
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
type OrgUser struct {
|
|
Id int64
|
|
OrgId int64
|
|
UserId int64
|
|
Role RoleType
|
|
Created time.Time
|
|
Updated time.Time
|
|
}
|
|
|
|
// ---------------------
|
|
// COMMANDS
|
|
|
|
type RemoveOrgUserCommand struct {
|
|
UserId int64
|
|
OrgId int64
|
|
ShouldDeleteOrphanedUser bool
|
|
UserWasDeleted bool
|
|
}
|
|
|
|
type AddOrgUserCommand struct {
|
|
LoginOrEmail string `json:"loginOrEmail" binding:"Required"`
|
|
Role RoleType `json:"role" binding:"Required"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
type UpdateOrgUserCommand struct {
|
|
Role RoleType `json:"role" binding:"Required"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
// ----------------------
|
|
// QUERIES
|
|
|
|
type GetOrgUsersQuery struct {
|
|
OrgId int64
|
|
Query string
|
|
Limit int
|
|
|
|
Result []*OrgUserDTO
|
|
}
|
|
|
|
// ----------------------
|
|
// Projections and DTOs
|
|
|
|
type OrgUserDTO struct {
|
|
OrgId int64 `json:"orgId"`
|
|
UserId int64 `json:"userId"`
|
|
Email string `json:"email"`
|
|
Name string `json:"name"`
|
|
AvatarUrl string `json:"avatarUrl"`
|
|
Login string `json:"login"`
|
|
Role string `json:"role"`
|
|
LastSeenAt time.Time `json:"lastSeenAt"`
|
|
LastSeenAtAge string `json:"lastSeenAtAge"`
|
|
}
|